Create video and audio decoder threads on demand.

media/filters/ffmpeg_video_decoder.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 #define MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_
 
 #include <deque>
 
+#include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/filters.h"
 #include "media/crypto/aes_decryptor.h"
 #include "ui/gfx/size.h"
 
 class MessageLoop;
 
 struct AVCodecContext;
 struct AVFrame;
 
 namespace media {
 
+class MessageLoopFactory;

[Ami GONE FROM CHROMIUM, 2012/03/09 16:15:06]

unnecessary

[tommi (sloooow) - chröme, 2012/03/11 18:49:36]

Done.

+
 class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
  public:
-  explicit FFmpegVideoDecoder(MessageLoop* message_loop);
+  FFmpegVideoDecoder(const base::Callback<MessageLoop*()>& message_loop_cb);
   virtual ~FFmpegVideoDecoder();
 
   // Filter implementation.
   virtual void Stop(const base::Closure& callback) OVERRIDE;
   virtual void Seek(base::TimeDelta time, const FilterStatusCB& cb) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
   virtual void Flush(const base::Closure& callback) OVERRIDE;
 
   // VideoDecoder implementation.
   virtual void Initialize(DemuxerStream* demuxer_stream,
@@ skipping 26 matching lines @@
   void DeliverFrame(const scoped_refptr<VideoFrame>& video_frame);
 
   // Releases resources associated with |codec_context_| and |av_frame_|
   // and resets them to NULL.
   void ReleaseFFmpegResources();
 
   // Allocates a video frame based on the current format and dimensions based on
   // the current state of |codec_context_|.
   scoped_refptr<VideoFrame> AllocateVideoFrame();
 
+  base::Callback<MessageLoop*()> message_loop_cb_;

[Ami GONE FROM CHROMIUM, 2012/03/09 16:15:06]

s/message_loop_cb_/message_loop_factory_cb_/
and add a comment that this is !is_null() iff Initialize() hasn't been called
yet.

[tommi (sloooow) - chröme, 2012/03/11 18:49:36]

Done.

+
   MessageLoop* message_loop_;
 
   DecoderState state_;
 
   StatisticsCallback statistics_callback_;
 
   ReadCB read_cb_;
 
   // FFmpeg structures owned by this object.
   AVCodecContext* codec_context_;
@@ skipping 11 matching lines @@
   scoped_refptr<DemuxerStream> demuxer_stream_;
 
   AesDecryptor decryptor_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegVideoDecoder);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_FFMPEG_VIDEO_DECODER_H_