diff options
| author | Jan Ekström <jan.ekstrom@24i.com> | 2022-06-03 12:34:47 +0300 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2022-06-30 16:14:05 +0300 |
| commit | 92dc9c9d682a3f7f552d61cdbfca7ae6607de0ee (patch) | |
| tree | 3dbd92d440218970d37aec58571ca71b0f214e5e | |
| parent | 3f72155fc664b6abccd194d71cbec44183ab64d9 (diff) | |
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@24i.com>
| -rw-r--r-- | libavcodec/ac3_parser.c | 5 | ||||
| -rw-r--r-- | libavcodec/ac3_parser_internal.h | 1 | ||||
| -rw-r--r-- | 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, \ |