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

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

Issue 547913002: MediaLog: Log selected audio/video decoder name. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use property instead of log. Created 6 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 (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 18 matching lines...) Expand all
29 class DecoderBuffer; 29 class DecoderBuffer;
30 30
31 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder { 31 class MEDIA_EXPORT FFmpegAudioDecoder : public AudioDecoder {
32 public: 32 public:
33 FFmpegAudioDecoder( 33 FFmpegAudioDecoder(
34 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, 34 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
35 const LogCB& log_cb); 35 const LogCB& log_cb);
36 virtual ~FFmpegAudioDecoder(); 36 virtual ~FFmpegAudioDecoder();
37 37
38 // AudioDecoder implementation. 38 // AudioDecoder implementation.
39 virtual std::string GetDisplayName() const OVERRIDE;
39 virtual void Initialize(const AudioDecoderConfig& config, 40 virtual void Initialize(const AudioDecoderConfig& config,
40 const PipelineStatusCB& status_cb, 41 const PipelineStatusCB& status_cb,
41 const OutputCB& output_cb) OVERRIDE; 42 const OutputCB& output_cb) OVERRIDE;
42 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, 43 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer,
43 const DecodeCB& decode_cb) OVERRIDE; 44 const DecodeCB& decode_cb) OVERRIDE;
44 virtual void Reset(const base::Closure& closure) OVERRIDE; 45 virtual void Reset(const base::Closure& closure) OVERRIDE;
45 46
46 private: 47 private:
47 // There are four states the decoder can be in: 48 // There are four states the decoder can be in:
48 // 49 //
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 scoped_ptr<AudioDiscardHelper> discard_helper_; 108 scoped_ptr<AudioDiscardHelper> discard_helper_;
108 109
109 LogCB log_cb_; 110 LogCB log_cb_;
110 111
111 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder); 112 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
112 }; 113 };
113 114
114 } // namespace media 115 } // namespace media
115 116
116 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_ 117 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698