| OLD | NEW |
| 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 |
| 11 #include "base/bind.h" | 11 #include "base/bind.h" |
| 12 #include "base/debug/trace_event.h" | |
| 13 #include "base/logging.h" | 12 #include "base/logging.h" |
| 13 #include "base/trace_event/trace_event.h" |
| 14 #include "media/base/audio_splicer.h" | 14 #include "media/base/audio_splicer.h" |
| 15 #include "media/filters/source_buffer_platform.h" | 15 #include "media/filters/source_buffer_platform.h" |
| 16 #include "media/filters/source_buffer_range.h" | 16 #include "media/filters/source_buffer_range.h" |
| 17 | 17 |
| 18 namespace media { | 18 namespace media { |
| 19 | 19 |
| 20 // Helper method that returns true if |ranges| is sorted in increasing order, | 20 // Helper method that returns true if |ranges| is sorted in increasing order, |
| 21 // false otherwise. | 21 // false otherwise. |
| 22 static bool IsRangeListSorted( | 22 static bool IsRangeListSorted( |
| 23 const std::list<media::SourceBufferRange*>& ranges) { | 23 const std::list<media::SourceBufferRange*>& ranges) { |
| (...skipping 1538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1562 return false; | 1562 return false; |
| 1563 | 1563 |
| 1564 DCHECK_NE(have_splice_buffers, have_preroll_buffer); | 1564 DCHECK_NE(have_splice_buffers, have_preroll_buffer); |
| 1565 splice_buffers_index_ = 0; | 1565 splice_buffers_index_ = 0; |
| 1566 pending_buffer_.swap(*out_buffer); | 1566 pending_buffer_.swap(*out_buffer); |
| 1567 pending_buffers_complete_ = false; | 1567 pending_buffers_complete_ = false; |
| 1568 return true; | 1568 return true; |
| 1569 } | 1569 } |
| 1570 | 1570 |
| 1571 } // namespace media | 1571 } // namespace media |
| OLD | NEW |