Chromium Code Reviews| Index: content/renderer/media/rtc_video_decoder.h |
| =================================================================== |
| --- content/renderer/media/rtc_video_decoder.h (revision 109978) |
| +++ content/renderer/media/rtc_video_decoder.h (working copy) |
| @@ -5,7 +5,7 @@ |
| #ifndef CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_ |
| #define CONTENT_RENDERER_MEDIA_RTC_VIDEO_DECODER_H_ |
| -#include <deque> |
| +#include <queue> |
| #include <string> |
| #include "base/compiler_specific.h" |
| @@ -36,6 +36,7 @@ |
| virtual void Seek(base::TimeDelta time, |
| const media::FilterStatusCB& cb) OVERRIDE; |
| virtual void Pause(const base::Closure& callback) OVERRIDE; |
| + virtual void Flush(const base::Closure& callback) OVERRIDE; |
| virtual void Stop(const base::Closure& callback) OVERRIDE; |
| // Decoder implementation. |
| @@ -50,6 +51,9 @@ |
| virtual bool SetSize(int width, int height, int reserved) OVERRIDE; |
| virtual bool RenderFrame(const cricket::VideoFrame* frame) OVERRIDE; |
| + // Helper. |
| + void DeliverBlackFrame(const ReadCB& read_cb); |
| + |
| private: |
| friend class RTCVideoDecoderTest; |
| FRIEND_TEST_ALL_PREFIXES(RTCVideoDecoderTest, Initialize_Successful); |
| @@ -68,9 +72,9 @@ |
| gfx::Size visible_size_; |
| std::string url_; |
| DecoderState state_; |
| - ReadCB read_cb_; |
| + std::queue<ReadCB> read_cbs_; |
|
scherkus (not reviewing)
2011/11/16 01:12:36
ditto
|
| - // Used for accessing |read_cb_| from another thread. |
| + // Used for accessing |read_cbs_| from another thread. |
| base::Lock lock_; |
| DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoder); |