OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2012 The WebRTC Project Authors. All rights reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 void OnKeyPress(GtkWidget* widget, GdkEventKey* key); | 64 void OnKeyPress(GtkWidget* widget, GdkEventKey* key); |
65 | 65 |
66 // Callback when the user double clicks a peer in order to initiate a | 66 // Callback when the user double clicks a peer in order to initiate a |
67 // connection. | 67 // connection. |
68 void OnRowActivated(GtkTreeView* tree_view, GtkTreePath* path, | 68 void OnRowActivated(GtkTreeView* tree_view, GtkTreePath* path, |
69 GtkTreeViewColumn* column); | 69 GtkTreeViewColumn* column); |
70 | 70 |
71 void OnRedraw(); | 71 void OnRedraw(); |
72 | 72 |
73 protected: | 73 protected: |
74 class VideoRenderer : public webrtc::VideoRendererInterface { | 74 class VideoRenderer : public rtc::VideoSinkInterface<cricket::VideoFrame> { |
75 public: | 75 public: |
76 VideoRenderer(GtkMainWnd* main_wnd, | 76 VideoRenderer(GtkMainWnd* main_wnd, |
77 webrtc::VideoTrackInterface* track_to_render); | 77 webrtc::VideoTrackInterface* track_to_render); |
78 virtual ~VideoRenderer(); | 78 virtual ~VideoRenderer(); |
79 | 79 |
80 // VideoRendererInterface implementation | 80 // VideoRendererInterface implementation |
81 virtual void SetSize(int width, int height); | 81 virtual void SetSize(int width, int height); |
82 virtual void RenderFrame(const cricket::VideoFrame* frame); | 82 virtual void OnFrame(const cricket::VideoFrame& frame); |
83 | 83 |
84 const uint8_t* image() const { return image_.get(); } | 84 const uint8_t* image() const { return image_.get(); } |
85 | 85 |
86 int width() const { | 86 int width() const { |
87 return width_; | 87 return width_; |
88 } | 88 } |
89 | 89 |
90 int height() const { | 90 int height() const { |
91 return height_; | 91 return height_; |
92 } | 92 } |
(...skipping 18 matching lines...) Expand all Loading... |
111 std::string port_; | 111 std::string port_; |
112 bool autoconnect_; | 112 bool autoconnect_; |
113 bool autocall_; | 113 bool autocall_; |
114 rtc::scoped_ptr<VideoRenderer> local_renderer_; | 114 rtc::scoped_ptr<VideoRenderer> local_renderer_; |
115 rtc::scoped_ptr<VideoRenderer> remote_renderer_; | 115 rtc::scoped_ptr<VideoRenderer> remote_renderer_; |
116 rtc::scoped_ptr<uint8_t[]> draw_buffer_; | 116 rtc::scoped_ptr<uint8_t[]> draw_buffer_; |
117 int draw_buffer_size_; | 117 int draw_buffer_size_; |
118 }; | 118 }; |
119 | 119 |
120 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_ | 120 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_ |
OLD | NEW |