RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-18 05:11:09 +00:00
Code Issues Projects Releases Wiki Activity

lavf/webm_dash: Fix incorrect bandwidth computation

Browse Source 
Fix incorrect bandwidth computation in some cases. When the cue end
descriptor is null (i.e.) start_time_ns == -1, existing bandwidth
computed (if any) should be returned rather than returning 0.

Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Vignesh Venkatasubramanian 2014-10-01 10:13:31 -07:00 committed by Michael Niedermayer
parent 8acb76567a
commit b1071db3df
1 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
libavformat/matroskadec.c
View File

@ -3188,55 +3188,57 @@ static int64_t webm_dash_manifest_compute_bandwidth(AVFormatContext *s, int64_t
} }
if (desc_end.start_time_ns == -1) { if (desc_end.start_time_ns == -1) {
// The prebuffer is larger than the duration. // The prebuffer is larger than the duration.
return (matroska->duration * matroska->time_scale >= prebuffered_ns) ? -1 : 0; if (matroska->duration * matroska->time_scale >= prebuffered_ns)
} return -1;
bits_per_second = 0.0;
} else {
// The prebuffer ends in the last Cue. Estimate how much data was
// prebuffered.
pre_bytes = desc_end.end_offset - desc_end.start_offset;
pre_ns = desc_end.end_time_ns - desc_end.start_time_ns;
pre_sec = pre_ns / nano_seconds_per_second;
prebuffer_bytes +=
pre_bytes * ((temp_prebuffer_ns / nano_seconds_per_second) / pre_sec);
// The prebuffer ends in the last Cue. Estimate how much data was prebuffer = prebuffer_ns / nano_seconds_per_second;
// prebuffered.
pre_bytes = desc_end.end_offset - desc_end.start_offset;
pre_ns = desc_end.end_time_ns - desc_end.start_time_ns;
pre_sec = pre_ns / nano_seconds_per_second;
prebuffer_bytes +=
pre_bytes * ((temp_prebuffer_ns / nano_seconds_per_second) / pre_sec);
prebuffer = prebuffer_ns / nano_seconds_per_second; // Set this to 0.0 in case our prebuffer buffers the entire video.
bits_per_second = 0.0;
do {
int64_t desc_bytes = desc_end.end_offset - desc_beg.start_offset;
int64_t desc_ns = desc_end.end_time_ns - desc_beg.start_time_ns;
double desc_sec = desc_ns / nano_seconds_per_second;
double calc_bits_per_second = (desc_bytes * 8) / desc_sec;
// Set this to 0.0 in case our prebuffer buffers the entire video. // Drop the bps by the percentage of bytes buffered.
bits_per_second = 0.0; double percent = (desc_bytes - prebuffer_bytes) / desc_bytes;
do { double mod_bits_per_second = calc_bits_per_second * percent;
int64_t desc_bytes = desc_end.end_offset - desc_beg.start_offset;
int64_t desc_ns = desc_end.end_time_ns - desc_beg.start_time_ns;
double desc_sec = desc_ns / nano_seconds_per_second;
double calc_bits_per_second = (desc_bytes * 8) / desc_sec;
// Drop the bps by the percentage of bytes buffered. if (prebuffer < desc_sec) {
double percent = (desc_bytes - prebuffer_bytes) / desc_bytes; double search_sec =
double mod_bits_per_second = calc_bits_per_second * percent; (double)(matroska->duration * matroska->time_scale) / nano_seconds_per_second;
if (prebuffer < desc_sec) { // Add 1 so the bits per second should be a little bit greater than file
double search_sec = // datarate.
(double)(matroska->duration * matroska->time_scale) / nano_seconds_per_second; int64_t bps = (int64_t)(mod_bits_per_second) + 1;
const double min_buffer = 0.0;
double buffer = prebuffer;
double sec_to_download = 0.0;
// Add 1 so the bits per second should be a little bit greater than file int rv = buffer_size_after_time_downloaded(prebuffered_ns, search_sec, bps,
// datarate. min_buffer, &buffer, &sec_to_download,
int64_t bps = (int64_t)(mod_bits_per_second) + 1; s, cues_start);
const double min_buffer = 0.0; if (rv < 0) {
double buffer = prebuffer; return -1;
double sec_to_download = 0.0; } else if (rv == 0) {
bits_per_second = (double)(bps);
int rv = buffer_size_after_time_downloaded(prebuffered_ns, search_sec, bps, break;
min_buffer, &buffer, &sec_to_download, }
s, cues_start);
if (rv < 0) {
return -1;
} else if (rv == 0) {
bits_per_second = (double)(bps);
break;
} }
}
desc_end = get_cue_desc(s, desc_end.end_time_ns, cues_start); desc_end = get_cue_desc(s, desc_end.end_time_ns, cues_start);
} while (desc_end.start_time_ns != -1); } while (desc_end.start_time_ns != -1);
}
if (bandwidth < bits_per_second) bandwidth = bits_per_second; if (bandwidth < bits_per_second) bandwidth = bits_per_second;
} }
return (int64_t)bandwidth; return (int64_t)bandwidth;