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

Unified Diff: content/renderer/media/rtc_video_decoder.h

Issue 8417019: Simplify VideoDecodeEngine interface by making everything synchronous. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix for CaptureVideoDecoder Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/rtc_video_decoder.h
diff --git a/content/renderer/media/rtc_video_decoder.h b/content/renderer/media/rtc_video_decoder.h
index eb59e2279ad950a901ccdcc3a897ccacd948f1d4..bfcea41ff46db6b2a79d64ff6a47bf14aafaa2c0 100644
--- a/content/renderer/media/rtc_video_decoder.h
+++ b/content/renderer/media/rtc_video_decoder.h
@@ -43,9 +43,8 @@ class CONTENT_EXPORT RTCVideoDecoder
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 gfx::Size natural_size() OVERRIDE;
+ virtual void Read(const ReadCB& callback) OVERRIDE;
+ virtual const gfx::Size& natural_size() OVERRIDE;
// cricket::VideoRenderer implementation
virtual bool SetSize(int width, int height, int reserved) OVERRIDE;
@@ -61,7 +60,6 @@ class CONTENT_EXPORT RTCVideoDecoder
enum DecoderState {
kUnInitialized,
kNormal,
- kSeeking,
kPaused,
kStopped
};
@@ -70,8 +68,9 @@ class CONTENT_EXPORT RTCVideoDecoder
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 |read_cb_| from another thread.
base::Lock lock_;
DISALLOW_COPY_AND_ASSIGN(RTCVideoDecoder);
« no previous file with comments | « content/renderer/media/capture_video_decoder_unittest.cc ('k') | content/renderer/media/rtc_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698