Simplify VideoDecodeEngine interface by making everything synchronous.

content/renderer/media/rtc_video_decoder.h

 // Copyright (c) 2011 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 CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
 #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_
 
 #include <deque>
 #include <string>
 
@@ skipping 25 matching lines @@
   virtual void Seek(base::TimeDelta time,
                     const media::FilterStatusCB& cb) OVERRIDE;
   virtual void Pause(const base::Closure& callback) OVERRIDE;
   virtual void Stop(const base::Closure& callback) OVERRIDE;
 
   // Decoder implementation.
   virtual void Initialize(
       media::DemuxerStream* demuxer_stream,
       const base::Closure& filter_callback,
       const media::StatisticsCallback& stat_callback) OVERRIDE;
-  virtual void ProduceVideoFrame(
-      scoped_refptr<media::VideoFrame> video_frame) OVERRIDE;
+  virtual void Read(const ReadCB& callback) OVERRIDE;
   virtual gfx::Size natural_size() OVERRIDE;
 
   // cricket::VideoRenderer implementation
   virtual bool SetSize(int width, int height, int reserved) OVERRIDE;
   virtual bool RenderFrame(const cricket::VideoFrame* frame) OVERRIDE;
 
  private:
   friend class RTCVideoDecoderTest;
   FRIEND_TEST_ALL_PREFIXES(RTCVideoDecoderTest, Initialize_Successful);
   FRIEND_TEST_ALL_PREFIXES(RTCVideoDecoderTest, DoSeek);
   FRIEND_TEST_ALL_PREFIXES(RTCVideoDecoderTest, DoRenderFrame);
   FRIEND_TEST_ALL_PREFIXES(RTCVideoDecoderTest, DoSetSize);
 
   enum DecoderState {
     kUnInitialized,
     kNormal,
-    kSeeking,
     kPaused,
     kStopped
   };
 
   MessageLoop* message_loop_;
   gfx::Size visible_size_;
   std::string url_;
   DecoderState state_;
-  std::deque<scoped_refptr<media::VideoFrame> > frame_queue_available_;
-  // Used for accessing frame queue from another thread.
+  ReadCB read_cb_;
+
+  // Used for accessing |state_| and |read_cb| from another thread.

[acolwell GONE FROM CHROMIUM, 2011/11/03 20:00:43]

read_cb_

state_ doesn't appear to be protected by this lock anywhere.

[scherkus (not reviewing), 2011/11/03 20:34:38]

Done.

   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoder);
 };
 
 #endif  // CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_