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

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

Issue 1362503003: Use suffixed {uint,int}{8,16,32,64}_t types. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rebase + revert basictypes.h (to be landed separately just in case of a revert due to unexpected us… Created 5 years, 2 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
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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 class VideoRenderer : public webrtc::VideoRendererInterface { 72 class VideoRenderer : public webrtc::VideoRendererInterface {
73 public: 73 public:
74 VideoRenderer(GtkMainWnd* main_wnd, 74 VideoRenderer(GtkMainWnd* main_wnd,
75 webrtc::VideoTrackInterface* track_to_render); 75 webrtc::VideoTrackInterface* track_to_render);
76 virtual ~VideoRenderer(); 76 virtual ~VideoRenderer();
77 77
78 // VideoRendererInterface implementation 78 // VideoRendererInterface implementation
79 virtual void SetSize(int width, int height); 79 virtual void SetSize(int width, int height);
80 virtual void RenderFrame(const cricket::VideoFrame* frame); 80 virtual void RenderFrame(const cricket::VideoFrame* frame);
81 81
82 const uint8* image() const { 82 const uint8_t* image() const { return image_.get(); }
83 return image_.get();
84 }
85 83
86 int width() const { 84 int width() const {
87 return width_; 85 return width_;
88 } 86 }
89 87
90 int height() const { 88 int height() const {
91 return height_; 89 return height_;
92 } 90 }
93 91
94 protected: 92 protected:
95 rtc::scoped_ptr<uint8[]> image_; 93 rtc::scoped_ptr<uint8_t[]> image_;
96 int width_; 94 int width_;
97 int height_; 95 int height_;
98 GtkMainWnd* main_wnd_; 96 GtkMainWnd* main_wnd_;
99 rtc::scoped_refptr<webrtc::VideoTrackInterface> rendered_track_; 97 rtc::scoped_refptr<webrtc::VideoTrackInterface> rendered_track_;
100 }; 98 };
101 99
102 protected: 100 protected:
103 GtkWidget* window_; // Our main window. 101 GtkWidget* window_; // Our main window.
104 GtkWidget* draw_area_; // The drawing surface for rendering video streams. 102 GtkWidget* draw_area_; // The drawing surface for rendering video streams.
105 GtkWidget* vbox_; // Container for the Connect UI. 103 GtkWidget* vbox_; // Container for the Connect UI.
106 GtkWidget* server_edit_; 104 GtkWidget* server_edit_;
107 GtkWidget* port_edit_; 105 GtkWidget* port_edit_;
108 GtkWidget* peer_list_; // The list of peers. 106 GtkWidget* peer_list_; // The list of peers.
109 MainWndCallback* callback_; 107 MainWndCallback* callback_;
110 std::string server_; 108 std::string server_;
111 std::string port_; 109 std::string port_;
112 bool autoconnect_; 110 bool autoconnect_;
113 bool autocall_; 111 bool autocall_;
114 rtc::scoped_ptr<VideoRenderer> local_renderer_; 112 rtc::scoped_ptr<VideoRenderer> local_renderer_;
115 rtc::scoped_ptr<VideoRenderer> remote_renderer_; 113 rtc::scoped_ptr<VideoRenderer> remote_renderer_;
116 rtc::scoped_ptr<uint8> draw_buffer_; 114 rtc::scoped_ptr<uint8_t[]> draw_buffer_;
117 int draw_buffer_size_; 115 int draw_buffer_size_;
118 }; 116 };
119 117
120 #endif // PEERCONNECTION_SAMPLES_CLIENT_LINUX_MAIN_WND_H_ 118 #endif // PEERCONNECTION_SAMPLES_CLIENT_LINUX_MAIN_WND_H_
OLDNEW
« no previous file with comments | « webrtc/examples/peerconnection/client/flagdefs.h ('k') | webrtc/examples/peerconnection/client/linux/main_wnd.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698