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

Side by Side Diff: media/filters/vpx_video_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/video_renderer_impl_unittest.cc ('k') | media/filters/vpx_video_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_VPX_VIDEO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_VPX_VIDEO_DECODER_H_
6 #define MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ 6 #define MEDIA_FILTERS_VPX_VIDEO_DECODER_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "media/base/demuxer_stream.h" 9 #include "media/base/demuxer_stream.h"
10 #include "media/base/video_decoder.h" 10 #include "media/base/video_decoder.h"
(...skipping 21 matching lines...) Expand all
32 virtual ~VpxVideoDecoder(); 32 virtual ~VpxVideoDecoder();
33 33
34 // VideoDecoder implementation. 34 // VideoDecoder implementation.
35 virtual void Initialize(const VideoDecoderConfig& config, 35 virtual void Initialize(const VideoDecoderConfig& config,
36 bool low_delay, 36 bool low_delay,
37 const PipelineStatusCB& status_cb, 37 const PipelineStatusCB& status_cb,
38 const OutputCB& output_cb) OVERRIDE; 38 const OutputCB& output_cb) OVERRIDE;
39 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer, 39 virtual void Decode(const scoped_refptr<DecoderBuffer>& buffer,
40 const DecodeCB& decode_cb) OVERRIDE; 40 const DecodeCB& decode_cb) OVERRIDE;
41 virtual void Reset(const base::Closure& closure) OVERRIDE; 41 virtual void Reset(const base::Closure& closure) OVERRIDE;
42 virtual void Stop() OVERRIDE;
43 42
44 private: 43 private:
45 enum DecoderState { 44 enum DecoderState {
46 kUninitialized, 45 kUninitialized,
47 kNormal, 46 kNormal,
48 kFlushCodec, 47 kFlushCodec,
49 kDecodeFinished, 48 kDecodeFinished,
50 kError 49 kError
51 }; 50 };
52 51
(...skipping 30 matching lines...) Expand all
83 scoped_refptr<MemoryPool> memory_pool_; 82 scoped_refptr<MemoryPool> memory_pool_;
84 83
85 VideoFramePool frame_pool_; 84 VideoFramePool frame_pool_;
86 85
87 DISALLOW_COPY_AND_ASSIGN(VpxVideoDecoder); 86 DISALLOW_COPY_AND_ASSIGN(VpxVideoDecoder);
88 }; 87 };
89 88
90 } // namespace media 89 } // namespace media
91 90
92 #endif // MEDIA_FILTERS_VPX_VIDEO_DECODER_H_ 91 #endif // MEDIA_FILTERS_VPX_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/video_renderer_impl_unittest.cc ('k') | media/filters/vpx_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698