Germany/hunting
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Improve:curl compile.

Browse Source
This commit is contained in:
Fancy code 2024-07-06 20:16:21 +08:00
parent 479248eb01
commit dc8a17cc3e
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
utils/MediaBase/src/FfmpegMuxStreamV2.cpp
View File

@ -69,17 +69,6 @@ void FfmpegMuxStreamV2::GetStreamData(const void *data, const size_t &size, cons
bool fileMuxing = false; bool fileMuxing = false;
fileMuxing = mVideoStream->CheckStreamHeader(data, size); fileMuxing = mVideoStream->CheckStreamHeader(data, size);
if (fileMuxing) { if (fileMuxing) {
// av_dump_format(mOutputFormat, 0, "./test.mp4", 1);
// /* open the output file, if needed */
// if (!(mOutputFormat->oformat->flags & AVFMT_NOFILE)) {
// ret = avio_open(&mOutputFormat->pb, "./test.mp4", AVIO_FLAG_WRITE);
// if (ret < 0) {
// char error_str[AV_ERROR_MAX_STRING_SIZE] = {0};
// LogError("Could not open '%s': %s\n",
// "./test.mp4",
// av_make_error_string(error_str, AV_ERROR_MAX_STRING_SIZE, ret));
// }
// }
/* Write the stream header, if any. */ /* Write the stream header, if any. */
ret = avformat_write_header(mOutputFormat, nullptr); ret = avformat_write_header(mOutputFormat, nullptr);
if (ret < 0) { if (ret < 0) {

6
utils/MediaBase/src/FfmpegOutputStream.cpp
View File

@ -22,13 +22,19 @@ extern "C" {
#include <libavcodec/codec_id.h> #include <libavcodec/codec_id.h>
#include <libavcodec/packet.h> #include <libavcodec/packet.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libavutil/avutil.h>
#include <libavutil/frame.h> #include <libavutil/frame.h>
#include <libavutil/mathematics.h>
#include <libavutil/mem.h>
#include <libavutil/pixfmt.h>
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#include <cstddef> #include <cstddef>
#include <cstdint>
#include <functional> #include <functional>
#include <memory> #include <memory>
#include <string.h>
FfmpegOutputStream::FfmpegOutputStream(const AVCodecID &encodecId, const AVCodecID &dncodecId) FfmpegOutputStream::FfmpegOutputStream(const AVCodecID &encodecId, const AVCodecID &dncodecId)
: mEncodecId(encodecId), mDeccodecId(dncodecId), mTmpPkt(nullptr), mStream(nullptr), mStreamHeaderWritten(false) : mEncodecId(encodecId), mDeccodecId(dncodecId), mTmpPkt(nullptr), mStream(nullptr), mStreamHeaderWritten(false)
{ {

1
utils/MediaBase/src/FfmpegReadFile.cpp
View File

@ -22,6 +22,7 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#include <libavcodec/codec_id.h>
#include <libavcodec/packet.h> #include <libavcodec/packet.h>
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#include <libavutil/avutil.h> #include <libavutil/avutil.h>

2
utils/Servers/CMakeLists.txt
View File

@ -81,7 +81,7 @@ add_custom_target(
curl curl
DEPENDS openssl DEPENDS openssl
COMMAND echo "Build curl. openssl path = ${EXTERNAL_SOURCE_PATH}" COMMAND echo "Build curl. openssl path = ${EXTERNAL_SOURCE_PATH}"
COMMAND ./configure --without-zlib --prefix=${EXTERNAL_SOURCE_PATH}/curl --with-ssl=${EXTERNAL_SOURCE_PATH}/openssl/build ${CURL_HOST} CC=${CMAKE_C_COMPILER} COMMAND ./configure --disable-shared --without-zlib --prefix=${EXTERNAL_SOURCE_PATH}/curl --with-ssl=${EXTERNAL_SOURCE_PATH}/openssl/build ${CURL_HOST} CC=${CMAKE_C_COMPILER}
COMMAND make COMMAND make
COMMAND cp ${EXTERNAL_SOURCE_PATH}/curl/curl-8.1.2/lib/.libs/lib*.a ${LIBS_OUTPUT_PATH} COMMAND cp ${EXTERNAL_SOURCE_PATH}/curl/curl-8.1.2/lib/.libs/lib*.a ${LIBS_OUTPUT_PATH}
COMMAND cp ${EXTERNAL_SOURCE_PATH}/openssl/build/lib/lib*.a ${LIBS_OUTPUT_PATH} COMMAND cp ${EXTERNAL_SOURCE_PATH}/openssl/build/lib/lib*.a ${LIBS_OUTPUT_PATH}