zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enable cpplint for webrtc/examples and fix all uncovered cpplint errors.

Browse Source 
BUG=webrtc:5273
TESTED=Fixed issues reported by:
find webrtc/examples/ -type f -name *.cc -o -name *.h | grep -v objc | xargs cpplint.py
followed by 'git cl presubmit'.

NOTRY=True

Review URL: https://codereview.webrtc.org/1504283004

Cr-Commit-Position: refs/heads/master@{#10960}
This commit is contained in:
jbauch
2015-12-09 14:18:14 -08:00
committed by Commit bot
parent 2e5fe31cf6
commit 70625e5bf3
17 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/examples/peerconnection/client/linux/main.cc
View File

@ -30,7 +30,7 @@ class CustomSocketServer : public rtc::PhysicalSocketServer {
// Override so that we can also pump the GTK message loop.
virtual bool Wait(int cms, bool process_io) {
// Pump GTK events.
// TODO: We really should move either the socket server or UI to a
// TODO(henrike): We really should move either the socket server or UI to a
// different thread. Alternatively we could look at merging the two loops
// by implementing a dispatcher for the socket server and/or use
// g_main_context_set_poll_func.
@ -96,10 +96,12 @@ int main(int argc, char* argv[]) {
wnd.Destroy();
thread->set_socketserver(NULL);
// TODO: Run the Gtk main loop to tear down the connection.
//while (gtk_events_pending()) {
// gtk_main_iteration();
//}
// TODO(henrike): Run the Gtk main loop to tear down the connection.
/*
while (gtk_events_pending()) {
gtk_main_iteration();
}
*/
rtc::CleanupSSL();
return 0;
}

8
webrtc/examples/peerconnection/client/linux/main_wnd.cc
View File

@ -116,7 +116,8 @@ gboolean Redraw(gpointer data) {
wnd->OnRedraw();
return false;
}
} // end anonymous
} // namespace
//
// GtkMainWnd implementation.
@ -174,7 +175,8 @@ void GtkMainWnd::StopLocalRenderer() {
local_renderer_.reset();
}
void GtkMainWnd::StartRemoteRenderer(webrtc::VideoTrackInterface* remote_video) {
void GtkMainWnd::StartRemoteRenderer(
webrtc::VideoTrackInterface* remote_video) {
remote_renderer_.reset(new VideoRenderer(this, remote_video));
}
@ -488,7 +490,7 @@ void GtkMainWnd::VideoRenderer::RenderFrame(
static_cast<int>(frame->GetHeight()));
int size = width_ * height_ * 4;
// TODO: Convert directly to RGBA
// TODO(henrike): Convert directly to RGBA
frame->ConvertToRgbBuffer(cricket::FOURCC_ARGB,
image_.get(),
size,

8
webrtc/examples/peerconnection/client/linux/main_wnd.h
View File

@ -8,8 +8,10 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef PEERCONNECTION_SAMPLES_CLIENT_LINUX_MAIN_WND_H_
#define PEERCONNECTION_SAMPLES_CLIENT_LINUX_MAIN_WND_H_
#ifndef WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_
#define WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_
#include <string>
#include "webrtc/examples/peerconnection/client/main_wnd.h"
#include "webrtc/examples/peerconnection/client/peer_connection_client.h"
@ -115,4 +117,4 @@ class GtkMainWnd : public MainWindow {
int draw_buffer_size_;
};
#endif // PEERCONNECTION_SAMPLES_CLIENT_LINUX_MAIN_WND_H_
#endif // WEBRTC_EXAMPLES_PEERCONNECTION_CLIENT_LINUX_MAIN_WND_H_