virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avformat/movenc: handle EAC-3 extension bits for Atmos

Browse Source 
Based on a patch by nyanmisaka.
Fixes commit #9996.

Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
nyanmisaka
2025-06-03 23:41:02 +08:00
committed by James Almer
parent 117343c0ba
commit ebcf2dcb2c
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/movenc.c
View File

@ -393,6 +393,8 @@ struct eac3_info {
uint16_t chan_loc; uint16_t chan_loc;
/* if there is no dependent substream, then one bit reserved instead */ /* if there is no dependent substream, then one bit reserved instead */
} substream[1]; /* TODO: support 8 independent substreams */ } substream[1]; /* TODO: support 8 independent substreams */
/* indicates the decoding complexity, 8 bits */
uint8_t complexity_index_type_a;
}; };
static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track) static int mov_write_ac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *track)
@ -474,6 +476,8 @@ static int handle_eac3(MOVMuxContext *mov, AVPacket *pkt, MOVTrack *track)
info->data_rate = FFMAX(info->data_rate, hdr->bit_rate / 1000); info->data_rate = FFMAX(info->data_rate, hdr->bit_rate / 1000);
info->ac3_bit_rate_code = FFMAX(info->ac3_bit_rate_code, info->ac3_bit_rate_code = FFMAX(info->ac3_bit_rate_code,
hdr->ac3_bit_rate_code); hdr->ac3_bit_rate_code);
info->complexity_index_type_a = hdr->complexity_index_type_a;
num_blocks = hdr->num_blocks; num_blocks = hdr->num_blocks;
if (!info->ec3_done) { if (!info->ec3_done) {
@ -601,7 +605,7 @@ static int mov_write_eac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra
} }
info = track->eac3_priv; info = track->eac3_priv;
size = 2 + ((32 * (info->num_ind_sub + 1) + 7) >> 3); size = 2 + (4 * (info->num_ind_sub + 1)) + (2 * !!info->complexity_index_type_a);
buf = av_malloc(size); buf = av_malloc(size);
if (!buf) { if (!buf) {
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -626,6 +630,11 @@ static int mov_write_eac3_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra
put_bits(&pbc, 9, info->substream[i].chan_loc); put_bits(&pbc, 9, info->substream[i].chan_loc);
} }
} }
if (info->complexity_index_type_a) {
put_bits(&pbc, 7, 0); /* reserved */
put_bits(&pbc, 1, 1); // flag_eac3_extension_type_a
put_bits(&pbc, 8, info->complexity_index_type_a);
}
flush_put_bits(&pbc); flush_put_bits(&pbc);
size = put_bytes_output(&pbc); size = put_bytes_output(&pbc);

4
libavformat/version.h
View File

@ -31,8 +31,8 @@
#include "version_major.h" #include "version_major.h"
#define LIBAVFORMAT_VERSION_MINOR 0 #define LIBAVFORMAT_VERSION_MINOR 1
#define LIBAVFORMAT_VERSION_MICRO 102 #define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \ LIBAVFORMAT_VERSION_MINOR, \