RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-03 02:58:02 +00:00
Code Issues Projects Releases Wiki Activity

avformat/movenc: utilize bit rate helper function in ISML writing

Browse Source 
This way we have a single location in movenc which utilizes the
CPB properties.
This commit is contained in:
Jan Ekström 2020-09-20 15:01:29 +03:00
parent 667d5045d3
commit 6475dc18cc
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/movenc.c
View File

@ -4160,7 +4160,6 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat
int64_t pos = avio_tell(pb); int64_t pos = avio_tell(pb);
int i; int i;
int64_t manifest_bit_rate = 0; int64_t manifest_bit_rate = 0;
AVCPBProperties *props = NULL;
static const uint8_t uuid[] = { static const uint8_t uuid[] = {
0xa5, 0xd4, 0x0b, 0x30, 0xe8, 0x14, 0x11, 0xdd, 0xa5, 0xd4, 0x0b, 0x30, 0xe8, 0x14, 0x11, 0xdd,
@ -4186,6 +4185,8 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat
for (i = 0; i < mov->nb_streams; i++) { for (i = 0; i < mov->nb_streams; i++) {
MOVTrack *track = &mov->tracks[i]; MOVTrack *track = &mov->tracks[i];
struct mpeg4_bit_rate_values bit_rates =
calculate_mpeg4_bit_rates(track);
const char *type; const char *type;
int track_id = track->track_id; int track_id = track->track_id;
char track_name_buf[32] = { 0 }; char track_name_buf[32] = { 0 };
@ -4201,12 +4202,10 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat
continue; continue;
} }
props = (AVCPBProperties*)av_stream_get_side_data(track->st, AV_PKT_DATA_CPB_PROPERTIES, NULL);
if (track->par->bit_rate) { if (track->par->bit_rate) {
manifest_bit_rate = track->par->bit_rate; manifest_bit_rate = track->par->bit_rate;
} else if (props) { } else {
manifest_bit_rate = props->max_bitrate; manifest_bit_rate = bit_rates.max_bit_rate;
} }
avio_printf(pb, "<%s systemBitrate=\"%"PRId64"\">\n", type, avio_printf(pb, "<%s systemBitrate=\"%"PRId64"\">\n", type,