virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avformat/dashenc: constructing MPD's bandwidth string locally

Browse Source
This commit is contained in:
Vishwanath Dixit 2018-04-11 12:32:11 +05:30 committed by Karthick Jeyapal
parent 0c7bc7eb47
commit af6058d03b
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/dashenc.c
View File

@ -78,7 +78,6 @@ typedef struct OutputStream {
int64_t first_pts, start_pts, max_pts; int64_t first_pts, start_pts, max_pts;
int64_t last_dts; int64_t last_dts;
int bit_rate; int bit_rate;
char bandwidth_str[64];
char codec_str[100]; char codec_str[100];
int written_len; int written_len;
@ -549,20 +548,25 @@ static int write_adaptation_set(AVFormatContext *s, AVIOContext *out, int as_ind
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
OutputStream *os = &c->streams[i]; OutputStream *os = &c->streams[i];
char bandwidth_str[64] = {'\0'};
if (os->as_idx - 1 != as_index) if (os->as_idx - 1 != as_index)
continue; continue;
if (os->bit_rate > 0)
snprintf(bandwidth_str, sizeof(bandwidth_str), " bandwidth=\"%d\"",
os->bit_rate);
if (as->media_type == AVMEDIA_TYPE_VIDEO) { if (as->media_type == AVMEDIA_TYPE_VIDEO) {
AVStream *st = s->streams[i]; AVStream *st = s->streams[i];
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\"",
i, os->format_name, os->codec_str, os->bandwidth_str, s->streams[i]->codecpar->width, s->streams[i]->codecpar->height); i, os->format_name, os->codec_str, bandwidth_str, s->streams[i]->codecpar->width, s->streams[i]->codecpar->height);
if (st->avg_frame_rate.num) if (st->avg_frame_rate.num)
avio_printf(out, " frameRate=\"%d/%d\"", st->avg_frame_rate.num, st->avg_frame_rate.den); avio_printf(out, " frameRate=\"%d/%d\"", st->avg_frame_rate.num, st->avg_frame_rate.den);
avio_printf(out, ">\n"); avio_printf(out, ">\n");
} else { } else {
avio_printf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"audio/%s\" codecs=\"%s\"%s audioSamplingRate=\"%d\">\n", avio_printf(out, "\t\t\t<Representation id=\"%d\" mimeType=\"audio/%s\" codecs=\"%s\"%s audioSamplingRate=\"%d\">\n",
i, os->format_name, os->codec_str, os->bandwidth_str, s->streams[i]->codecpar->sample_rate); i, os->format_name, os->codec_str, bandwidth_str, s->streams[i]->codecpar->sample_rate);
avio_printf(out, "\t\t\t\t<AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\" />\n", avio_printf(out, "\t\t\t\t<AudioChannelConfiguration schemeIdUri=\"urn:mpeg:dash:23003:3:audio_channel_configuration:2011\" value=\"%d\" />\n",
s->streams[i]->codecpar->channels); s->streams[i]->codecpar->channels);
} }
@ -918,10 +922,7 @@ static int dash_init(AVFormatContext *s)
char filename[1024]; char filename[1024];
os->bit_rate = s->streams[i]->codecpar->bit_rate; os->bit_rate = s->streams[i]->codecpar->bit_rate;
if (os->bit_rate) { if (!os->bit_rate) {
snprintf(os->bandwidth_str, sizeof(os->bandwidth_str),
" bandwidth=\"%d\"", os->bit_rate);
} else {
int level = s->strict_std_compliance >= FF_COMPLIANCE_STRICT ? int level = s->strict_std_compliance >= FF_COMPLIANCE_STRICT ?
AV_LOG_ERROR : AV_LOG_WARNING; AV_LOG_ERROR : AV_LOG_WARNING;
av_log(s, level, "No bit rate set for stream %d\n", i); av_log(s, level, "No bit rate set for stream %d\n", i);
@ -1236,11 +1237,8 @@ static int dash_flush(AVFormatContext *s, int final, int stream)
int64_t bitrate = (int64_t) range_length * 8 * AV_TIME_BASE / av_rescale_q(os->max_pts - os->start_pts, int64_t bitrate = (int64_t) range_length * 8 * AV_TIME_BASE / av_rescale_q(os->max_pts - os->start_pts,
st->time_base, st->time_base,
AV_TIME_BASE_Q); AV_TIME_BASE_Q);
if (bitrate >= 0) { if (bitrate >= 0)
os->bit_rate = bitrate; os->bit_rate = bitrate;
snprintf(os->bandwidth_str, sizeof(os->bandwidth_str),
" bandwidth=\"%d\"", os->bit_rate);
}
} }
add_segment(os, os->filename, os->start_pts, os->max_pts - os->start_pts, os->pos, range_length, index_length); add_segment(os, os->filename, os->start_pts, os->max_pts - os->start_pts, os->pos, range_length, index_length);
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);