June 2022 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/libx264: Avoid duplicating strings
by Andreas Rheinhardt 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Fri Jun 24 10:22:05 2022 +0200| [bf13a177d2dd8be5287541d0115b303e861241ad] | committer: Andreas Rheinhardt avcodec/libx264: Avoid duplicating strings Also removes some unchecked allocations. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bf13a177d2dd8be52… --- libavcodec/libx264.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 616d855067..98ec030865 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -62,7 +62,8 @@ typedef struct X264Context { int sei_size; char *preset; char *tune; - char *profile; + const char *profile; + char *profile_opt; char *level; int fastfirstpass; char *wpredp; @@ -832,26 +833,27 @@ static av_cold int X264_init(AVCodecContext *avctx) if (x4->fastfirstpass) x264_param_apply_fastfirstpass(&x4->params); + x4->profile = x4->profile_opt; /* Allow specifying the x264 profile through AVCodecContext. */ if (!x4->profile) switch (avctx->profile) { case FF_PROFILE_H264_BASELINE: - x4->profile = av_strdup("baseline"); + x4->profile = "baseline"; break; case FF_PROFILE_H264_HIGH: - x4->profile = av_strdup("high"); + x4->profile = "high"; break; case FF_PROFILE_H264_HIGH_10: - x4->profile = av_strdup("high10"); + x4->profile = "high10"; break; case FF_PROFILE_H264_HIGH_422: - x4->profile = av_strdup("high422"); + x4->profile = "high422"; break; case FF_PROFILE_H264_HIGH_444: - x4->profile = av_strdup("high444"); + x4->profile = "high444"; break; case FF_PROFILE_H264_MAIN: - x4->profile = av_strdup("main"); + x4->profile = "main"; break; default: break; @@ -1098,7 +1100,7 @@ static av_cold void X264_init_static(FFCodec *codec) static const AVOption options[] = { { "preset", "Set the encoding preset (cf. x264 --fullhelp)", OFFSET(preset), AV_OPT_TYPE_STRING, { .str = "medium" }, 0, 0, VE}, { "tune", "Tune the encoding params (cf. x264 --fullhelp)", OFFSET(tune), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE}, - { "profile", "Set profile restrictions (cf. x264 --fullhelp) ", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE}, + { "profile", "Set profile restrictions (cf. x264 --fullhelp)", OFFSET(profile_opt), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE}, { "fastfirstpass", "Use fast settings when encoding first pass", OFFSET(fastfirstpass), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, VE}, {"level", "Specify level (as defined by Annex A)", OFFSET(level), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE}, {"passlogfile", "Filename for 2 pass stats", OFFSET(stats), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 0, VE},

1 0

Makefile: Prompt for reconfigure on lavc/hwaccels.h modification
by Andreas Rheinhardt 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Sun Jun 26 10:27:21 2022 +0200| [e9f2eb198bc4b2a623385ba55b169e0f975ccb87] | committer: Andreas Rheinhardt Makefile: Prompt for reconfigure on lavc/hwaccels.h modification Adding a new AVHWAccel also adds a new CONFIG variable for it and said config variables are typically used to calculate the size of stack arrays. In such a context, an undefined CONFIG variable does not evaluate to zero; instead it leads to a compilation failure. Therefore treat this file like the other files containing lists of configurable components and prompt for reconfiguration if it is modified. (E.g. a44fba0b5b3b4090f9238751736198ddd1f0f1d5 led to compilation failures for me.) Reviewed-by: Paul B Mahol <onemda(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9f2eb198bc4b2a62… --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 35365f09d4..61f79e27ae 100644 --- a/Makefile +++ b/Makefile @@ -78,6 +78,7 @@ tools/target_dem_%_fuzzer$(EXESUF): $(FF_DEP_LIBS) CONFIGURABLE_COMPONENTS = \ $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) \ $(SRC_PATH)/libavcodec/bitstream_filters.c \ + $(SRC_PATH)/libavcodec/hwaccels.h \ $(SRC_PATH)/libavcodec/parsers.c \ $(SRC_PATH)/libavformat/protocols.c \

1 0

avformat/movenc: Fix invalid check
by Andreas Rheinhardt 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> | Thu Jun 30 22:09:55 2022 +0200| [e4be88704f617c8fccf87068037726debb56985e] | committer: Andreas Rheinhardt avformat/movenc: Fix invalid check Regression since c9de096851803d45444ae9dfe3a390a2d53ac71b. Fixes Coverity ID 1506839. Reviewed-by: Jan Ekström <jeebjp(a)gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt(a)outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e4be88704f617c8fc… --- libavformat/movenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 0ef6b3c76e..a4dace7c1d 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -424,7 +424,7 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) if (!info->pkt && !(info->pkt = av_packet_alloc())) return AVERROR(ENOMEM); - if ((ret = avpriv_ac3_parse_header(&hdr, pkt->data, pkt->size) < 0)) { + if ((ret = avpriv_ac3_parse_header(&hdr, pkt->data, pkt->size)) < 0) { if (ret == AVERROR(ENOMEM)) goto end;

1 0

avformat/movenc: limit ISOBMFF AC-3 mapping to bsids <=8
by Jan Ekström 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Jan Ekström <jan.ekstrom(a)24i.com> | Wed Jun 22 09:58:27 2022 +0300| [5eb8da6a81a11909d3908b47a9620096b8f3d654] | committer: Jan Ekström avformat/movenc: limit ISOBMFF AC-3 mapping to bsids <=8 This leaves out RealAudio DolbyNet, which utilizes bsids 9 and 10, It is not clear whether the interpreted bit rate value (divided by 2 or 4 depending on the variant), or the original bit rate value should be utilized to receive the bit_rate_code index. Signed-off-by: Jan Ekström <jan.ekstrom(a)24i.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5eb8da6a81a11909d… --- libavformat/movenc.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index a942271beb..0ef6b3c76e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -374,6 +374,14 @@ static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *trac return AVERROR(EINVAL); } + if (info->substream[0].bsid > 8) { + av_log(s, AV_LOG_ERROR, + "RealAudio AC-3/DolbyNet with bsid %d is not defined by the " + "ISOBMFF specification in ETSI TS 102 366!\n", + info->substream[0].bsid); + return AVERROR(EINVAL); + } + if (info->ac3_bit_rate_code < 0) { av_log(s, AV_LOG_ERROR, "No valid AC3 bit rate code for data rate of %d!\n",

1 0

avformat/movenc: handle OOM situations when parsing AC-3 headers
by Jan Ekström 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Jan Ekström <jan.ekstrom(a)24i.com> | Fri May 6 17:03:04 2022 +0300| [c9de096851803d45444ae9dfe3a390a2d53ac71b] | committer: Jan Ekström avformat/movenc: handle OOM situations when parsing AC-3 headers Signed-off-by: Jan Ekström <jan.ekstrom(a)24i.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9de096851803d454… --- libavformat/movenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 96a34b75b0..a942271beb 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -416,7 +416,10 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) if (!info->pkt && !(info->pkt = av_packet_alloc())) return AVERROR(ENOMEM); - if (avpriv_ac3_parse_header(&hdr, pkt->data, pkt->size) < 0) { + if ((ret = avpriv_ac3_parse_header(&hdr, pkt->data, pkt->size) < 0)) { + if (ret == AVERROR(ENOMEM)) + goto end; + /* drop the packets until we see a good one */ if (!track->entry) { av_log(mov->fc, AV_LOG_WARNING, "Dropping invalid packet from start of the stream\n");

1 0

avformat/movenc: utilize existing AC-3 parsing workflow for AC-3
by Jan Ekström 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Jan Ekström <jan.ekstrom(a)24i.com> | Fri May 6 17:25:15 2022 +0300| [3854c58d9e55ba297b47c1840c159cd39b373b6a] | committer: Jan Ekström avformat/movenc: utilize existing AC-3 parsing workflow for AC-3 Signed-off-by: Jan Ekström <jan.ekstrom(a)24i.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3854c58d9e55ba297… --- libavformat/movenc.c | 46 ++++++++++++++++++---------------------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b9e3f1a63e..96a34b75b0 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -363,44 +363,34 @@ struct eac3_info { static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) { - GetBitContext gbc; + struct eac3_info *info = track->eac3_priv; PutBitContext pbc; uint8_t buf[3]; - int fscod, bsid, bsmod, acmod, lfeon, frmsizecod; - if (track->vos_len < 7) { + if (!info || !info->ec3_done) { av_log(s, AV_LOG_ERROR, "Cannot write moov atom before AC3 packets." " Set the delay_moov flag to fix this.\n"); return AVERROR(EINVAL); } + if (info->ac3_bit_rate_code < 0) { + av_log(s, AV_LOG_ERROR, + "No valid AC3 bit rate code for data rate of %d!\n", + info->data_rate); + return AVERROR(EINVAL); + } + avio_wb32(pb, 11); ffio_wfourcc(pb, "dac3"); - init_get_bits(&gbc, track->vos_data + 4, (track->vos_len - 4) * 8); - fscod = get_bits(&gbc, 2); - frmsizecod = get_bits(&gbc, 6); - bsid = get_bits(&gbc, 5); - bsmod = get_bits(&gbc, 3); - acmod = get_bits(&gbc, 3); - if (acmod == 2) { - skip_bits(&gbc, 2); // dsurmod - } else { - if ((acmod & 1) && acmod != 1) - skip_bits(&gbc, 2); // cmixlev - if (acmod & 4) - skip_bits(&gbc, 2); // surmixlev - } - lfeon = get_bits1(&gbc); - init_put_bits(&pbc, buf, sizeof(buf)); - put_bits(&pbc, 2, fscod); - put_bits(&pbc, 5, bsid); - put_bits(&pbc, 3, bsmod); - put_bits(&pbc, 3, acmod); - put_bits(&pbc, 1, lfeon); - put_bits(&pbc, 5, frmsizecod >> 1); // bit_rate_code + put_bits(&pbc, 2, info->substream[0].fscod); + put_bits(&pbc, 5, info->substream[0].bsid); + put_bits(&pbc, 3, info->substream[0].bsmod); + put_bits(&pbc, 3, info->substream[0].acmod); + put_bits(&pbc, 1, info->substream[0].lfeon); + put_bits(&pbc, 5, info->ac3_bit_rate_code); // bit_rate_code put_bits(&pbc, 5, 0); // reserved flush_put_bits(&pbc); @@ -6029,8 +6019,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) if ((par->codec_id == AV_CODEC_ID_DNXHD || par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_HEVC || - par->codec_id == AV_CODEC_ID_TRUEHD || - par->codec_id == AV_CODEC_ID_AC3) && !trk->vos_len && + par->codec_id == AV_CODEC_ID_TRUEHD) && !trk->vos_len && !TAG_IS_AVCI(trk->tag)) { /* copy frame to create needed atoms */ trk->vos_len = size; @@ -6107,7 +6096,8 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) } } - } else if (par->codec_id == AV_CODEC_ID_EAC3) { + } else if (par->codec_id == AV_CODEC_ID_AC3 || + par->codec_id == AV_CODEC_ID_EAC3) { size = handle_eac3(mov, pkt, trk); if (size < 0) return size;

1 0

avformat/movenc: move eac3_info definition so that it can be used for AC-3
by Jan Ekström 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Jan Ekström <jan.ekstrom(a)24i.com> | Fri May 27 09:20:24 2022 +0300| [b6897e9c082687634c78e4c133f21c3baea16415] | committer: Jan Ekström avformat/movenc: move eac3_info definition so that it can be used for AC-3 Signed-off-by: Jan Ekström <jan.ekstrom(a)24i.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6897e9c082687634… --- libavformat/movenc.c | 66 ++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8316fd9a45..b9e3f1a63e 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -328,6 +328,39 @@ static int mov_write_amr_tag(AVIOContext *pb, MOVTrack *track) return 0x11; } +struct eac3_info { + AVPacket *pkt; + uint8_t ec3_done; + uint8_t num_blocks; + + /* Layout of the EC3SpecificBox */ + /* maximum bitrate */ + uint16_t data_rate; + int8_t ac3_bit_rate_code; + /* number of independent substreams */ + uint8_t num_ind_sub; + struct { + /* sample rate code (see ff_ac3_sample_rate_tab) 2 bits */ + uint8_t fscod; + /* bit stream identification 5 bits */ + uint8_t bsid; + /* one bit reserved */ + /* audio service mixing (not supported yet) 1 bit */ + /* bit stream mode 3 bits */ + uint8_t bsmod; + /* audio coding mode 3 bits */ + uint8_t acmod; + /* sub woofer on 1 bit */ + uint8_t lfeon; + /* 3 bits reserved */ + /* number of dependent substreams associated with this substream 4 bits */ + uint8_t num_dep_sub; + /* channel locations of the dependent substream(s), if any, 9 bits */ + uint16_t chan_loc; + /* if there is no dependent substream, then one bit reserved instead */ + } substream[1]; /* TODO: support 8 independent substreams */ +}; + static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) { GetBitContext gbc; @@ -376,39 +409,6 @@ static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *trac return 11; } -struct eac3_info { - AVPacket *pkt; - uint8_t ec3_done; - uint8_t num_blocks; - - /* Layout of the EC3SpecificBox */ - /* maximum bitrate */ - uint16_t data_rate; - int8_t ac3_bit_rate_code; - /* number of independent substreams */ - uint8_t num_ind_sub; - struct { - /* sample rate code (see ff_ac3_sample_rate_tab) 2 bits */ - uint8_t fscod; - /* bit stream identification 5 bits */ - uint8_t bsid; - /* one bit reserved */ - /* audio service mixing (not supported yet) 1 bit */ - /* bit stream mode 3 bits */ - uint8_t bsmod; - /* audio coding mode 3 bits */ - uint8_t acmod; - /* sub woofer on 1 bit */ - uint8_t lfeon; - /* 3 bits reserved */ - /* number of dependent substreams associated with this substream 4 bits */ - uint8_t num_dep_sub; - /* channel locations of the dependent substream(s), if any, 9 bits */ - uint16_t chan_loc; - /* if there is no dependent substream, then one bit reserved instead */ - } substream[1]; /* TODO: support 8 independent substreams */ -}; - static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) { AC3HeaderInfo *hdr = NULL;

1 0

avformat/movenc: enable handle_eac3 to handle AC-3 tracks
by Jan Ekström 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Jan Ekström <jan.ekstrom(a)24i.com> | Wed Jun 1 09:45:54 2022 +0300| [ad1672529faf6579bd8f28167582587511c4f795] | committer: Jan Ekström avformat/movenc: enable handle_eac3 to handle AC-3 tracks Add the AC-3 frame type, as well as early exit from additional packet parsing in case of AC-3, as only a single packet is required to get the required information. Additionally, expose ac3_bit_rate_code via the eac3_info struct as it is required for AC3SpecificBox. Signed-off-by: Jan Ekström <jan.ekstrom(a)24i.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ad1672529faf6579b… --- libavformat/movenc.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b799491fd4..8316fd9a45 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -384,6 +384,7 @@ struct eac3_info { /* Layout of the EC3SpecificBox */ /* maximum bitrate */ uint16_t data_rate; + int8_t ac3_bit_rate_code; /* number of independent substreams */ uint8_t num_ind_sub; struct { @@ -414,8 +415,12 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) struct eac3_info *info; int num_blocks, ret; - if (!track->eac3_priv && !(track->eac3_priv = av_mallocz(sizeof(*info)))) - return AVERROR(ENOMEM); + if (!track->eac3_priv) { + if (!(track->eac3_priv = av_mallocz(sizeof(*info)))) + return AVERROR(ENOMEM); + + ((struct eac3_info *)track->eac3_priv)->ac3_bit_rate_code = -1; + } info = track->eac3_priv; if (!info->pkt && !(info->pkt = av_packet_alloc())) @@ -432,6 +437,8 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) } info->data_rate = FFMAX(info->data_rate, hdr->bit_rate / 1000); + info->ac3_bit_rate_code = FFMAX(info->ac3_bit_rate_code, + hdr->ac3_bit_rate_code); num_blocks = hdr->num_blocks; if (!info->ec3_done) { @@ -443,7 +450,8 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) /* this should always be the case, given that our AC-3 parser * concatenates dependent frames to their independent parent */ - if (hdr->frame_type == EAC3_FRAME_TYPE_INDEPENDENT) { + if (hdr->frame_type == EAC3_FRAME_TYPE_INDEPENDENT || + hdr->frame_type == EAC3_FRAME_TYPE_AC3_CONVERT) { /* substream ids must be incremental */ if (hdr->substreamid > info->num_ind_sub + 1) { ret = AVERROR(EINVAL); @@ -475,6 +483,14 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) info->substream[hdr->substreamid].acmod = hdr->channel_mode; info->substream[hdr->substreamid].lfeon = hdr->lfe_on; + if (track->par->codec_id == AV_CODEC_ID_AC3) { + // with AC-3 we only require the information of a single packet, + // so we can finish as soon as the basic values of the bit stream + // have been set to the track's informational structure. + info->ec3_done = 1; + goto concatenate; + } + /* Parse dependent substream(s), if any */ if (pkt->size != hdr->frame_size) { int cumul_size = hdr->frame_size;

1 0

{configure,avformat/movenc}: enable AC-3 parser for movenc
by Jan Ekström 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Jan Ekström <jan.ekstrom(a)24i.com> | Wed May 4 13:51:09 2022 +0300| [3bb23a8b3cee3a59028854f2821cbdc3152cff71] | committer: Jan Ekström {configure,avformat/movenc}: enable AC-3 parser for movenc This simplifies the code to no longer have #ifs in a manner which does not require handling avpriv_ac3_parse_header returning ENOSYS. As an existing example, the MPEG-TS muxer already requires the AC-3 parser, and in order to fix existing issues with the current AC-3 movenc code, switching to use the AC-3 parser is required, so this is an enabling change for that. Signed-off-by: Jan Ekström <jan.ekstrom(a)24i.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3bb23a8b3cee3a590… --- configure | 2 +- libavformat/movenc.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/configure b/configure index 0de9b2abcb..fea512e8ef 100755 --- a/configure +++ b/configure @@ -3444,7 +3444,7 @@ mlp_demuxer_select="mlp_parser" mmf_muxer_select="riffenc" mov_demuxer_select="iso_media riffdec" mov_demuxer_suggest="zlib" -mov_muxer_select="iso_media riffenc rtpenc_chain vp9_superframe_bsf aac_adtstoasc_bsf" +mov_muxer_select="iso_media riffenc rtpenc_chain vp9_superframe_bsf aac_adtstoasc_bsf ac3_parser" mp3_demuxer_select="mpegaudio_parser" mp3_muxer_select="mpegaudioheader" mp4_muxer_select="mov_muxer" diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 106b5a6807..b799491fd4 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -408,7 +408,6 @@ struct eac3_info { } substream[1]; /* TODO: support 8 independent substreams */ }; -#if CONFIG_AC3_PARSER static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track) { AC3HeaderInfo *hdr = NULL; @@ -549,7 +548,6 @@ end: return ret; } -#endif static int mov_write_eac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) { @@ -6093,7 +6091,6 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) } } -#if CONFIG_AC3_PARSER } else if (par->codec_id == AV_CODEC_ID_EAC3) { size = handle_eac3(mov, pkt, trk); if (size < 0) @@ -6101,7 +6098,6 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) else if (!size) goto end; avio_write(pb, pkt->data, size); -#endif } else if (par->codec_id == AV_CODEC_ID_EIA_608) { size = 8;

1 0

avcodec/ac3_parser{,_internal}: expose AC-3 bit_rate_code
by Jan Ekström 30 Jun '22

30 Jun '22

ffmpeg | branch: master | Jan Ekström <jan.ekstrom(a)24i.com> | Fri Jun 3 12:34:47 2022 +0300| [92dc9c9d682a3f7f552d61cdbfca7ae6607de0ee] | committer: Jan Ekström avcodec/ac3_parser{,_internal}: expose AC-3 bit_rate_code Required by MP4's AC3SpecificBox and MPEG-TS AC-3 audio_descriptor, of which the former is implemented in our MP4 writer. Signed-off-by: Jan Ekström <jan.ekstrom(a)24i.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=92dc9c9d682a3f7f5… --- libavcodec/ac3_parser.c | 5 ++++- libavcodec/ac3_parser_internal.h | 1 + libavcodec/version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index 119b1598c5..4f154bb7c4 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -70,6 +70,7 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) return AAC_AC3_PARSE_ERROR_BSID; hdr->num_blocks = 6; + hdr->ac3_bit_rate_code = -1; /* set default mix levels */ hdr->center_mix_level = 5; // -4.5dB @@ -89,6 +90,8 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) if(frame_size_code > 37) return AAC_AC3_PARSE_ERROR_FRAME_SIZE; + hdr->ac3_bit_rate_code = (frame_size_code >> 1); + skip_bits(gbc, 5); // skip bsid, already got it hdr->bitstream_mode = get_bits(gbc, 3); @@ -106,7 +109,7 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) hdr->sr_shift = FFMAX(hdr->bitstream_id, 8) - 8; hdr->sample_rate = ff_ac3_sample_rate_tab[hdr->sr_code] >> hdr->sr_shift; - hdr->bit_rate = (ff_ac3_bitrate_tab[frame_size_code>>1] * 1000) >> hdr->sr_shift; + hdr->bit_rate = (ff_ac3_bitrate_tab[hdr->ac3_bit_rate_code] * 1000) >> hdr->sr_shift; hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on; hdr->frame_size = ff_ac3_frame_size_tab[frame_size_code][hdr->sr_code] * 2; hdr->frame_type = EAC3_FRAME_TYPE_AC3_CONVERT; //EAC3_FRAME_TYPE_INDEPENDENT; diff --git a/libavcodec/ac3_parser_internal.h b/libavcodec/ac3_parser_internal.h index dd57dc95a6..bd4e1bbffb 100644 --- a/libavcodec/ac3_parser_internal.h +++ b/libavcodec/ac3_parser_internal.h @@ -60,6 +60,7 @@ typedef struct AC3HeaderInfo { uint8_t channels; uint16_t frame_size; uint64_t channel_layout; + int8_t ac3_bit_rate_code; /** @} */ } AC3HeaderInfo; diff --git a/libavcodec/version.h b/libavcodec/version.h index 0ef6c991f3..1008fead27 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 34 +#define LIBAVCODEC_VERSION_MINOR 35 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

1 0