From 640313ce4f3001411b42f6eae37294ebb6a6e7be Mon Sep 17 00:00:00 2001 From: "magjed@webrtc.org" Date: Tue, 17 Feb 2015 15:10:32 +0000 Subject: [PATCH] WebRtcVideoCapturer: Remove dead code |OnIncomingCapturedEncodedFrame| The end goal except cleanup is to remove webrtc::VideoFrame. R=mflodman@webrtc.org, pbos@webrtc.org, perkj@webrtc.org Review URL: https://webrtc-codereview.appspot.com/36079004 Cr-Commit-Position: refs/heads/master@{#8393} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8393 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcvideocapturer.h | 4 ---- webrtc/modules/video_capture/test/video_capture_unittest.cc | 6 ------ 2 files changed, 10 deletions(-) diff --git a/talk/media/webrtc/webrtcvideocapturer.h b/talk/media/webrtc/webrtcvideocapturer.h index e7d870b7b..a529ddd3e 100644 --- a/talk/media/webrtc/webrtcvideocapturer.h +++ b/talk/media/webrtc/webrtcvideocapturer.h @@ -82,10 +82,6 @@ class WebRtcVideoCapturer : public VideoCapturer, // Callback when a frame is captured by camera. virtual void OnIncomingCapturedFrame(const int32_t id, webrtc::I420VideoFrame& frame); - virtual void OnIncomingCapturedEncodedFrame(const int32_t id, - webrtc::VideoFrame& frame, - webrtc::VideoCodecType codec_type) { - } virtual void OnCaptureDelayChanged(const int32_t id, const int32_t delay); diff --git a/webrtc/modules/video_capture/test/video_capture_unittest.cc b/webrtc/modules/video_capture/test/video_capture_unittest.cc index 974b1c93b..c2cb75019 100644 --- a/webrtc/modules/video_capture/test/video_capture_unittest.cc +++ b/webrtc/modules/video_capture/test/video_capture_unittest.cc @@ -142,12 +142,6 @@ class TestVideoCaptureCallback : public VideoCaptureDataCallback { last_render_time_ms_ = videoFrame.render_time_ms(); last_frame_.CopyFrame(videoFrame); } - virtual void OnIncomingCapturedEncodedFrame(const int32_t id, - webrtc::VideoFrame& videoFrame, - webrtc::VideoCodecType codecType) - { - assert(false); - } virtual void OnCaptureDelayChanged(const int32_t id, const int32_t delay) {