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

Side by Side Diff: media/formats/webm/webm_stream_parser.h

Issue 346613003: Fix WebMStreamParser to handle Cues between Clusters correctly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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/formats/webm/webm_stream_parser.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_ 5 #ifndef MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
6 #define MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_ 6 #define MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
7 7
8 #include "base/callback_forward.h" 8 #include "base/callback_forward.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "media/base/audio_decoder_config.h" 10 #include "media/base/audio_decoder_config.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 NewBuffersCB new_buffers_cb_; 71 NewBuffersCB new_buffers_cb_;
72 bool ignore_text_tracks_; 72 bool ignore_text_tracks_;
73 NeedKeyCB need_key_cb_; 73 NeedKeyCB need_key_cb_;
74 74
75 NewMediaSegmentCB new_segment_cb_; 75 NewMediaSegmentCB new_segment_cb_;
76 base::Closure end_of_segment_cb_; 76 base::Closure end_of_segment_cb_;
77 LogCB log_cb_; 77 LogCB log_cb_;
78 78
79 bool unknown_segment_size_; 79 bool unknown_segment_size_;
80 80
81 // True if a new cluster id has been seen and its end has not yet been parsed.
82 bool parsing_cluster_;
83
84 scoped_ptr<WebMClusterParser> cluster_parser_; 81 scoped_ptr<WebMClusterParser> cluster_parser_;
85 ByteQueue byte_queue_; 82 ByteQueue byte_queue_;
86 83
87 DISALLOW_COPY_AND_ASSIGN(WebMStreamParser); 84 DISALLOW_COPY_AND_ASSIGN(WebMStreamParser);
88 }; 85 };
89 86
90 } // namespace media 87 } // namespace media
91 88
92 #endif // MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_ 89 #endif // MEDIA_FORMATS_WEBM_WEBM_STREAM_PARSER_H_
OLDNEW
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | media/formats/webm/webm_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698