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

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

Issue 251903008: Fix incorrect config id being associated with post splice buffer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ChunkDemuxer test. Created 6 years, 7 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/filters/chunk_demuxer_unittest.cc ('k') | media/filters/source_buffer_stream.cc » ('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 // SourceBufferStream is a data structure that stores media Buffers in ranges. 5 // SourceBufferStream is a data structure that stores media Buffers in ranges.
6 // Buffers can be appended out of presentation order. Buffers are retrieved by 6 // Buffers can be appended out of presentation order. Buffers are retrieved by
7 // seeking to the desired start point and calling GetNextBuffer(). Buffers are 7 // seeking to the desired start point and calling GetNextBuffer(). Buffers are
8 // returned in sequential presentation order. 8 // returned in sequential presentation order.
9 9
10 #ifndef MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_ 10 #ifndef MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 391
392 // Used by GetNextBuffer() when a buffer with fade out is returned from 392 // Used by GetNextBuffer() when a buffer with fade out is returned from
393 // GetNextBufferInternal(). Will be set to the returned buffer and will be 393 // GetNextBufferInternal(). Will be set to the returned buffer and will be
394 // destroyed after the splice_buffers() section has been exhausted. 394 // destroyed after the splice_buffers() section has been exhausted.
395 scoped_refptr<StreamParserBuffer> splice_buffer_; 395 scoped_refptr<StreamParserBuffer> splice_buffer_;
396 396
397 // Indicates which of the splice buffers in |splice_buffer_| should be 397 // Indicates which of the splice buffers in |splice_buffer_| should be
398 // handled out next. 398 // handled out next.
399 size_t splice_buffers_index_; 399 size_t splice_buffers_index_;
400 400
401 // Indicates that all pre splice buffers have been handed out.
402 bool pre_splice_complete_;
403
401 // Indicates that splice frame generation is enabled. 404 // Indicates that splice frame generation is enabled.
402 const bool splice_frames_enabled_; 405 const bool splice_frames_enabled_;
403 406
404 DISALLOW_COPY_AND_ASSIGN(SourceBufferStream); 407 DISALLOW_COPY_AND_ASSIGN(SourceBufferStream);
405 }; 408 };
406 409
407 } // namespace media 410 } // namespace media
408 411
409 #endif // MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_ 412 #endif // MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_
OLDNEW
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | media/filters/source_buffer_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698