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

avformat/hlsenc: use stream's maximum bit rate as fall-back advertised rate 

Enables having proper bit rate values being written into the master
playlist in case of hard-constrained VBR where the maximum bit
rate utilized is known before hand.

Does the same thing as movenc.c, for example.

Signed-off-by: Jan Ekström <jan.ekstrom@aminocom.com>
This commit is contained in:
Jan Ekström 2018-03-23 14:41:28 +02:00 committed by Jan Ekström
parent 87455b78cc
commit 5b31dd1c6b
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/hlsenc.c
View File

@ -1174,6 +1174,21 @@ static int get_relative_url(const char *master_url, const char *media_url,
return 0;
}
static int64_t get_stream_bit_rate(AVStream *stream) {
AVCPBProperties *props = (AVCPBProperties*)av_stream_get_side_data(
stream,
AV_PKT_DATA_CPB_PROPERTIES,
NULL
);
if (stream->codecpar->bit_rate)
return stream->codecpar->bit_rate;
else if (props)
return props->max_bitrate;
return 0;
}
static int create_master_playlist(AVFormatContext *s,
VariantStream * const input_vs)
{
@ -1300,9 +1315,9 @@ static int create_master_playlist(AVFormatContext *s,
bandwidth = 0;
if (vid_st)
bandwidth += vid_st->codecpar->bit_rate;
bandwidth += get_stream_bit_rate(vid_st);
if (aud_st)
bandwidth += aud_st->codecpar->bit_rate;
bandwidth += get_stream_bit_rate(aud_st);
bandwidth += bandwidth / 10;
ccgroup = NULL;