From 19d192a9c06453c84b2c4b1e3b55f0a503def1c4 Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Mon, 17 May 2021 22:28:02 +0200 Subject: [PATCH] unnecessary brackets removed - distinction ffmpeg versions Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/00885fda4a3478533a168f045316cfa5edf62fc9 Author: Frankenstone Date: 2021-05-17 (Mon, 17 May 2021) ------------------ This commit was generated by Migit --- src/driver/audiodec/ffmpegdec.cpp | 12 ++++++------ src/driver/record.cpp | 14 +++++++------- src/driver/streamts.cpp | 10 +++++----- src/driver/streamts.h | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/driver/audiodec/ffmpegdec.cpp b/src/driver/audiodec/ffmpegdec.cpp index 76d7f806e..613f92cfa 100644 --- a/src/driver/audiodec/ffmpegdec.cpp +++ b/src/driver/audiodec/ffmpegdec.cpp @@ -204,7 +204,7 @@ void CFfmpegDec::DeInit(void) { if(c) { -#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 83, 100)) +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 83, 100) avcodec_close(c); #else avcodec_free_context(&c); @@ -213,7 +213,7 @@ void CFfmpegDec::DeInit(void) } if (avioc) { -#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 83, 100)) +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(57, 83, 100) av_free(avioc); #else av_freep(&avioc->buffer); @@ -240,7 +240,7 @@ CBaseDec::RetCode CFfmpegDec::Decoder(FILE *_in, int /*OutputFd*/, State* state, Status=DATA_ERR; return Status; } -#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 )) +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ) c = avc->streams[best_stream]->codec; #else c = avcodec_alloc_context3(codec); @@ -484,7 +484,7 @@ bool CFfmpegDec::SetMetaData(FILE *_in, CAudioMetaData* m, bool save_cover) if (!is_stream) { GetMeta(avc->metadata); for(unsigned int i = 0; i < avc->nb_streams; i++) { -#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 )) +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ) if (avc->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) #else if (avc->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) @@ -505,7 +505,7 @@ bool CFfmpegDec::SetMetaData(FILE *_in, CAudioMetaData* m, bool save_cover) DeInit(); return false; } -#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 )) +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ) if (!codec) codec = avcodec_find_decoder(avc->streams[best_stream]->codec->codec_id); samplerate = avc->streams[best_stream]->codec->sample_rate; @@ -535,7 +535,7 @@ bool CFfmpegDec::SetMetaData(FILE *_in, CAudioMetaData* m, bool save_cover) printf("CFfmpegDec: format %s (%s) duration %ld\n", avc->iformat->name, type_info.c_str(), total_time); for(unsigned int i = 0; i < avc->nb_streams; i++) { -#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 )) +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ) if (avc->streams[i]->codec->bit_rate > 0) bitrate += avc->streams[i]->codec->bit_rate; #else diff --git a/src/driver/record.cpp b/src/driver/record.cpp index 32d4e6248..5f32001ab 100644 --- a/src/driver/record.cpp +++ b/src/driver/record.cpp @@ -79,7 +79,7 @@ class CStreamRec : public CRecordInstance, OpenThreads::Thread private: AVFormatContext *ifcx; AVFormatContext *ofcx; -#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,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,48,100 )) +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,100 ) av_bitstream_filter_close(bsfc); #else av_bsf_free(&bsfc); @@ -2112,7 +2112,7 @@ void CStreamRec::FillMovieInfo(CZapitChannel * /*channel*/, APIDList & /*apid_li for (unsigned i = 0; i < ofcx->nb_streams; i++) { AVStream *st = ofcx->streams[i]; -#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 )) +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ) AVCodecContext * codec = st->codec; #else AVCodecParameters * codec = st->codecpar; @@ -2360,7 +2360,7 @@ bool CStreamRec::Open(CZapitChannel * channel) stream_index = -1; int stid = 0x200; for (unsigned i = 0; i < ifcx->nb_streams; i++) { -#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 )) +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ) AVCodecContext * iccx = ifcx->streams[i]->codec; AVStream *ost = avformat_new_stream(ofcx, iccx->codec); avcodec_copy_context(ost->codec, iccx); @@ -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,48,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__); @@ -2420,14 +2420,14 @@ void CStreamRec::run() break; if (pkt.stream_index < 0) continue; -#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 )) +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ) AVCodecContext *codec = ifcx->streams[pkt.stream_index]->codec; #else AVCodecParameters *codec = ifcx->streams[pkt.stream_index]->codecpar; #endif if (bsfc && codec->codec_id == AV_CODEC_ID_H264) { AVPacket newpkt = pkt; -#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,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 8fb65782f..6199b0034 100644 --- a/src/driver/streamts.cpp +++ b/src/driver/streamts.cpp @@ -791,7 +791,7 @@ void CStreamStream::Close() av_free(avio_ctx); if (bsfc){ -#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,100 )) +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,100 ) av_bitstream_filter_close(bsfc); #else av_bsf_free(&bsfc); @@ -890,7 +890,7 @@ bool CStreamStream::Open() av_dict_copy(&ofcx->metadata, ifcx->metadata, 0); int stid = 0x200; for (unsigned i = 0; i < ifcx->nb_streams; i++) { -#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 )) +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ) AVCodecContext * iccx = ifcx->streams[i]->codec; AVStream *ost = avformat_new_stream(ofcx, iccx->codec); avcodec_copy_context(ost->codec, iccx); @@ -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,48,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__); @@ -967,14 +967,14 @@ void CStreamStream::run() if (pkt.stream_index < 0) continue; -#if (LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 )) +#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT( 57,25,101 ) AVCodecContext *codec = ifcx->streams[pkt.stream_index]->codec; #else AVCodecParameters *codec = ifcx->streams[pkt.stream_index]->codecpar; #endif if (bsfc && codec->codec_id == AV_CODEC_ID_H264 ) { AVPacket newpkt = pkt; -#if (LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,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 d2f59b459..819508845 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,48,100 )) +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 57,48,100 ) AVBitStreamFilterContext *bsfc; #else AVBSFContext *bsfc;