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

Unified Diff: talk/media/webrtc/webrtcpassthroughrender.cc

Issue 1343393003: Remove some dead code. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 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
« no previous file with comments | « talk/media/webrtc/webrtcpassthroughrender.h ('k') | talk/media/webrtc/webrtcpassthroughrender_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/webrtc/webrtcpassthroughrender.cc
diff --git a/talk/media/webrtc/webrtcpassthroughrender.cc b/talk/media/webrtc/webrtcpassthroughrender.cc
deleted file mode 100644
index e31786076290f078b17fffc50d2f0bd3c8c1acc4..0000000000000000000000000000000000000000
--- a/talk/media/webrtc/webrtcpassthroughrender.cc
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * libjingle
- * Copyright 2004 Google Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "talk/media/webrtc/webrtcpassthroughrender.h"
-
-#include "webrtc/base/common.h"
-#include "webrtc/base/logging.h"
-
-namespace cricket {
-
-#define LOG_FIND_STREAM_ERROR(func, id) LOG(LS_ERROR) \
- << "" << func << " - Failed to find stream: " << id
-
-class PassthroughStream: public webrtc::VideoRenderCallback {
- public:
- PassthroughStream() : running_(false) {}
- virtual ~PassthroughStream() {
- }
- virtual int32_t RenderFrame(const uint32_t stream_id,
- const webrtc::VideoFrame& videoFrame) {
- rtc::CritScope cs(&stream_critical_);
- // Send frame for rendering directly
- if (running_ && renderer_) {
- renderer_->RenderFrame(stream_id, videoFrame);
- }
- return 0;
- }
- int32_t SetRenderer(VideoRenderCallback* renderer) {
- rtc::CritScope cs(&stream_critical_);
- renderer_ = renderer;
- return 0;
- }
-
- int32_t StartRender() {
- rtc::CritScope cs(&stream_critical_);
- running_ = true;
- return 0;
- }
-
- int32_t StopRender() {
- rtc::CritScope cs(&stream_critical_);
- running_ = false;
- return 0;
- }
-
- private:
- VideoRenderCallback* renderer_;
- rtc::CriticalSection stream_critical_;
- bool running_;
-};
-
-WebRtcPassthroughRender::WebRtcPassthroughRender()
- : window_(NULL) {
-}
-
-WebRtcPassthroughRender::~WebRtcPassthroughRender() {
- while (!stream_render_map_.empty()) {
- PassthroughStream* stream = stream_render_map_.begin()->second;
- stream_render_map_.erase(stream_render_map_.begin());
- delete stream;
- }
-}
-
-webrtc::VideoRenderCallback* WebRtcPassthroughRender::AddIncomingRenderStream(
- const uint32_t stream_id,
- const uint32_t zOrder,
- const float left, const float top,
- const float right, const float bottom) {
- rtc::CritScope cs(&render_critical_);
- // Stream already exist.
- if (FindStream(stream_id) != NULL) {
- LOG(LS_ERROR) << "AddIncomingRenderStream - Stream already exists: "
- << stream_id;
- return NULL;
- }
-
- PassthroughStream* stream = new PassthroughStream();
- // Store the stream
- stream_render_map_[stream_id] = stream;
- return stream;
-}
-
-int32_t WebRtcPassthroughRender::DeleteIncomingRenderStream(
- const uint32_t stream_id) {
- rtc::CritScope cs(&render_critical_);
- PassthroughStream* stream = FindStream(stream_id);
- if (stream == NULL) {
- LOG_FIND_STREAM_ERROR("DeleteIncomingRenderStream", stream_id);
- return -1;
- }
- delete stream;
- stream_render_map_.erase(stream_id);
- return 0;
-}
-
-int32_t WebRtcPassthroughRender::AddExternalRenderCallback(
- const uint32_t stream_id,
- webrtc::VideoRenderCallback* render_object) {
- rtc::CritScope cs(&render_critical_);
- PassthroughStream* stream = FindStream(stream_id);
- if (stream == NULL) {
- LOG_FIND_STREAM_ERROR("AddExternalRenderCallback", stream_id);
- return -1;
- }
- return stream->SetRenderer(render_object);
-}
-
-bool WebRtcPassthroughRender::HasIncomingRenderStream(
- const uint32_t stream_id) const {
- return (FindStream(stream_id) != NULL);
-}
-
-webrtc::RawVideoType WebRtcPassthroughRender::PreferredVideoType() const {
- return webrtc::kVideoI420;
-}
-
-int32_t WebRtcPassthroughRender::StartRender(const uint32_t stream_id) {
- rtc::CritScope cs(&render_critical_);
- PassthroughStream* stream = FindStream(stream_id);
- if (stream == NULL) {
- LOG_FIND_STREAM_ERROR("StartRender", stream_id);
- return -1;
- }
- return stream->StartRender();
-}
-
-int32_t WebRtcPassthroughRender::StopRender(const uint32_t stream_id) {
- rtc::CritScope cs(&render_critical_);
- PassthroughStream* stream = FindStream(stream_id);
- if (stream == NULL) {
- LOG_FIND_STREAM_ERROR("StopRender", stream_id);
- return -1;
- }
- return stream->StopRender();
-}
-
-// TODO(ronghuawu): Is it ok to return non-const pointer to PassthroughStream
-// from this const function FindStream.
-PassthroughStream* WebRtcPassthroughRender::FindStream(
- const uint32_t stream_id) const {
- StreamMap::const_iterator it = stream_render_map_.find(stream_id);
- if (it == stream_render_map_.end()) {
- return NULL;
- }
- return it->second;
-}
-
-} // namespace cricket
« no previous file with comments | « talk/media/webrtc/webrtcpassthroughrender.h ('k') | talk/media/webrtc/webrtcpassthroughrender_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698