mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 15:02:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

record/streamts: lower bsf libavcodec check to 57.48.100 (#10)

Browse Source 
The bit stream filter change was done in ffmpeg 3.1 already.

Origin commit data
------------------
Commit: 91e3f9e51a
Author: Hendi <hendi48@freenet.de>
Date: 2021-05-09 (Sun, 09 May 2021)
This commit is contained in:
Hendi
2021-05-09 21:04:09 +02:00
committed by vanhofen
parent 972eadf566
commit 69b570ff42
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/driver/record.cpp
View File

@@ -79,7 +79,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;
@@ -2090,7 +2090,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);
@@ -2384,7 +2384,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__);
@@ -2427,7 +2427,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);

6
src/driver/streamts.cpp
View File

@@ -791,7 +791,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);
@@ -910,7 +910,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__);
@@ -974,7 +974,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);

2
src/driver/streamts.h
View File

@@ -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;