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

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

Issue 177333003: Add support for midstream audio configuration changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ABS
Patch Set: Created 6 years, 9 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 (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 #ifndef MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_
6 #define MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_ 6 #define MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 18 matching lines...) Expand all
29 public: 29 public:
30 explicit OpusAudioDecoder( 30 explicit OpusAudioDecoder(
31 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); 31 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
32 virtual ~OpusAudioDecoder(); 32 virtual ~OpusAudioDecoder();
33 33
34 // AudioDecoder implementation. 34 // AudioDecoder implementation.
35 virtual void Initialize(const AudioDecoderConfig& config, 35 virtual void Initialize(const AudioDecoderConfig& config,
36 const PipelineStatusCB& status_cb) OVERRIDE; 36 const PipelineStatusCB& status_cb) OVERRIDE;
37 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, 37 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer,
38 const DecodeCB& decode_cb) OVERRIDE; 38 const DecodeCB& decode_cb) OVERRIDE;
39 virtual int bits_per_channel() OVERRIDE;
40 virtual ChannelLayout channel_layout() OVERRIDE;
41 virtual int samples_per_second() OVERRIDE;
42 virtual void Reset(const base::Closure& closure) OVERRIDE; 39 virtual void Reset(const base::Closure& closure) OVERRIDE;
43 virtual void Stop(const base::Closure& closure) OVERRIDE; 40 virtual void Stop(const base::Closure& closure) OVERRIDE;
44 41
45 private: 42 private:
46 void DoReset(); 43 void DoReset();
47 void DoStop(); 44 void DoStop();
48 45
49 // Reads from the demuxer stream with corresponding callback method. 46 // Reads from the demuxer stream with corresponding callback method.
50 void ReadFromDemuxerStream(); 47 void ReadFromDemuxerStream();
51 void DecodeBuffer(const scoped_refptr<DecoderBuffer>& input, 48 void DecodeBuffer(const scoped_refptr<DecoderBuffer>& input,
52 const DecodeCB& decode_cb); 49 const DecodeCB& decode_cb);
53 50
54 bool ConfigureDecoder(); 51 bool ConfigureDecoder();
55 void CloseDecoder(); 52 void CloseDecoder();
56 void ResetTimestampState(); 53 void ResetTimestampState();
57 bool Decode(const scoped_refptr<DecoderBuffer>& input, 54 bool Decode(const scoped_refptr<DecoderBuffer>& input,
58 scoped_refptr<AudioBuffer>* output_buffer); 55 scoped_refptr<AudioBuffer>* output_buffer);
59 56
60 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 57 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
61 base::WeakPtrFactory<OpusAudioDecoder> weak_factory_; 58 base::WeakPtrFactory<OpusAudioDecoder> weak_factory_;
62 base::WeakPtr<OpusAudioDecoder> weak_this_; 59 base::WeakPtr<OpusAudioDecoder> weak_this_;
63 60
64 AudioDecoderConfig config_; 61 AudioDecoderConfig config_;
65 OpusMSDecoder* opus_decoder_; 62 OpusMSDecoder* opus_decoder_;
66 63
67 // Decoded audio format.
68 ChannelLayout channel_layout_;
69 int samples_per_second_;
70 const SampleFormat sample_format_;
71 const int bits_per_channel_;
72
73 // Used for computing output timestamps. 64 // Used for computing output timestamps.
74 scoped_ptr<AudioTimestampHelper> output_timestamp_helper_; 65 scoped_ptr<AudioTimestampHelper> output_timestamp_helper_;
75 base::TimeDelta last_input_timestamp_; 66 base::TimeDelta last_input_timestamp_;
76 67
77 // Number of frames to be discarded from the start of the packet. This value 68 // Number of frames to be discarded from the start of the packet. This value
78 // is respected for all packets except for the first one in the stream. For 69 // is respected for all packets except for the first one in the stream. For
79 // the first packet in the stream, |frame_delay_at_start_| is used. This is 70 // the first packet in the stream, |frame_delay_at_start_| is used. This is
80 // usually set to the SeekPreRoll value from the container whenever a seek 71 // usually set to the SeekPreRoll value from the container whenever a seek
81 // happens. 72 // happens.
82 int frames_to_discard_; 73 int frames_to_discard_;
83 74
84 // Number of frames to be discarded at the start of the stream. This value 75 // Number of frames to be discarded at the start of the stream. This value
85 // is typically the CodecDelay value from the container. This value should 76 // is typically the CodecDelay value from the container. This value should
86 // only be applied when input timestamp is |start_input_timestamp_|. 77 // only be applied when input timestamp is |start_input_timestamp_|.
87 int frame_delay_at_start_; 78 int frame_delay_at_start_;
88 base::TimeDelta start_input_timestamp_; 79 base::TimeDelta start_input_timestamp_;
89 80
90 // Timestamp to be subtracted from all the frames. This is typically computed 81 // Timestamp to be subtracted from all the frames. This is typically computed
91 // from the CodecDelay value in the container. 82 // from the CodecDelay value in the container.
92 base::TimeDelta timestamp_offset_; 83 base::TimeDelta timestamp_offset_;
93 84
94 DISALLOW_IMPLICIT_CONSTRUCTORS(OpusAudioDecoder); 85 DISALLOW_IMPLICIT_CONSTRUCTORS(OpusAudioDecoder);
95 }; 86 };
96 87
97 } // namespace media 88 } // namespace media
98 89
99 #endif // MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_ 90 #endif // MEDIA_FILTERS_OPUS_AUDIO_DECODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698