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

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

Issue 754093003: Remove DecryptingAudioDecoder::kSupportedBitsPerChannel which is not used (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « no previous file | media/filters/decrypting_audio_decoder.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 #ifndef MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_
6 #define MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_ 6 #define MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 12 matching lines...) Expand all
23 class AudioTimestampHelper; 23 class AudioTimestampHelper;
24 class DecoderBuffer; 24 class DecoderBuffer;
25 class Decryptor; 25 class Decryptor;
26 26
27 // Decryptor-based AudioDecoder implementation that can decrypt and decode 27 // Decryptor-based AudioDecoder implementation that can decrypt and decode
28 // encrypted audio buffers and return decrypted and decompressed audio frames. 28 // encrypted audio buffers and return decrypted and decompressed audio frames.
29 // All public APIs and callbacks are trampolined to the |task_runner_| so 29 // All public APIs and callbacks are trampolined to the |task_runner_| so
30 // that no locks are required for thread safety. 30 // that no locks are required for thread safety.
31 class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder { 31 class MEDIA_EXPORT DecryptingAudioDecoder : public AudioDecoder {
32 public: 32 public:
33 // We do not currently have a way to let the Decryptor choose the output
34 // audio sample format and notify us of its choice. Therefore, we require all
35 // Decryptor implementations to decode audio into a fixed integer sample
36 // format designated by kSupportedBitsPerChannel.
37 // TODO(xhwang): Remove this restriction after http://crbug.com/169105 fixed.
38 static const int kSupportedBitsPerChannel;
39
40 DecryptingAudioDecoder( 33 DecryptingAudioDecoder(
41 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 34 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
42 const SetDecryptorReadyCB& set_decryptor_ready_cb); 35 const SetDecryptorReadyCB& set_decryptor_ready_cb);
43 ~DecryptingAudioDecoder() override; 36 ~DecryptingAudioDecoder() override;
44 37
45 // AudioDecoder implementation. 38 // AudioDecoder implementation.
46 std::string GetDisplayName() const override; 39 std::string GetDisplayName() const override;
47 void Initialize(const AudioDecoderConfig& config, 40 void Initialize(const AudioDecoderConfig& config,
48 const PipelineStatusCB& status_cb, 41 const PipelineStatusCB& status_cb,
49 const OutputCB& output_cb) override; 42 const OutputCB& output_cb) override;
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 // NOTE: Weak pointers must be invalidated before all other member variables. 120 // NOTE: Weak pointers must be invalidated before all other member variables.
128 base::WeakPtrFactory<DecryptingAudioDecoder> weak_factory_; 121 base::WeakPtrFactory<DecryptingAudioDecoder> weak_factory_;
129 base::WeakPtr<DecryptingAudioDecoder> weak_this_; 122 base::WeakPtr<DecryptingAudioDecoder> weak_this_;
130 123
131 DISALLOW_COPY_AND_ASSIGN(DecryptingAudioDecoder); 124 DISALLOW_COPY_AND_ASSIGN(DecryptingAudioDecoder);
132 }; 125 };
133 126
134 } // namespace media 127 } // namespace media
135 128
136 #endif // MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_ 129 #endif // MEDIA_FILTERS_DECRYPTING_AUDIO_DECODER_H_
OLDNEW
« no previous file with comments | « no previous file | media/filters/decrypting_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698