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

Side by Side Diff: media/base/stream_parser.cc

Issue 231283005: Add live mode detection in WebM MediaSource parser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « media/base/stream_parser.h ('k') | media/filters/chunk_demuxer.h » ('j') | 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/base/stream_parser.h" 5 #include "media/base/stream_parser.h"
6 6
7 #include "media/base/buffers.h" 7 #include "media/base/buffers.h"
8 #include "media/base/stream_parser_buffer.h" 8 #include "media/base/stream_parser_buffer.h"
9 9
10 namespace media { 10 namespace media {
11 11
12 StreamParser::InitParameters::InitParameters(base::TimeDelta duration) 12 StreamParser::InitParameters::InitParameters(base::TimeDelta duration)
13 : duration(duration), 13 : duration(duration),
14 auto_update_timestamp_offset(false) { 14 auto_update_timestamp_offset(false),
15 liveness(Demuxer::LIVENESS_UNKNOWN) {
15 } 16 }
16 17
17 StreamParser::StreamParser() {} 18 StreamParser::StreamParser() {}
18 19
19 StreamParser::~StreamParser() {} 20 StreamParser::~StreamParser() {}
20 21
21 static bool MergeBufferQueuesInternal( 22 static bool MergeBufferQueuesInternal(
22 const std::vector<const StreamParser::BufferQueue*>& buffer_queues, 23 const std::vector<const StreamParser::BufferQueue*>& buffer_queues,
23 StreamParser::BufferQueue* merged_buffers) { 24 StreamParser::BufferQueue* merged_buffers) {
24 // Instead of std::merge usage, this method implements a custom merge because: 25 // Instead of std::merge usage, this method implements a custom merge because:
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 map_itr++) { 128 map_itr++) {
128 if (!map_itr->second.empty()) 129 if (!map_itr->second.empty())
129 buffer_queues.push_back(&(map_itr->second)); 130 buffer_queues.push_back(&(map_itr->second));
130 } 131 }
131 132
132 // Do the merge. 133 // Do the merge.
133 return MergeBufferQueuesInternal(buffer_queues, merged_buffers); 134 return MergeBufferQueuesInternal(buffer_queues, merged_buffers);
134 } 135 }
135 136
136 } // namespace media 137 } // namespace media
OLDNEW
« no previous file with comments | « media/base/stream_parser.h ('k') | media/filters/chunk_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698