From b8ffb1be0c68c9c9dd08f21195df210b18fc548e Mon Sep 17 00:00:00 2001 From: Hendi48 <32822533+Hendi48@users.noreply.github.com> Date: Sat, 8 May 2021 23:00:29 +0200 Subject: [PATCH] record/streamts: lower bsf libavcodec check to 57.48.100 (#10) The bit stream filter change was done in ffmpeg 3.1 already. --- src/driver/record.cpp | 8 ++++---- src/driver/streamts.cpp | 6 +++--- src/driver/streamts.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 7f8d85c07..50f16f17e 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -78,7 +78,7 @@ class CStreamRec : public CRecordInstance, OpenThreads::Thread private: AVFormatContext *ifcx; AVFormatContext *ofcx; -#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,52,100 )) +#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,100 )) AVBitStreamFilterContext *bsfc; #else AVBSFContext *bsfc; @@ -1998,7 +1998,7 @@ void CStreamRec::Close() avformat_free_context(ofcx); } if (bsfc){ -#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,52,100 )) +#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,100 )) av_bitstream_filter_close(bsfc); #else av_bsf_free(&bsfc); @@ -2292,7 +2292,7 @@ bool CStreamRec::Open(CZapitChannel * channel) av_dump_format(ofcx, 0, ofcx->url, 1); #endif av_log_set_level(AV_LOG_WARNING); -#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,52,100 )) +#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,100 )) bsfc = av_bitstream_filter_init("h264_mp4toannexb"); if (!bsfc) printf("%s: av_bitstream_filter_init h264_mp4toannexb failed!\n", __FUNCTION__); @@ -2335,7 +2335,7 @@ void CStreamRec::run() #endif if (bsfc && codec->codec_id == AV_CODEC_ID_H264) { AVPacket newpkt = pkt; -#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,52,100 )) +#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,100 )) if (av_bitstream_filter_filter(bsfc, codec, NULL, &newpkt.data, &newpkt.size, pkt.data, pkt.size, pkt.flags & AV_PKT_FLAG_KEY) >= 0) { av_packet_unref(&pkt); newpkt.buf = av_buffer_create(newpkt.data, newpkt.size, av_buffer_default_free, NULL, 0); diff --git a/src/driver/streamts.cpp b/src/driver/streamts.cpp index 284337853..00e341e7b 100644 --- a/src/driver/streamts.cpp +++ b/src/driver/streamts.cpp @@ -788,7 +788,7 @@ void CStreamStream::Close() av_free(avio_ctx); if (bsfc){ -#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,52,100 )) +#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,100 )) av_bitstream_filter_close(bsfc); #else av_bsf_free(&bsfc); @@ -907,7 +907,7 @@ bool CStreamStream::Open() av_dump_format(ofcx, 0, ofcx->url, 1); #endif av_log_set_level(AV_LOG_WARNING); -#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,52,100 )) +#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,100 )) bsfc = av_bitstream_filter_init("h264_mp4toannexb"); if (!bsfc) printf("%s: av_bitstream_filter_init h264_mp4toannexb failed!\n", __FUNCTION__); @@ -971,7 +971,7 @@ void CStreamStream::run() #endif if (bsfc && codec->codec_id == AV_CODEC_ID_H264 ) { AVPacket newpkt = pkt; -#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,52,100 )) +#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,100 )) if (av_bitstream_filter_filter(bsfc, codec, NULL, &newpkt.data, &newpkt.size, pkt.data, pkt.size, pkt.flags & AV_PKT_FLAG_KEY) >= 0) { av_packet_unref(&pkt); newpkt.buf = av_buffer_create(newpkt.data, newpkt.size, av_buffer_default_free, NULL, 0); diff --git a/src/driver/streamts.h b/src/driver/streamts.h index 51d755083..d2f59b459 100644 --- a/src/driver/streamts.h +++ b/src/driver/streamts.h @@ -73,7 +73,7 @@ class CStreamStream : public CStreamInstance private: AVFormatContext *ifcx; AVFormatContext *ofcx; -#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,52,100 )) +#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,100 )) AVBitStreamFilterContext *bsfc; #else AVBSFContext *bsfc;