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

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

Issue 395703002: Fold {Audio|Video}Decoder::Stop() into the dtor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 6 years, 5 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
« no previous file with comments | « media/filters/fake_video_decoder_unittest.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 24 matching lines...) Expand all
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 void Initialize(const AudioDecoderConfig& config, 39 virtual void Initialize(const AudioDecoderConfig& config,
40 const PipelineStatusCB& status_cb, 40 const PipelineStatusCB& status_cb,
41 const OutputCB& output_cb) OVERRIDE; 41 const OutputCB& output_cb) OVERRIDE;
42 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, 42 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer,
43 const DecodeCB& decode_cb) OVERRIDE; 43 const DecodeCB& decode_cb) OVERRIDE;
44 virtual void Reset(const base::Closure& closure) OVERRIDE; 44 virtual void Reset(const base::Closure& closure) OVERRIDE;
45 virtual void Stop() OVERRIDE;
46 45
47 private: 46 private:
48 // There are four states the decoder can be in: 47 // There are four states the decoder can be in:
49 // 48 //
50 // - kUninitialized: The decoder is not initialized. 49 // - kUninitialized: The decoder is not initialized.
51 // - kNormal: This is the normal state. The decoder is idle and ready to 50 // - kNormal: This is the normal state. The decoder is idle and ready to
52 // decode input buffers, or is decoding an input buffer. 51 // decode input buffers, or is decoding an input buffer.
53 // - kDecodeFinished: EOS buffer received, codec flushed and decode finished. 52 // - kDecodeFinished: EOS buffer received, codec flushed and decode finished.
54 // No further Decode() call should be made. 53 // No further Decode() call should be made.
55 // - kError: Unexpected error happened. 54 // - kError: Unexpected error happened.
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 scoped_ptr<AudioDiscardHelper> discard_helper_; 107 scoped_ptr<AudioDiscardHelper> discard_helper_;
109 108
110 LogCB log_cb_; 109 LogCB log_cb_;
111 110
112 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder); 111 DISALLOW_IMPLICIT_CONSTRUCTORS(FFmpegAudioDecoder);
113 }; 112 };
114 113
115 } // namespace media 114 } // namespace media
116 115
117 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_ 116 #endif // MEDIA_FILTERS_FFMPEG_AUDIO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/fake_video_decoder_unittest.cc ('k') | media/filters/ffmpeg_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698