virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

Revert "lavf/dashenc: update bitrates on dash_write_trailer"

Browse Source 
This reverts commit 89c0fda5f4.

A different solution will be committed instead.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-09-26 13:59:56 -03:00
parent 6bf48c4805
commit 52223ffe44
1 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libavformat/dashenc.c
View File

@ -443,30 +443,6 @@ static int write_manifest(AVFormatContext *s, int final)
return 0;
}
static int set_bitrate(AVFormatContext *s)
{
DASHContext *c = s->priv_data;
int i;
for (i = 0; i < s->nb_streams; i++) {
OutputStream *os = &c->streams[i];
os->bit_rate = s->streams[i]->codecpar->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 ?
AV_LOG_ERROR : AV_LOG_WARNING;
av_log(s, level, "No bit rate set for stream %d\n", i);
if (s->strict_std_compliance >= FF_COMPLIANCE_STRICT)
return AVERROR(EINVAL);
}
}
return 0;
}
static int dash_init(AVFormatContext *s)
{
DASHContext *c = s->priv_data;
@ -503,10 +479,6 @@ static int dash_init(AVFormatContext *s)
if (!c->streams)
return AVERROR(ENOMEM);
ret = set_bitrate(s);
if (ret < 0)
return ret;
for (i = 0; i < s->nb_streams; i++) {
OutputStream *os = &c->streams[i];
AVFormatContext *ctx;
@ -514,6 +486,18 @@ static int dash_init(AVFormatContext *s)
AVDictionary *opts = NULL;
char filename[1024];
os->bit_rate = s->streams[i]->codecpar->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 ?
AV_LOG_ERROR : AV_LOG_WARNING;
av_log(s, level, "No bit rate set for stream %d\n", i);
if (s->strict_std_compliance >= FF_COMPLIANCE_STRICT)
return AVERROR(EINVAL);
}
ctx = avformat_alloc_context();
if (!ctx)
return AVERROR(ENOMEM);
@ -878,8 +862,6 @@ static int dash_write_trailer(AVFormatContext *s)
{
DASHContext *c = s->priv_data;
set_bitrate(s);
if (s->nb_streams > 0) {
OutputStream *os = &c->streams[0];
// If no segments have been written so far, try to do a crude