Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(400)

Side by Side Diff: media/filters/source_buffer_stream.cc

Issue 1249773006: To M45: MSE: Provide link in media-internals to known bug 229412 until it is fixed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2454
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/filters/source_buffer_stream.h" 5 #include "media/filters/source_buffer_stream.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <sstream> 9 #include <sstream>
10 10
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 DVLOG(1) << __FUNCTION__ << " " << GetStreamTypeName() << ": buffers dts=[" 216 DVLOG(1) << __FUNCTION__ << " " << GetStreamTypeName() << ": buffers dts=["
217 << buffers.front()->GetDecodeTimestamp().InSecondsF() << ";" 217 << buffers.front()->GetDecodeTimestamp().InSecondsF() << ";"
218 << buffers.back()->GetDecodeTimestamp().InSecondsF() << "] pts=[" 218 << buffers.back()->GetDecodeTimestamp().InSecondsF() << "] pts=["
219 << buffers.front()->timestamp().InSecondsF() << ";" 219 << buffers.front()->timestamp().InSecondsF() << ";"
220 << buffers.back()->timestamp().InSecondsF() << "(last frame dur=" 220 << buffers.back()->timestamp().InSecondsF() << "(last frame dur="
221 << buffers.back()->duration().InSecondsF() << ")]"; 221 << buffers.back()->duration().InSecondsF() << ")]";
222 222
223 // New media segments must begin with a keyframe. 223 // New media segments must begin with a keyframe.
224 // TODO(wolenetz): Relax this requirement. See http://crbug.com/229412. 224 // TODO(wolenetz): Relax this requirement. See http://crbug.com/229412.
225 if (new_media_segment_ && !buffers.front()->is_key_frame()) { 225 if (new_media_segment_ && !buffers.front()->is_key_frame()) {
226 MEDIA_LOG(ERROR, log_cb_) << "Media segment did not begin with key frame."; 226 MEDIA_LOG(ERROR, log_cb_) << "Media segment did not begin with key "
227 "frame. Support for such segments will be "
228 "available in a future version. Please see "
229 "https://crbug.com/229412.";
227 return false; 230 return false;
228 } 231 }
229 232
230 // Buffers within a media segment should be monotonically increasing. 233 // Buffers within a media segment should be monotonically increasing.
231 if (!IsMonotonicallyIncreasing(buffers)) 234 if (!IsMonotonicallyIncreasing(buffers))
232 return false; 235 return false;
233 236
234 if (media_segment_start_time_ < DecodeTimestamp() || 237 if (media_segment_start_time_ < DecodeTimestamp() ||
235 buffers.front()->GetDecodeTimestamp() < DecodeTimestamp()) { 238 buffers.front()->GetDecodeTimestamp() < DecodeTimestamp()) {
236 MEDIA_LOG(ERROR, log_cb_) 239 MEDIA_LOG(ERROR, log_cb_)
(...skipping 1363 matching lines...) Expand 10 before | Expand all | Expand 10 after
1600 return false; 1603 return false;
1601 1604
1602 DCHECK_NE(have_splice_buffers, have_preroll_buffer); 1605 DCHECK_NE(have_splice_buffers, have_preroll_buffer);
1603 splice_buffers_index_ = 0; 1606 splice_buffers_index_ = 0;
1604 pending_buffer_.swap(*out_buffer); 1607 pending_buffer_.swap(*out_buffer);
1605 pending_buffers_complete_ = false; 1608 pending_buffers_complete_ = false;
1606 return true; 1609 return true;
1607 } 1610 }
1608 1611
1609 } // namespace media 1612 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698