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

Side by Side Diff: media/formats/mpeg/mpeg_audio_stream_parser_base.h

Issue 1091293005: MSE: Relax the 'media segment must begin with keyframe' requirement (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Checkpoint. Not ready for review yet. Created 5 years, 3 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
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_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_ 5 #ifndef MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_
6 #define MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_ 6 #define MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_
7 7
8 #include <set> 8 #include <set>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 18 matching lines...) Expand all
29 AudioCodec audio_codec, 29 AudioCodec audio_codec,
30 int codec_delay); 30 int codec_delay);
31 ~MPEGAudioStreamParserBase() override; 31 ~MPEGAudioStreamParserBase() override;
32 32
33 // StreamParser implementation. 33 // StreamParser implementation.
34 void Init(const InitCB& init_cb, 34 void Init(const InitCB& init_cb,
35 const NewConfigCB& config_cb, 35 const NewConfigCB& config_cb,
36 const NewBuffersCB& new_buffers_cb, 36 const NewBuffersCB& new_buffers_cb,
37 bool ignore_text_tracks, 37 bool ignore_text_tracks,
38 const EncryptedMediaInitDataCB& encrypted_media_init_data_cb, 38 const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
39 const NewMediaSegmentCB& new_segment_cb, 39 const base::Closure& start_of_segment_cb,
40 const base::Closure& end_of_segment_cb, 40 const base::Closure& end_of_segment_cb,
41 const scoped_refptr<MediaLog>& media_log) override; 41 const scoped_refptr<MediaLog>& media_log) override;
42 void Flush() override; 42 void Flush() override;
43 bool Parse(const uint8* buf, int size) override; 43 bool Parse(const uint8* buf, int size) override;
44 44
45 protected: 45 protected:
46 // Subclasses implement this method to parse format specific frame headers. 46 // Subclasses implement this method to parse format specific frame headers.
47 // |data| & |size| describe the data available for parsing. 47 // |data| & |size| describe the data available for parsing.
48 // 48 //
49 // Implementations are expected to consume an entire frame header. It should 49 // Implementations are expected to consume an entire frame header. It should
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // after |new_buffers_cb_| to signal that these buffers represent the end of a 128 // after |new_buffers_cb_| to signal that these buffers represent the end of a
129 // media segment. 129 // media segment.
130 // Returns true if the buffers are sent successfully. 130 // Returns true if the buffers are sent successfully.
131 bool SendBuffers(BufferQueue* buffers, bool end_of_segment); 131 bool SendBuffers(BufferQueue* buffers, bool end_of_segment);
132 132
133 State state_; 133 State state_;
134 134
135 InitCB init_cb_; 135 InitCB init_cb_;
136 NewConfigCB config_cb_; 136 NewConfigCB config_cb_;
137 NewBuffersCB new_buffers_cb_; 137 NewBuffersCB new_buffers_cb_;
138 NewMediaSegmentCB new_segment_cb_; 138 base::Closure start_of_segment_cb_;
139 base::Closure end_of_segment_cb_; 139 base::Closure end_of_segment_cb_;
140 scoped_refptr<MediaLog> media_log_; 140 scoped_refptr<MediaLog> media_log_;
141 141
142 ByteQueue queue_; 142 ByteQueue queue_;
143 143
144 AudioDecoderConfig config_; 144 AudioDecoderConfig config_;
145 scoped_ptr<AudioTimestampHelper> timestamp_helper_; 145 scoped_ptr<AudioTimestampHelper> timestamp_helper_;
146 bool in_media_segment_; 146 bool in_media_segment_;
147 const uint32 start_code_mask_; 147 const uint32 start_code_mask_;
148 const AudioCodec audio_codec_; 148 const AudioCodec audio_codec_;
149 const int codec_delay_; 149 const int codec_delay_;
150 150
151 DISALLOW_COPY_AND_ASSIGN(MPEGAudioStreamParserBase); 151 DISALLOW_COPY_AND_ASSIGN(MPEGAudioStreamParserBase);
152 }; 152 };
153 153
154 } // namespace media 154 } // namespace media
155 155
156 #endif // MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_ 156 #endif // MEDIA_FORMATS_MPEG_MPEG_AUDIO_STREAM_PARSER_BASE_H_
OLDNEW
« no previous file with comments | « media/formats/mp4/mp4_stream_parser.cc ('k') | media/formats/mpeg/mpeg_audio_stream_parser_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698