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

Side by Side Diff: webrtc/examples/peerconnection/client/linux/main_wnd.h

Issue 2471783002: Revert of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: Created 4 years, 1 month 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 | « webrtc/api/videotracksource.cc ('k') | webrtc/examples/peerconnection/client/linux/main_wnd.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 * 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 void OnKeyPress(GtkWidget* widget, GdkEventKey* key); 65 void OnKeyPress(GtkWidget* widget, GdkEventKey* key);
66 66
67 // Callback when the user double clicks a peer in order to initiate a 67 // Callback when the user double clicks a peer in order to initiate a
68 // connection. 68 // connection.
69 void OnRowActivated(GtkTreeView* tree_view, GtkTreePath* path, 69 void OnRowActivated(GtkTreeView* tree_view, GtkTreePath* path,
70 GtkTreeViewColumn* column); 70 GtkTreeViewColumn* column);
71 71
72 void OnRedraw(); 72 void OnRedraw();
73 73
74 protected: 74 protected:
75 class VideoRenderer : public rtc::VideoSinkInterface<webrtc::VideoFrame> { 75 class VideoRenderer : public rtc::VideoSinkInterface<cricket::VideoFrame> {
76 public: 76 public:
77 VideoRenderer(GtkMainWnd* main_wnd, 77 VideoRenderer(GtkMainWnd* main_wnd,
78 webrtc::VideoTrackInterface* track_to_render); 78 webrtc::VideoTrackInterface* track_to_render);
79 virtual ~VideoRenderer(); 79 virtual ~VideoRenderer();
80 80
81 // VideoSinkInterface implementation 81 // VideoSinkInterface implementation
82 void OnFrame(const webrtc::VideoFrame& frame) override; 82 void OnFrame(const cricket::VideoFrame& frame) override;
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 19 matching lines...) Expand all
112 std::string port_; 112 std::string port_;
113 bool autoconnect_; 113 bool autoconnect_;
114 bool autocall_; 114 bool autocall_;
115 std::unique_ptr<VideoRenderer> local_renderer_; 115 std::unique_ptr<VideoRenderer> local_renderer_;
116 std::unique_ptr<VideoRenderer> remote_renderer_; 116 std::unique_ptr<VideoRenderer> remote_renderer_;
117 std::unique_ptr<uint8_t[]> draw_buffer_; 117 std::unique_ptr<uint8_t[]> draw_buffer_;
118 int draw_buffer_size_; 118 int draw_buffer_size_;
119 }; 119 };
120 120
121 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_ 121 #endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_
OLDNEW
« no previous file with comments | « webrtc/api/videotracksource.cc ('k') | webrtc/examples/peerconnection/client/linux/main_wnd.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698