Commit 192fc389 authored by Dale Curtis's avatar Dale Curtis Committed by Commit Bot

Force mp3 files to have a start time of zero.

This will allow us to remove our custom patch which breaks upstream
ffmpeg functionality for unknown reasons.

R=sandersd

Fixed: 1062037
Change-Id: I253011843dee4dd6a8c958b14990ad836a9f1dca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2268221
Auto-Submit: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: default avatarDan Sanders <sandersd@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#782792}
parent 607b0220
...@@ -1522,6 +1522,12 @@ void FFmpegDemuxer::OnFindStreamInfoDone(int result) { ...@@ -1522,6 +1522,12 @@ void FFmpegDemuxer::OnFindStreamInfoDone(int result) {
if (glue_->container() == container_names::CONTAINER_AVI) if (glue_->container() == container_names::CONTAINER_AVI)
format_context->flags |= AVFMT_FLAG_GENPTS; format_context->flags |= AVFMT_FLAG_GENPTS;
// FFmpeg will incorrectly adjust the start time of MP3 files into the future
// based on discard samples. We were unable to fix this upstream without
// breaking ffmpeg functionality. https://crbug.com/1062037
if (glue_->container() == container_names::CONTAINER_MP3)
start_time_ = base::TimeDelta();
// For testing purposes, don't overwrite the timeline offset if set already. // For testing purposes, don't overwrite the timeline offset if set already.
if (timeline_offset_.is_null()) { if (timeline_offset_.is_null()) {
timeline_offset_ = timeline_offset_ =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment