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

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

Issue 9632024: Create video and audio decoder threads on demand. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Log an error when Initialize is called more than once. Created 8 years, 9 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
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 <deque> 8 #include <deque>
9 9
10 #include "base/callback.h"
10 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
11 #include "media/base/filters.h" 12 #include "media/base/filters.h"
12 #include "media/crypto/aes_decryptor.h" 13 #include "media/crypto/aes_decryptor.h"
13 #include "ui/gfx/size.h" 14 #include "ui/gfx/size.h"
14 15
15 class MessageLoop; 16 class MessageLoop;
16 17
17 struct AVCodecContext; 18 struct AVCodecContext;
18 struct AVFrame; 19 struct AVFrame;
19 20
20 namespace media { 21 namespace media {
21 22
22 class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder { 23 class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
23 public: 24 public:
24 explicit FFmpegVideoDecoder(MessageLoop* message_loop); 25 FFmpegVideoDecoder(const base::Callback<MessageLoop*()>& message_loop_cb);
25 virtual ~FFmpegVideoDecoder(); 26 virtual ~FFmpegVideoDecoder();
26 27
27 // Filter implementation. 28 // Filter implementation.
28 virtual void Stop(const base::Closure& callback) OVERRIDE; 29 virtual void Stop(const base::Closure& callback) OVERRIDE;
29 virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb) OVERRIDE; 30 virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb) OVERRIDE;
30 virtual void Pause(const base::Closure& callback) OVERRIDE; 31 virtual void Pause(const base::Closure& callback) OVERRIDE;
31 virtual void Flush(const base::Closure& callback) OVERRIDE; 32 virtual void Flush(const base::Closure& callback) OVERRIDE;
32 33
33 // VideoDecoder implementation. 34 // VideoDecoder implementation.
34 virtual void Initialize(DemuxerStream* demuxer_stream, 35 virtual void Initialize(DemuxerStream* demuxer_stream,
(...skipping 26 matching lines...) Expand all
61 void DeliverFrame(const scoped_refptr<VideoFrame>& video_frame); 62 void DeliverFrame(const scoped_refptr<VideoFrame>& video_frame);
62 63
63 // Releases resources associated with |codec_context_| and |av_frame_| 64 // Releases resources associated with |codec_context_| and |av_frame_|
64 // and resets them to NULL. 65 // and resets them to NULL.
65 void ReleaseFFmpegResources(); 66 void ReleaseFFmpegResources();
66 67
67 // Allocates a video frame based on the current format and dimensions based on 68 // Allocates a video frame based on the current format and dimensions based on
68 // the current state of |codec_context_|. 69 // the current state of |codec_context_|.
69 scoped_refptr<VideoFrame> AllocateVideoFrame(); 70 scoped_refptr<VideoFrame> AllocateVideoFrame();
70 71
72 // This is !is_null() iff Initialize() hasn't been called.
73 base::Callback<MessageLoop*()> message_loop_factory_cb_;
74
71 MessageLoop* message_loop_; 75 MessageLoop* message_loop_;
72 76
73 DecoderState state_; 77 DecoderState state_;
74 78
75 StatisticsCB statistics_cb_; 79 StatisticsCB statistics_cb_;
76 80
77 ReadCB read_cb_; 81 ReadCB read_cb_;
78 82
79 // FFmpeg structures owned by this object. 83 // FFmpeg structures owned by this object.
80 AVCodecContext* codec_context_; 84 AVCodecContext* codec_context_;
(...skipping 11 matching lines...) Expand all
92 scoped_refptr<DemuxerStream> demuxer_stream_; 96 scoped_refptr<DemuxerStream> demuxer_stream_;
93 97
94 AesDecryptor decryptor_; 98 AesDecryptor decryptor_;
95 99
96 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder); 100 DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
97 }; 101 };
98 102
99 } // namespace media 103 } // namespace media
100 104
101 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_ 105 #endif // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698