aboutsummaryrefslogtreecommitdiff
path: root/talk/app/webrtc/videotrackrenderers.h
diff options
context:
space:
mode:
authorMagnus Jedvert <magjed@webrtc.org>2015-09-09 21:26:04 +0200
committerMagnus Jedvert <magjed@webrtc.org>2015-09-09 19:26:19 +0000
commitc2db810b8958588771282634d00b7e3954c9f5ab (patch)
tree79461a8e43d1a358db09bed3c4bec7aace0270d5 /talk/app/webrtc/videotrackrenderers.h
parentf6901b06b87d5cc056ab222d68348763f1ed9544 (diff)
downloadwebrtc-c2db810b8958588771282634d00b7e3954c9f5ab.tar.gz
Remove VideoRendererInterface::CanApplyRotation()
All implementations handle rotation now, both internally in WebRTC and externally in Chromium. R=glaznev@webrtc.org, guoweis@webrtc.org Review URL: https://codereview.webrtc.org/1313753003 . Cr-Commit-Position: refs/heads/master@{#9911}
Diffstat (limited to 'talk/app/webrtc/videotrackrenderers.h')
-rw-r--r--talk/app/webrtc/videotrackrenderers.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/talk/app/webrtc/videotrackrenderers.h b/talk/app/webrtc/videotrackrenderers.h
index 02d610f706..15274a1530 100644
--- a/talk/app/webrtc/videotrackrenderers.h
+++ b/talk/app/webrtc/videotrackrenderers.h
@@ -28,7 +28,7 @@
#ifndef TALK_APP_WEBRTC_VIDEOTRACKRENDERERS_H_
#define TALK_APP_WEBRTC_VIDEOTRACKRENDERERS_H_
-#include <vector>
+#include <set>
#include "talk/app/webrtc/mediastreaminterface.h"
#include "talk/media/base/videorenderer.h"
@@ -56,16 +56,8 @@ class VideoTrackRenderers : public cricket::VideoRenderer {
void SetEnabled(bool enable);
private:
- struct RenderObserver {
- explicit RenderObserver(VideoRendererInterface* renderer)
- : renderer_(renderer),
- can_apply_rotation_(renderer->CanApplyRotation()) {}
- VideoRendererInterface* renderer_;
- bool can_apply_rotation_;
- };
-
bool enabled_;
- std::vector<RenderObserver> renderers_;
+ std::set<VideoRendererInterface*> renderers_;
rtc::CriticalSection critical_section_; // Protects the above variables
};