diff options
| author | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 22:42:17 +0000 |
|---|---|---|
| committer | erikchen@chromium.org <erikchen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 22:42:17 +0000 |
| commit | ff5d96c501ce41f1314f83adf1fdc600d36561dd (patch) | |
| tree | 36950fea00da088f0dd3ace1b5a951ce98098d63 /media | |
| parent | 238add9486e39ae4f667ed8ade1a3b967e69215b (diff) | |
| download | chromium_src-ff5d96c501ce41f1314f83adf1fdc600d36561dd.zip chromium_src-ff5d96c501ce41f1314f83adf1fdc600d36561dd.tar.gz chromium_src-ff5d96c501ce41f1314f83adf1fdc600d36561dd.tar.bz2 | |
Revert of Disable audio splice frame generation for now. (https://codereview.chromium.org/213473004/)
Reason for revert:
Causes test failures.
http://build.chromium.org/p/chromium.memory/builders/Mac%20ASan%20Tests%20%281%29/builds/569/steps/media_unittests/logs/stdio
Original issue's description:
> Disable audio splice frame generation for now.
>
> BUG=356073, 356545
> TEST=none
> R=acolwell@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=259713
TBR=acolwell@chromium.org,dalecurtis@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=356073, 356545
Review URL: https://codereview.chromium.org/213573003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/source_buffer_stream.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/filters/source_buffer_stream.cc b/media/filters/source_buffer_stream.cc index b9b8cf7..a7d3ecf 100644 --- a/media/filters/source_buffer_stream.cc +++ b/media/filters/source_buffer_stream.cc @@ -965,8 +965,7 @@ void SourceBufferStream::PrepareRangesForNextAppend( // Handle splices between the existing buffers and the new buffers. If a // splice is generated the timestamp and duration of the first buffer in // |new_buffers| will be modified. - // TODO(dalecurtis): Disabled until issues 356073, 356545 are fixed. - // GenerateSpliceFrame(new_buffers); + GenerateSpliceFrame(new_buffers); base::TimeDelta prev_timestamp = last_appended_buffer_timestamp_; bool prev_is_keyframe = last_appended_buffer_is_keyframe_; |