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

Side by Side Diff: talk/app/webrtc/videotrackrenderers.h

Issue 1313753003: Remove VideoRendererInterface::CanApplyRotation() (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 unified diff | Download patch
« no previous file with comments | « talk/app/webrtc/videotrack_unittest.cc ('k') | talk/app/webrtc/videotrackrenderers.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2012 Google Inc. 3 * Copyright 2012 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 10 matching lines...) Expand all
21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27 27
28 #ifndef TALK_APP_WEBRTC_VIDEOTRACKRENDERERS_H_ 28 #ifndef TALK_APP_WEBRTC_VIDEOTRACKRENDERERS_H_
29 #define TALK_APP_WEBRTC_VIDEOTRACKRENDERERS_H_ 29 #define TALK_APP_WEBRTC_VIDEOTRACKRENDERERS_H_
30 30
31 #include <vector> 31 #include <set>
32 32
33 #include "talk/app/webrtc/mediastreaminterface.h" 33 #include "talk/app/webrtc/mediastreaminterface.h"
34 #include "talk/media/base/videorenderer.h" 34 #include "talk/media/base/videorenderer.h"
35 #include "webrtc/base/criticalsection.h" 35 #include "webrtc/base/criticalsection.h"
36 #include "webrtc/base/scoped_ptr.h" 36 #include "webrtc/base/scoped_ptr.h"
37 37
38 namespace webrtc { 38 namespace webrtc {
39 39
40 // Class used for rendering cricket::VideoFrames to multiple renderers of type 40 // Class used for rendering cricket::VideoFrames to multiple renderers of type
41 // VideoRendererInterface. 41 // VideoRendererInterface.
42 // Each VideoTrack owns a VideoTrackRenderers instance. 42 // Each VideoTrack owns a VideoTrackRenderers instance.
43 // The class is thread safe. Rendering to the added VideoRendererInterfaces is 43 // The class is thread safe. Rendering to the added VideoRendererInterfaces is
44 // done on the same thread as the cricket::VideoRenderer. 44 // done on the same thread as the cricket::VideoRenderer.
45 class VideoTrackRenderers : public cricket::VideoRenderer { 45 class VideoTrackRenderers : public cricket::VideoRenderer {
46 public: 46 public:
47 VideoTrackRenderers(); 47 VideoTrackRenderers();
48 ~VideoTrackRenderers(); 48 ~VideoTrackRenderers();
49 49
50 // Implements cricket::VideoRenderer 50 // Implements cricket::VideoRenderer
51 virtual bool SetSize(int width, int height, int reserved); 51 virtual bool SetSize(int width, int height, int reserved);
52 virtual bool RenderFrame(const cricket::VideoFrame* frame); 52 virtual bool RenderFrame(const cricket::VideoFrame* frame);
53 53
54 void AddRenderer(VideoRendererInterface* renderer); 54 void AddRenderer(VideoRendererInterface* renderer);
55 void RemoveRenderer(VideoRendererInterface* renderer); 55 void RemoveRenderer(VideoRendererInterface* renderer);
56 void SetEnabled(bool enable); 56 void SetEnabled(bool enable);
57 57
58 private: 58 private:
59 struct RenderObserver {
60 explicit RenderObserver(VideoRendererInterface* renderer)
61 : renderer_(renderer),
62 can_apply_rotation_(renderer->CanApplyRotation()) {}
63 VideoRendererInterface* renderer_;
64 bool can_apply_rotation_;
65 };
66
67 bool enabled_; 59 bool enabled_;
68 std::vector<RenderObserver> renderers_; 60 std::set<VideoRendererInterface*> renderers_;
69 61
70 rtc::CriticalSection critical_section_; // Protects the above variables 62 rtc::CriticalSection critical_section_; // Protects the above variables
71 }; 63 };
72 64
73 } // namespace webrtc 65 } // namespace webrtc
74 66
75 #endif // TALK_APP_WEBRTC_VIDEOTRACKRENDERERS_H_ 67 #endif // TALK_APP_WEBRTC_VIDEOTRACKRENDERERS_H_
OLDNEW
« no previous file with comments | « talk/app/webrtc/videotrack_unittest.cc ('k') | talk/app/webrtc/videotrackrenderers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698