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

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

Issue 65803002: Replace MessageLoopProxy with SingleThreadTaskRunner for media/filters/ + associated code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | Annotate | Revision Log
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/filters/ffmpeg_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_FFMPEG_VIDEO_DECODER_H_ 5 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
6 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 6 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
7 7
8 #include <list> 8 #include <list>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "media/base/video_decoder.h" 13 #include "media/base/video_decoder.h"
14 #include "media/base/video_decoder_config.h" 14 #include "media/base/video_decoder_config.h"
15 #include "media/base/video_frame_pool.h" 15 #include "media/base/video_frame_pool.h"
16 16
17 struct AVCodecContext; 17 struct AVCodecContext;
18 struct AVFrame; 18 struct AVFrame;
19 19
20 namespace base { 20 namespace base {
21 class MessageLoopProxy; 21 class SingleThreadTaskRunner;
22 } 22 }
23 23
24 namespace media { 24 namespace media {
25 25
26 class DecoderBuffer; 26 class DecoderBuffer;
27 class ScopedPtrAVFreeContext; 27 class ScopedPtrAVFreeContext;
28 class ScopedPtrAVFreeFrame; 28 class ScopedPtrAVFreeFrame;
29 29
30 class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder { 30 class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
31 public: 31 public:
32 explicit FFmpegVideoDecoder( 32 explicit FFmpegVideoDecoder(
33 const scoped_refptr<base::MessageLoopProxy>& message_loop); 33 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
34 virtual ~FFmpegVideoDecoder(); 34 virtual ~FFmpegVideoDecoder();
35 35
36 // VideoDecoder implementation. 36 // VideoDecoder implementation.
37 virtual void Initialize(const VideoDecoderConfig& config, 37 virtual void Initialize(const VideoDecoderConfig& config,
38 const PipelineStatusCB& status_cb) OVERRIDE; 38 const PipelineStatusCB& status_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(const base::Closure& closure) OVERRIDE; 42 virtual void Stop(const base::Closure& closure) OVERRIDE;
43 43
(...skipping 20 matching lines...) Expand all
64 // Returns true if initialization was successful. 64 // Returns true if initialization was successful.
65 bool ConfigureDecoder(); 65 bool ConfigureDecoder();
66 66
67 // Releases resources associated with |codec_context_| and |av_frame_| 67 // Releases resources associated with |codec_context_| and |av_frame_|
68 // and resets them to NULL. 68 // and resets them to NULL.
69 void ReleaseFFmpegResources(); 69 void ReleaseFFmpegResources();
70 70
71 // Reset decoder and call |reset_cb_|. 71 // Reset decoder and call |reset_cb_|.
72 void DoReset(); 72 void DoReset();
73 73
74 scoped_refptr<base::MessageLoopProxy> message_loop_; 74 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
75 base::WeakPtrFactory<FFmpegVideoDecoder> weak_factory_; 75 base::WeakPtrFactory<FFmpegVideoDecoder> weak_factory_;
76 base::WeakPtr<FFmpegVideoDecoder> weak_this_; 76 base::WeakPtr<FFmpegVideoDecoder> weak_this_;
77 77
78 DecoderState state_; 78 DecoderState state_;
79 79
80 DecodeCB decode_cb_; 80 DecodeCB decode_cb_;
81 base::Closure reset_cb_; 81 base::Closure reset_cb_;
82 82
83 // FFmpeg structures owned by this object. 83 // FFmpeg structures owned by this object.
84 scoped_ptr_malloc<AVCodecContext, ScopedPtrAVFreeContext> codec_context_; 84 scoped_ptr_malloc<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
85 scoped_ptr_malloc<AVFrame, ScopedPtrAVFreeFrame> av_frame_; 85 scoped_ptr_malloc<AVFrame, ScopedPtrAVFreeFrame> av_frame_;
86 86
87 VideoDecoderConfig config_; 87 VideoDecoderConfig config_;
88 88
89 VideoFramePool frame_pool_; 89 VideoFramePool frame_pool_;
90 90
91 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder); 91 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
92 }; 92 };
93 93
94 } // namespace media 94 } // namespace media
95 95
96 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 96 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_demuxer.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698