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

avformat/dashenc: Calculate average bitrate for adaptation sets in static manifest 

If stream's bitrate is not specified:
- for static manifest: an average bitrate will be calculated and used,
- for dynamic manifest: first segment's bitrate will be calculated and used, as before,
for bandwidth setting in adaptation sets.
This commit is contained in:
Przemysław Sobala 2020-06-17 13:50:12 +02:00 committed by Karthick J
parent 19726288d8
commit 82352f3c1a
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libavformat/dashenc.c
View File

@ -115,6 +115,7 @@ typedef struct OutputStream {
int64_t last_dts, last_pts; int64_t last_dts, last_pts;
int last_flags; int last_flags;
int bit_rate; int bit_rate;
int first_segment_bit_rate;
SegmentType segment_type; /* segment type selected for this particular stream */ SegmentType segment_type; /* segment type selected for this particular stream */
const char *format_name; const char *format_name;
const char *extension_name; const char *extension_name;
@ -840,8 +841,12 @@ static int write_adaptation_set(AVFormatContext *s, AVIOContext *out, int as_ind
continue; continue;
if (os->bit_rate > 0) if (os->bit_rate > 0)
snprintf(bandwidth_str, sizeof(bandwidth_str), " bandwidth=\"%d\"", snprintf(bandwidth_str, sizeof(bandwidth_str), " bandwidth=\"%d\"", os->bit_rate);
os->bit_rate); else if (final) {
int average_bit_rate = os->pos * 8 * AV_TIME_BASE / c->total_duration;
snprintf(bandwidth_str, sizeof(bandwidth_str), " bandwidth=\"%d\"", average_bit_rate);
} else if (os->first_segment_bit_rate > 0)
snprintf(bandwidth_str, sizeof(bandwidth_str), " bandwidth=\"%d\"", os->first_segment_bit_rate);
if (as->media_type == AVMEDIA_TYPE_VIDEO) { if (as->media_type == AVMEDIA_TYPE_VIDEO) {
avio_printf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"video/%s\" codecs=\"%s\"%s width=\"%d\" height=\"%d\"", avio_printf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"video/%s\" codecs=\"%s\"%s width=\"%d\" height=\"%d\"",
@ -1305,7 +1310,13 @@ static int write_manifest(AVFormatContext *s, int final)
OutputStream *os = &c->streams[i]; OutputStream *os = &c->streams[i];
char *agroup = NULL; char *agroup = NULL;
char *codec_str_ptr = NULL; char *codec_str_ptr = NULL;
int stream_bitrate = st->codecpar->bit_rate + os->muxer_overhead; int stream_bitrate = os->muxer_overhead;
if (os->bit_rate > 0)
stream_bitrate += os->bit_rate;
else if (final)
stream_bitrate += os->pos * 8 * AV_TIME_BASE / c->total_duration;
else if (os->first_segment_bit_rate > 0)
stream_bitrate += os->first_segment_bit_rate;
if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO) if (st->codecpar->codec_type != AVMEDIA_TYPE_VIDEO)
continue; continue;
if (os->segment_type != SEGMENT_TYPE_MP4) if (os->segment_type != SEGMENT_TYPE_MP4)
@ -1958,11 +1969,8 @@ static int dash_flush(AVFormatContext *s, int final, int stream)
os->total_pkt_size = 0; os->total_pkt_size = 0;
os->total_pkt_duration = 0; os->total_pkt_duration = 0;
if (!os->bit_rate) { if (!os->bit_rate && !os->first_segment_bit_rate) {
// calculate average bitrate of first segment os->first_segment_bit_rate = (int64_t) range_length * 8 * AV_TIME_BASE / duration;
int64_t bitrate = (int64_t) range_length * 8 * AV_TIME_BASE / duration;
if (bitrate >= 0)
os->bit_rate = bitrate;
} }
add_segment(os, os->filename, os->start_pts, os->max_pts - os->start_pts, os->pos, range_length, index_length, next_exp_index); add_segment(os, os->filename, os->start_pts, os->max_pts - os->start_pts, os->pos, range_length, index_length, next_exp_index);
av_log(s, AV_LOG_VERBOSE, "Representation %d media segment %d written to: %s\n", i, os->segment_index, os->full_path); av_log(s, AV_LOG_VERBOSE, "Representation %d media segment %d written to: %s\n", i, os->segment_index, os->full_path);