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

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

Issue 1685683004: Move media::AudioCodec to its own source file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix date and commit message Created 4 years, 10 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
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/filters/ffmpeg_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_FFMPEG_AUDIO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
6 #define MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_ 6 #define MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 13 matching lines...) Expand all
24 class SingleThreadTaskRunner; 24 class SingleThreadTaskRunner;
25 } 25 }
26 26
27 namespace media { 27 namespace media {
28 28
29 class AudioDiscardHelper; 29 class AudioDiscardHelper;
30 class DecoderBuffer; 30 class DecoderBuffer;
31 31
32 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder { 32 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
33 public: 33 public:
34 static bool IsCodecSupported(AudioCodec codec, SampleFormat sample_format);
jrummell 2016/02/11 22:23:19 I know that this matches what is in FFmpegVideoDec
DaleCurtis 2016/02/11 22:26:42 Yeah, I think callers should just invoke the ffmpe
35
34 FFmpegAudioDecoder( 36 FFmpegAudioDecoder(
35 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 37 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
36 const scoped_refptr<MediaLog>& media_log); 38 const scoped_refptr<MediaLog>& media_log);
37 ~FFmpegAudioDecoder() override; 39 ~FFmpegAudioDecoder() override;
38 40
39 // AudioDecoder implementation. 41 // AudioDecoder implementation.
40 std::string GetDisplayName() const override; 42 std::string GetDisplayName() const override;
41 void Initialize(const AudioDecoderConfig& config, 43 void Initialize(const AudioDecoderConfig& config,
42 CdmContext* cdm_context, 44 CdmContext* cdm_context,
43 const InitCB& init_cb, 45 const InitCB& init_cb,
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 scoped_ptr<AudioDiscardHelper> discard_helper_; 112 scoped_ptr<AudioDiscardHelper> discard_helper_;
111 113
112 scoped_refptr<MediaLog> media_log_; 114 scoped_refptr<MediaLog> media_log_;
113 115
114 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder); 116 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
115 }; 117 };
116 118
117 } // namespace media 119 } // namespace media
118 120
119 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_ 121 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
OLDNEW
« no previous file with comments | « media/ffmpeg/ffmpeg_common.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698