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

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

Issue 10918172: Remove VideoDecoder::PrepareForShutdownHack() and friends. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: blah Created 8 years, 3 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 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 857cc99c9158f6137b1436d7b50d0479b93e3121..9c870536acfd96a77ab5d3b55233d54082888595 100644
--- a/content/renderer/media/rtc_video_decoder.h
+++ b/content/renderer/media/rtc_video_decoder.h
@@ -44,7 +44,6 @@ class CONTENT_EXPORT RTCVideoDecoder
virtual void Read(const ReadCB& read_cb) OVERRIDE;
virtual void Reset(const base::Closure& closure) OVERRIDE;
virtual void Stop(const base::Closure& closure) OVERRIDE;
- virtual void PrepareForShutdownHack() OVERRIDE;
// webrtc::VideoRendererInterface implementation
virtual void SetSize(int width, int height) OVERRIDE;
@@ -59,7 +58,6 @@ class CONTENT_EXPORT RTCVideoDecoder
FRIEND_TEST_ALL_PREFIXES(RTCVideoDecoderTest, DoReset);
FRIEND_TEST_ALL_PREFIXES(RTCVideoDecoderTest, DoRenderFrame);
FRIEND_TEST_ALL_PREFIXES(RTCVideoDecoderTest, DoSetSize);
- FRIEND_TEST_ALL_PREFIXES(RTCVideoDecoderTest, ReadAndShutdown);
enum DecoderState {
kUnInitialized,
@@ -82,7 +80,6 @@ class CONTENT_EXPORT RTCVideoDecoder
DecoderState state_;
ReadCB read_cb_;
bool got_first_frame_;
- bool shutting_down_;
base::TimeDelta last_frame_timestamp_;
base::TimeDelta start_time_;
// The video track the renderer is connected to.
« 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