RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/movenc: simplify ISML manifest bit rate logic 

The newly calculated average bit rate value is pretty much what is
being done here.
This commit is contained in:
Jan Ekström 2020-09-20 19:55:14 +03:00
parent 308882d9f2
commit 519bd469d0
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/movenc.c
View File

@ -4209,7 +4209,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;
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,
@ -4252,15 +4251,9 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat
continue; continue;
} }
if (track->par->bit_rate) { avio_printf(pb, "<%s systemBitrate=\"%"PRIu32"\">\n", type,
manifest_bit_rate = track->par->bit_rate; bit_rates.avg_bit_rate);
} else { param_write_int(pb, "systemBitrate", bit_rates.avg_bit_rate);
manifest_bit_rate = bit_rates.max_bit_rate;
}
avio_printf(pb, "<%s systemBitrate=\"%"PRId64"\">\n", type,
manifest_bit_rate);
param_write_int(pb, "systemBitrate", manifest_bit_rate);
param_write_int(pb, "trackID", track_id); param_write_int(pb, "trackID", track_id);
param_write_string(pb, "systemLanguage", lang ? lang->value : "und"); param_write_string(pb, "systemLanguage", lang ? lang->value : "und");