From 4052d881620f3f79a63df3d779f93d6124a5dc63 Mon Sep 17 00:00:00 2001 From: "magjed@webrtc.org" Date: Tue, 10 Mar 2015 16:36:17 +0000 Subject: [PATCH] Remove GetLastRenderedFrame This function is not used. R=mflodman@webrtc.org, pbos@webrtc.org Review URL: https://webrtc-codereview.appspot.com/40269004 Cr-Commit-Position: refs/heads/master@{#8673} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8673 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/media/webrtc/webrtcpassthroughrender.h | 5 ---- .../video_render/include/video_render.h | 7 ----- .../video_render/incoming_video_stream.cc | 15 +++-------- .../video_render/incoming_video_stream.h | 4 +-- .../modules/video_render/video_render_impl.cc | 27 ------------------- .../modules/video_render/video_render_impl.h | 3 --- .../video_render_internal_impl.cc | 27 ------------------- webrtc/video_engine/vie_renderer.cc | 5 ---- webrtc/video_engine/vie_renderer.h | 3 --- 9 files changed, 5 insertions(+), 91 deletions(-) diff --git a/talk/media/webrtc/webrtcpassthroughrender.h b/talk/media/webrtc/webrtcpassthroughrender.h index bbe225b8b..b1e4fd338 100644 --- a/talk/media/webrtc/webrtcpassthroughrender.h +++ b/talk/media/webrtc/webrtcpassthroughrender.h @@ -93,11 +93,6 @@ class WebRtcPassthroughRender : public webrtc::VideoRender { return -1; } - int32_t GetLastRenderedFrame(const uint32_t stream_id, - webrtc::I420VideoFrame& frame) const override { - return -1; - } - int32_t StartRender(const uint32_t stream_id) override; int32_t StopRender(const uint32_t stream_id) override; diff --git a/webrtc/modules/video_render/include/video_render.h b/webrtc/modules/video_render/include/video_render.h index 15dfd920b..a70c720ca 100644 --- a/webrtc/modules/video_render/include/video_render.h +++ b/webrtc/modules/video_render/include/video_render.h @@ -156,13 +156,6 @@ public: RegisterRawFrameCallback(const uint32_t streamId, VideoRenderCallback* callbackObj) = 0; - /* - * This method is usefull to get last rendered frame for the stream specified - */ - virtual int32_t - GetLastRenderedFrame(const uint32_t streamId, - I420VideoFrame &frame) const = 0; - /************************************************************************** * * Start/Stop diff --git a/webrtc/modules/video_render/incoming_video_stream.cc b/webrtc/modules/video_render/incoming_video_stream.cc index 9bd92ee74..655c81567 100644 --- a/webrtc/modules/video_render/incoming_video_stream.cc +++ b/webrtc/modules/video_render/incoming_video_stream.cc @@ -50,7 +50,7 @@ IncomingVideoStream::IncomingVideoStream(const int32_t module_id, incoming_rate_(0), last_rate_calculation_time_ms_(0), num_frames_since_last_calculation_(0), - last_rendered_frame_(), + last_render_time_ms_(0), temp_frame_(), start_image_(), timeout_image_(), @@ -286,13 +286,12 @@ bool IncomingVideoStream::IncomingVideoStreamProcess() { if (!frame_to_render) { if (render_callback_) { - if (last_rendered_frame_.render_time_ms() == 0 && - !start_image_.IsZeroSize()) { + if (last_render_time_ms_ == 0 && !start_image_.IsZeroSize()) { // We have not rendered anything and have a start image. temp_frame_.CopyFrame(start_image_); render_callback_->RenderFrame(stream_id_, temp_frame_); } else if (!timeout_image_.IsZeroSize() && - last_rendered_frame_.render_time_ms() + timeout_time_ < + last_render_time_ms_ + timeout_time_ < TickTime::MillisecondTimestamp()) { // Render a timeout image. temp_frame_.CopyFrame(timeout_image_); @@ -326,17 +325,11 @@ bool IncomingVideoStream::IncomingVideoStreamProcess() { // We're done with this frame, delete it. if (frame_to_render) { CriticalSectionScoped cs(&buffer_critsect_); - last_rendered_frame_.SwapFrame(frame_to_render); + last_render_time_ms_= frame_to_render->render_time_ms(); render_buffers_.ReturnFrame(frame_to_render); } } return true; } -int32_t IncomingVideoStream::GetLastRenderedFrame( - I420VideoFrame& video_frame) const { - CriticalSectionScoped cs(&buffer_critsect_); - return video_frame.CopyFrame(last_rendered_frame_); -} - } // namespace webrtc diff --git a/webrtc/modules/video_render/incoming_video_stream.h b/webrtc/modules/video_render/incoming_video_stream.h index 86210f4cf..a84d5b731 100644 --- a/webrtc/modules/video_render/incoming_video_stream.h +++ b/webrtc/modules/video_render/incoming_video_stream.h @@ -50,8 +50,6 @@ class IncomingVideoStream : public VideoRenderCallback { uint32_t StreamId() const; uint32_t IncomingRate() const; - int32_t GetLastRenderedFrame(I420VideoFrame& video_frame) const; - int32_t SetStartImage(const I420VideoFrame& video_frame); int32_t SetTimeoutImage(const I420VideoFrame& video_frame, @@ -89,7 +87,7 @@ class IncomingVideoStream : public VideoRenderCallback { uint32_t incoming_rate_; int64_t last_rate_calculation_time_ms_; uint16_t num_frames_since_last_calculation_; - I420VideoFrame last_rendered_frame_; + int64_t last_render_time_ms_; I420VideoFrame temp_frame_; I420VideoFrame start_image_; I420VideoFrame timeout_image_; diff --git a/webrtc/modules/video_render/video_render_impl.cc b/webrtc/modules/video_render/video_render_impl.cc index dd1227ef3..283a6d2ae 100644 --- a/webrtc/modules/video_render/video_render_impl.cc +++ b/webrtc/modules/video_render/video_render_impl.cc @@ -523,33 +523,6 @@ int32_t ModuleVideoRenderImpl::SetBitmap(const void* bitMap, right, bottom); } -int32_t ModuleVideoRenderImpl::GetLastRenderedFrame( - const uint32_t streamId, - I420VideoFrame &frame) const -{ - CriticalSectionScoped cs(&_moduleCrit); - - if (!_ptrRenderer) - { - WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, - "%s: No renderer", __FUNCTION__); - return -1; - } - - IncomingVideoStreamMap::const_iterator item = - _streamRenderMap.find(streamId); - if (item == _streamRenderMap.end()) - { - // This stream doesn't exist - WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, - "%s: stream doesn't exist", __FUNCTION__); - return 0; - } - - assert(item->second != NULL); - return item->second->GetLastRenderedFrame(frame); -} - int32_t ModuleVideoRenderImpl::SetExpectedRenderDelay( uint32_t stream_id, int32_t delay_ms) { CriticalSectionScoped cs(&_moduleCrit); diff --git a/webrtc/modules/video_render/video_render_impl.h b/webrtc/modules/video_render/video_render_impl.h index 4a7b83beb..278f54301 100644 --- a/webrtc/modules/video_render/video_render_impl.h +++ b/webrtc/modules/video_render/video_render_impl.h @@ -109,9 +109,6 @@ public: RegisterRawFrameCallback(const uint32_t streamId, VideoRenderCallback* callbackObj); - virtual int32_t GetLastRenderedFrame(const uint32_t streamId, - I420VideoFrame &frame) const; - virtual int32_t SetExpectedRenderDelay(uint32_t stream_id, int32_t delay_ms); diff --git a/webrtc/modules/video_render/video_render_internal_impl.cc b/webrtc/modules/video_render/video_render_internal_impl.cc index 16e8d97d4..60934b7f6 100644 --- a/webrtc/modules/video_render/video_render_internal_impl.cc +++ b/webrtc/modules/video_render/video_render_internal_impl.cc @@ -746,33 +746,6 @@ int32_t ModuleVideoRenderImpl::SetBitmap(const void* bitMap, right, bottom); } -int32_t ModuleVideoRenderImpl::GetLastRenderedFrame( - const uint32_t streamId, - I420VideoFrame &frame) const -{ - CriticalSectionScoped cs(&_moduleCrit); - - if (!_ptrRenderer) - { - WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, - "%s: No renderer", __FUNCTION__); - return -1; - } - - IncomingVideoStreamMap::const_iterator item = - _streamRenderMap.find(streamId); - if (item == _streamRenderMap.end()) - { - // This stream doesn't exist - WEBRTC_TRACE(kTraceError, kTraceVideoRenderer, _id, - "%s: stream doesn't exist", __FUNCTION__); - return 0; - } - - assert(item->second != NULL); - return item->second->GetLastRenderedFrame(frame); -} - int32_t ModuleVideoRenderImpl::SetExpectedRenderDelay( uint32_t stream_id, int32_t delay_ms) { CriticalSectionScoped cs(&_moduleCrit); diff --git a/webrtc/video_engine/vie_renderer.cc b/webrtc/video_engine/vie_renderer.cc index 38ba85cb9..a2c90cb38 100644 --- a/webrtc/video_engine/vie_renderer.cc +++ b/webrtc/video_engine/vie_renderer.cc @@ -49,11 +49,6 @@ int32_t ViERenderer::StopRender() { return render_module_.StopRender(render_id_); } -int32_t ViERenderer::GetLastRenderedFrame(const int32_t renderID, - I420VideoFrame& video_frame) { - return render_module_.GetLastRenderedFrame(renderID, video_frame); -} - int ViERenderer::SetExpectedRenderDelay(int render_delay) { return render_module_.SetExpectedRenderDelay(render_id_, render_delay); } diff --git a/webrtc/video_engine/vie_renderer.h b/webrtc/video_engine/vie_renderer.h index ff0c1e99f..fcd80ab9a 100644 --- a/webrtc/video_engine/vie_renderer.h +++ b/webrtc/video_engine/vie_renderer.h @@ -64,9 +64,6 @@ class ViERenderer: public ViEFrameCallback { int32_t StartRender(); int32_t StopRender(); - int32_t GetLastRenderedFrame(const int32_t renderID, - I420VideoFrame& video_frame); - int SetExpectedRenderDelay(int render_delay); int32_t ConfigureRenderer(const unsigned int z_order,