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

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

Issue 239423005: Wire up codec_delay() to MP3StreamParser and FFmpegAudioDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ResetTimestampState() on config change. 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
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
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "media/base/audio_decoder_config.h" 13 #include "media/base/audio_decoder_config.h"
14 #include "media/base/audio_timestamp_helper.h" 14 #include "media/base/audio_timestamp_helper.h"
15 #include "media/base/bit_reader.h" 15 #include "media/base/bit_reader.h"
16 #include "media/base/byte_queue.h" 16 #include "media/base/byte_queue.h"
17 #include "media/base/media_export.h" 17 #include "media/base/media_export.h"
18 #include "media/base/stream_parser.h" 18 #include "media/base/stream_parser.h"
19 19
20 namespace media { 20 namespace media {
21 21
22 class MEDIA_EXPORT MPEGAudioStreamParserBase : public StreamParser { 22 class MEDIA_EXPORT MPEGAudioStreamParserBase : public StreamParser {
23 public: 23 public:
24 // |start_code_mask| is used to find the start of each frame header. Also 24 // |start_code_mask| is used to find the start of each frame header. Also
25 // referred to as the sync code in the MP3 and ADTS header specifications. 25 // referred to as the sync code in the MP3 and ADTS header specifications.
26 MPEGAudioStreamParserBase(uint32 start_code_mask, AudioCodec audio_codec); 26 // |codec_delay| is the number of samples the decoder will output before the
27 // first real frame.
28 MPEGAudioStreamParserBase(uint32 start_code_mask,
29 AudioCodec audio_codec,
30 int codec_delay);
27 virtual ~MPEGAudioStreamParserBase(); 31 virtual ~MPEGAudioStreamParserBase();
28 32
29 // StreamParser implementation. 33 // StreamParser implementation.
30 virtual void Init(const InitCB& init_cb, 34 virtual void Init(const InitCB& init_cb,
31 const NewConfigCB& config_cb, 35 const NewConfigCB& config_cb,
32 const NewBuffersCB& new_buffers_cb, 36 const NewBuffersCB& new_buffers_cb,
33 bool ignore_text_tracks, 37 bool ignore_text_tracks,
34 const NeedKeyCB& need_key_cb, 38 const NeedKeyCB& need_key_cb,
35 const NewMediaSegmentCB& new_segment_cb, 39 const NewMediaSegmentCB& new_segment_cb,
36 const base::Closure& end_of_segment_cb, 40 const base::Closure& end_of_segment_cb,
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 base::Closure end_of_segment_cb_; 139 base::Closure end_of_segment_cb_;
136 LogCB log_cb_; 140 LogCB log_cb_;
137 141
138 ByteQueue queue_; 142 ByteQueue queue_;
139 143
140 AudioDecoderConfig config_; 144 AudioDecoderConfig config_;
141 scoped_ptr<AudioTimestampHelper> timestamp_helper_; 145 scoped_ptr<AudioTimestampHelper> timestamp_helper_;
142 bool in_media_segment_; 146 bool in_media_segment_;
143 const uint32 start_code_mask_; 147 const uint32 start_code_mask_;
144 const AudioCodec audio_codec_; 148 const AudioCodec audio_codec_;
149 const int codec_delay_;
145 150
146 DISALLOW_COPY_AND_ASSIGN(MPEGAudioStreamParserBase); 151 DISALLOW_COPY_AND_ASSIGN(MPEGAudioStreamParserBase);
147 }; 152 };
148 153
149 } // namespace media 154 } // namespace media
150 155
151 #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/mpeg/mp3_stream_parser_unittest.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