| Index: talk/examples/peerconnection/client/linux/main_wnd.cc
|
| diff --git a/talk/examples/peerconnection/client/linux/main_wnd.cc b/talk/examples/peerconnection/client/linux/main_wnd.cc
|
| deleted file mode 100644
|
| index 635d1e78682a5fd3d93313e26bc9bcf20c393f0a..0000000000000000000000000000000000000000
|
| --- a/talk/examples/peerconnection/client/linux/main_wnd.cc
|
| +++ /dev/null
|
| @@ -1,530 +0,0 @@
|
| -/*
|
| - * libjingle
|
| - * Copyright 2012 Google Inc.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions are met:
|
| - *
|
| - * 1. Redistributions of source code must retain the above copyright notice,
|
| - * this list of conditions and the following disclaimer.
|
| - * 2. Redistributions in binary form must reproduce the above copyright notice,
|
| - * this list of conditions and the following disclaimer in the documentation
|
| - * and/or other materials provided with the distribution.
|
| - * 3. The name of the author may not be used to endorse or promote products
|
| - * derived from this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
| - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
| - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
| - * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
| - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
| - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
| - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
| - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - */
|
| -
|
| -#include "talk/examples/peerconnection/client/linux/main_wnd.h"
|
| -
|
| -#include <gdk/gdkkeysyms.h>
|
| -#include <gtk/gtk.h>
|
| -#include <stddef.h>
|
| -
|
| -#include "talk/examples/peerconnection/client/defaults.h"
|
| -#include "webrtc/base/common.h"
|
| -#include "webrtc/base/logging.h"
|
| -#include "webrtc/base/stringutils.h"
|
| -
|
| -using rtc::sprintfn;
|
| -
|
| -namespace {
|
| -
|
| -//
|
| -// Simple static functions that simply forward the callback to the
|
| -// GtkMainWnd instance.
|
| -//
|
| -
|
| -gboolean OnDestroyedCallback(GtkWidget* widget, GdkEvent* event,
|
| - gpointer data) {
|
| - reinterpret_cast<GtkMainWnd*>(data)->OnDestroyed(widget, event);
|
| - return FALSE;
|
| -}
|
| -
|
| -void OnClickedCallback(GtkWidget* widget, gpointer data) {
|
| - reinterpret_cast<GtkMainWnd*>(data)->OnClicked(widget);
|
| -}
|
| -
|
| -gboolean SimulateButtonClick(gpointer button) {
|
| - g_signal_emit_by_name(button, "clicked");
|
| - return false;
|
| -}
|
| -
|
| -gboolean OnKeyPressCallback(GtkWidget* widget, GdkEventKey* key,
|
| - gpointer data) {
|
| - reinterpret_cast<GtkMainWnd*>(data)->OnKeyPress(widget, key);
|
| - return false;
|
| -}
|
| -
|
| -void OnRowActivatedCallback(GtkTreeView* tree_view, GtkTreePath* path,
|
| - GtkTreeViewColumn* column, gpointer data) {
|
| - reinterpret_cast<GtkMainWnd*>(data)->OnRowActivated(tree_view, path, column);
|
| -}
|
| -
|
| -gboolean SimulateLastRowActivated(gpointer data) {
|
| - GtkTreeView* tree_view = reinterpret_cast<GtkTreeView*>(data);
|
| - GtkTreeModel* model = gtk_tree_view_get_model(tree_view);
|
| -
|
| - // "if iter is NULL, then the number of toplevel nodes is returned."
|
| - int rows = gtk_tree_model_iter_n_children(model, NULL);
|
| - GtkTreePath* lastpath = gtk_tree_path_new_from_indices(rows - 1, -1);
|
| -
|
| - // Select the last item in the list
|
| - GtkTreeSelection* selection = gtk_tree_view_get_selection(tree_view);
|
| - gtk_tree_selection_select_path(selection, lastpath);
|
| -
|
| - // Our TreeView only has one column, so it is column 0.
|
| - GtkTreeViewColumn* column = gtk_tree_view_get_column(tree_view, 0);
|
| -
|
| - gtk_tree_view_row_activated(tree_view, lastpath, column);
|
| -
|
| - gtk_tree_path_free(lastpath);
|
| - return false;
|
| -}
|
| -
|
| -// Creates a tree view, that we use to display the list of peers.
|
| -void InitializeList(GtkWidget* list) {
|
| - GtkCellRenderer* renderer = gtk_cell_renderer_text_new();
|
| - GtkTreeViewColumn* column = gtk_tree_view_column_new_with_attributes(
|
| - "List Items", renderer, "text", 0, NULL);
|
| - gtk_tree_view_append_column(GTK_TREE_VIEW(list), column);
|
| - GtkListStore* store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_INT);
|
| - gtk_tree_view_set_model(GTK_TREE_VIEW(list), GTK_TREE_MODEL(store));
|
| - g_object_unref(store);
|
| -}
|
| -
|
| -// Adds an entry to a tree view.
|
| -void AddToList(GtkWidget* list, const gchar* str, int value) {
|
| - GtkListStore* store = GTK_LIST_STORE(
|
| - gtk_tree_view_get_model(GTK_TREE_VIEW(list)));
|
| -
|
| - GtkTreeIter iter;
|
| - gtk_list_store_append(store, &iter);
|
| - gtk_list_store_set(store, &iter, 0, str, 1, value, -1);
|
| -}
|
| -
|
| -struct UIThreadCallbackData {
|
| - explicit UIThreadCallbackData(MainWndCallback* cb, int id, void* d)
|
| - : callback(cb), msg_id(id), data(d) {}
|
| - MainWndCallback* callback;
|
| - int msg_id;
|
| - void* data;
|
| -};
|
| -
|
| -gboolean HandleUIThreadCallback(gpointer data) {
|
| - UIThreadCallbackData* cb_data = reinterpret_cast<UIThreadCallbackData*>(data);
|
| - cb_data->callback->UIThreadCallback(cb_data->msg_id, cb_data->data);
|
| - delete cb_data;
|
| - return false;
|
| -}
|
| -
|
| -gboolean Redraw(gpointer data) {
|
| - GtkMainWnd* wnd = reinterpret_cast<GtkMainWnd*>(data);
|
| - wnd->OnRedraw();
|
| - return false;
|
| -}
|
| -} // end anonymous
|
| -
|
| -//
|
| -// GtkMainWnd implementation.
|
| -//
|
| -
|
| -GtkMainWnd::GtkMainWnd(const char* server, int port, bool autoconnect,
|
| - bool autocall)
|
| - : window_(NULL), draw_area_(NULL), vbox_(NULL), server_edit_(NULL),
|
| - port_edit_(NULL), peer_list_(NULL), callback_(NULL),
|
| - server_(server), autoconnect_(autoconnect), autocall_(autocall) {
|
| - char buffer[10];
|
| - sprintfn(buffer, sizeof(buffer), "%i", port);
|
| - port_ = buffer;
|
| -}
|
| -
|
| -GtkMainWnd::~GtkMainWnd() {
|
| - ASSERT(!IsWindow());
|
| -}
|
| -
|
| -void GtkMainWnd::RegisterObserver(MainWndCallback* callback) {
|
| - callback_ = callback;
|
| -}
|
| -
|
| -bool GtkMainWnd::IsWindow() {
|
| - return window_ != NULL && GTK_IS_WINDOW(window_);
|
| -}
|
| -
|
| -void GtkMainWnd::MessageBox(const char* caption, const char* text,
|
| - bool is_error) {
|
| - GtkWidget* dialog = gtk_message_dialog_new(GTK_WINDOW(window_),
|
| - GTK_DIALOG_DESTROY_WITH_PARENT,
|
| - is_error ? GTK_MESSAGE_ERROR : GTK_MESSAGE_INFO,
|
| - GTK_BUTTONS_CLOSE, "%s", text);
|
| - gtk_window_set_title(GTK_WINDOW(dialog), caption);
|
| - gtk_dialog_run(GTK_DIALOG(dialog));
|
| - gtk_widget_destroy(dialog);
|
| -}
|
| -
|
| -MainWindow::UI GtkMainWnd::current_ui() {
|
| - if (vbox_)
|
| - return CONNECT_TO_SERVER;
|
| -
|
| - if (peer_list_)
|
| - return LIST_PEERS;
|
| -
|
| - return STREAMING;
|
| -}
|
| -
|
| -
|
| -void GtkMainWnd::StartLocalRenderer(webrtc::VideoTrackInterface* local_video) {
|
| - local_renderer_.reset(new VideoRenderer(this, local_video));
|
| -}
|
| -
|
| -void GtkMainWnd::StopLocalRenderer() {
|
| - local_renderer_.reset();
|
| -}
|
| -
|
| -void GtkMainWnd::StartRemoteRenderer(webrtc::VideoTrackInterface* remote_video) {
|
| - remote_renderer_.reset(new VideoRenderer(this, remote_video));
|
| -}
|
| -
|
| -void GtkMainWnd::StopRemoteRenderer() {
|
| - remote_renderer_.reset();
|
| -}
|
| -
|
| -void GtkMainWnd::QueueUIThreadCallback(int msg_id, void* data) {
|
| - g_idle_add(HandleUIThreadCallback,
|
| - new UIThreadCallbackData(callback_, msg_id, data));
|
| -}
|
| -
|
| -bool GtkMainWnd::Create() {
|
| - ASSERT(window_ == NULL);
|
| -
|
| - window_ = gtk_window_new(GTK_WINDOW_TOPLEVEL);
|
| - if (window_) {
|
| - gtk_window_set_position(GTK_WINDOW(window_), GTK_WIN_POS_CENTER);
|
| - gtk_window_set_default_size(GTK_WINDOW(window_), 640, 480);
|
| - gtk_window_set_title(GTK_WINDOW(window_), "PeerConnection client");
|
| - g_signal_connect(G_OBJECT(window_), "delete-event",
|
| - G_CALLBACK(&OnDestroyedCallback), this);
|
| - g_signal_connect(window_, "key-press-event", G_CALLBACK(OnKeyPressCallback),
|
| - this);
|
| -
|
| - SwitchToConnectUI();
|
| - }
|
| -
|
| - return window_ != NULL;
|
| -}
|
| -
|
| -bool GtkMainWnd::Destroy() {
|
| - if (!IsWindow())
|
| - return false;
|
| -
|
| - gtk_widget_destroy(window_);
|
| - window_ = NULL;
|
| -
|
| - return true;
|
| -}
|
| -
|
| -void GtkMainWnd::SwitchToConnectUI() {
|
| - LOG(INFO) << __FUNCTION__;
|
| -
|
| - ASSERT(IsWindow());
|
| - ASSERT(vbox_ == NULL);
|
| -
|
| - gtk_container_set_border_width(GTK_CONTAINER(window_), 10);
|
| -
|
| - if (peer_list_) {
|
| - gtk_widget_destroy(peer_list_);
|
| - peer_list_ = NULL;
|
| - }
|
| -
|
| - vbox_ = gtk_vbox_new(FALSE, 5);
|
| - GtkWidget* valign = gtk_alignment_new(0, 1, 0, 0);
|
| - gtk_container_add(GTK_CONTAINER(vbox_), valign);
|
| - gtk_container_add(GTK_CONTAINER(window_), vbox_);
|
| -
|
| - GtkWidget* hbox = gtk_hbox_new(FALSE, 5);
|
| -
|
| - GtkWidget* label = gtk_label_new("Server");
|
| - gtk_container_add(GTK_CONTAINER(hbox), label);
|
| -
|
| - server_edit_ = gtk_entry_new();
|
| - gtk_entry_set_text(GTK_ENTRY(server_edit_), server_.c_str());
|
| - gtk_widget_set_size_request(server_edit_, 400, 30);
|
| - gtk_container_add(GTK_CONTAINER(hbox), server_edit_);
|
| -
|
| - port_edit_ = gtk_entry_new();
|
| - gtk_entry_set_text(GTK_ENTRY(port_edit_), port_.c_str());
|
| - gtk_widget_set_size_request(port_edit_, 70, 30);
|
| - gtk_container_add(GTK_CONTAINER(hbox), port_edit_);
|
| -
|
| - GtkWidget* button = gtk_button_new_with_label("Connect");
|
| - gtk_widget_set_size_request(button, 70, 30);
|
| - g_signal_connect(button, "clicked", G_CALLBACK(OnClickedCallback), this);
|
| - gtk_container_add(GTK_CONTAINER(hbox), button);
|
| -
|
| - GtkWidget* halign = gtk_alignment_new(1, 0, 0, 0);
|
| - gtk_container_add(GTK_CONTAINER(halign), hbox);
|
| - gtk_box_pack_start(GTK_BOX(vbox_), halign, FALSE, FALSE, 0);
|
| -
|
| - gtk_widget_show_all(window_);
|
| -
|
| - if (autoconnect_)
|
| - g_idle_add(SimulateButtonClick, button);
|
| -}
|
| -
|
| -void GtkMainWnd::SwitchToPeerList(const Peers& peers) {
|
| - LOG(INFO) << __FUNCTION__;
|
| -
|
| - if (!peer_list_) {
|
| - gtk_container_set_border_width(GTK_CONTAINER(window_), 0);
|
| - if (vbox_) {
|
| - gtk_widget_destroy(vbox_);
|
| - vbox_ = NULL;
|
| - server_edit_ = NULL;
|
| - port_edit_ = NULL;
|
| - } else if (draw_area_) {
|
| - gtk_widget_destroy(draw_area_);
|
| - draw_area_ = NULL;
|
| - draw_buffer_.reset();
|
| - }
|
| -
|
| - peer_list_ = gtk_tree_view_new();
|
| - g_signal_connect(peer_list_, "row-activated",
|
| - G_CALLBACK(OnRowActivatedCallback), this);
|
| - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(peer_list_), FALSE);
|
| - InitializeList(peer_list_);
|
| - gtk_container_add(GTK_CONTAINER(window_), peer_list_);
|
| - gtk_widget_show_all(window_);
|
| - } else {
|
| - GtkListStore* store =
|
| - GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW(peer_list_)));
|
| - gtk_list_store_clear(store);
|
| - }
|
| -
|
| - AddToList(peer_list_, "List of currently connected peers:", -1);
|
| - for (Peers::const_iterator i = peers.begin(); i != peers.end(); ++i)
|
| - AddToList(peer_list_, i->second.c_str(), i->first);
|
| -
|
| - if (autocall_ && peers.begin() != peers.end())
|
| - g_idle_add(SimulateLastRowActivated, peer_list_);
|
| -}
|
| -
|
| -void GtkMainWnd::SwitchToStreamingUI() {
|
| - LOG(INFO) << __FUNCTION__;
|
| -
|
| - ASSERT(draw_area_ == NULL);
|
| -
|
| - gtk_container_set_border_width(GTK_CONTAINER(window_), 0);
|
| - if (peer_list_) {
|
| - gtk_widget_destroy(peer_list_);
|
| - peer_list_ = NULL;
|
| - }
|
| -
|
| - draw_area_ = gtk_drawing_area_new();
|
| - gtk_container_add(GTK_CONTAINER(window_), draw_area_);
|
| -
|
| - gtk_widget_show_all(window_);
|
| -}
|
| -
|
| -void GtkMainWnd::OnDestroyed(GtkWidget* widget, GdkEvent* event) {
|
| - callback_->Close();
|
| - window_ = NULL;
|
| - draw_area_ = NULL;
|
| - vbox_ = NULL;
|
| - server_edit_ = NULL;
|
| - port_edit_ = NULL;
|
| - peer_list_ = NULL;
|
| -}
|
| -
|
| -void GtkMainWnd::OnClicked(GtkWidget* widget) {
|
| - // Make the connect button insensitive, so that it cannot be clicked more than
|
| - // once. Now that the connection includes auto-retry, it should not be
|
| - // necessary to click it more than once.
|
| - gtk_widget_set_sensitive(widget, false);
|
| - server_ = gtk_entry_get_text(GTK_ENTRY(server_edit_));
|
| - port_ = gtk_entry_get_text(GTK_ENTRY(port_edit_));
|
| - int port = port_.length() ? atoi(port_.c_str()) : 0;
|
| - callback_->StartLogin(server_, port);
|
| -}
|
| -
|
| -void GtkMainWnd::OnKeyPress(GtkWidget* widget, GdkEventKey* key) {
|
| - if (key->type == GDK_KEY_PRESS) {
|
| - switch (key->keyval) {
|
| - case GDK_Escape:
|
| - if (draw_area_) {
|
| - callback_->DisconnectFromCurrentPeer();
|
| - } else if (peer_list_) {
|
| - callback_->DisconnectFromServer();
|
| - }
|
| - break;
|
| -
|
| - case GDK_KP_Enter:
|
| - case GDK_Return:
|
| - if (vbox_) {
|
| - OnClicked(NULL);
|
| - } else if (peer_list_) {
|
| - // OnRowActivated will be called automatically when the user
|
| - // presses enter.
|
| - }
|
| - break;
|
| -
|
| - default:
|
| - break;
|
| - }
|
| - }
|
| -}
|
| -
|
| -void GtkMainWnd::OnRowActivated(GtkTreeView* tree_view, GtkTreePath* path,
|
| - GtkTreeViewColumn* column) {
|
| - ASSERT(peer_list_ != NULL);
|
| - GtkTreeIter iter;
|
| - GtkTreeModel* model;
|
| - GtkTreeSelection* selection =
|
| - gtk_tree_view_get_selection(GTK_TREE_VIEW(tree_view));
|
| - if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
|
| - char* text;
|
| - int id = -1;
|
| - gtk_tree_model_get(model, &iter, 0, &text, 1, &id, -1);
|
| - if (id != -1)
|
| - callback_->ConnectToPeer(id);
|
| - g_free(text);
|
| - }
|
| -}
|
| -
|
| -void GtkMainWnd::OnRedraw() {
|
| - gdk_threads_enter();
|
| -
|
| - VideoRenderer* remote_renderer = remote_renderer_.get();
|
| - if (remote_renderer && remote_renderer->image() != NULL &&
|
| - draw_area_ != NULL) {
|
| - int width = remote_renderer->width();
|
| - int height = remote_renderer->height();
|
| -
|
| - if (!draw_buffer_.get()) {
|
| - draw_buffer_size_ = (width * height * 4) * 4;
|
| - draw_buffer_.reset(new uint8[draw_buffer_size_]);
|
| - gtk_widget_set_size_request(draw_area_, width * 2, height * 2);
|
| - }
|
| -
|
| - const uint32* image = reinterpret_cast<const uint32*>(
|
| - remote_renderer->image());
|
| - uint32* scaled = reinterpret_cast<uint32*>(draw_buffer_.get());
|
| - for (int r = 0; r < height; ++r) {
|
| - for (int c = 0; c < width; ++c) {
|
| - int x = c * 2;
|
| - scaled[x] = scaled[x + 1] = image[c];
|
| - }
|
| -
|
| - uint32* prev_line = scaled;
|
| - scaled += width * 2;
|
| - memcpy(scaled, prev_line, (width * 2) * 4);
|
| -
|
| - image += width;
|
| - scaled += width * 2;
|
| - }
|
| -
|
| - VideoRenderer* local_renderer = local_renderer_.get();
|
| - if (local_renderer && local_renderer->image()) {
|
| - image = reinterpret_cast<const uint32*>(local_renderer->image());
|
| - scaled = reinterpret_cast<uint32*>(draw_buffer_.get());
|
| - // Position the local preview on the right side.
|
| - scaled += (width * 2) - (local_renderer->width() / 2);
|
| - // right margin...
|
| - scaled -= 10;
|
| - // ... towards the bottom.
|
| - scaled += (height * width * 4) -
|
| - ((local_renderer->height() / 2) *
|
| - (local_renderer->width() / 2) * 4);
|
| - // bottom margin...
|
| - scaled -= (width * 2) * 5;
|
| - for (int r = 0; r < local_renderer->height(); r += 2) {
|
| - for (int c = 0; c < local_renderer->width(); c += 2) {
|
| - scaled[c / 2] = image[c + r * local_renderer->width()];
|
| - }
|
| - scaled += width * 2;
|
| - }
|
| - }
|
| -
|
| - gdk_draw_rgb_32_image(draw_area_->window,
|
| - draw_area_->style->fg_gc[GTK_STATE_NORMAL],
|
| - 0,
|
| - 0,
|
| - width * 2,
|
| - height * 2,
|
| - GDK_RGB_DITHER_MAX,
|
| - draw_buffer_.get(),
|
| - (width * 2) * 4);
|
| - }
|
| -
|
| - gdk_threads_leave();
|
| -}
|
| -
|
| -GtkMainWnd::VideoRenderer::VideoRenderer(
|
| - GtkMainWnd* main_wnd,
|
| - webrtc::VideoTrackInterface* track_to_render)
|
| - : width_(0),
|
| - height_(0),
|
| - main_wnd_(main_wnd),
|
| - rendered_track_(track_to_render) {
|
| - rendered_track_->AddRenderer(this);
|
| -}
|
| -
|
| -GtkMainWnd::VideoRenderer::~VideoRenderer() {
|
| - rendered_track_->RemoveRenderer(this);
|
| -}
|
| -
|
| -void GtkMainWnd::VideoRenderer::SetSize(int width, int height) {
|
| - gdk_threads_enter();
|
| -
|
| - if (width_ == width && height_ == height) {
|
| - return;
|
| - }
|
| -
|
| - width_ = width;
|
| - height_ = height;
|
| - image_.reset(new uint8[width * height * 4]);
|
| - gdk_threads_leave();
|
| -}
|
| -
|
| -void GtkMainWnd::VideoRenderer::RenderFrame(
|
| - const cricket::VideoFrame* video_frame) {
|
| - gdk_threads_enter();
|
| -
|
| - const cricket::VideoFrame* frame = video_frame->GetCopyWithRotationApplied();
|
| -
|
| - SetSize(static_cast<int>(frame->GetWidth()),
|
| - static_cast<int>(frame->GetHeight()));
|
| -
|
| - int size = width_ * height_ * 4;
|
| - // TODO: Convert directly to RGBA
|
| - frame->ConvertToRgbBuffer(cricket::FOURCC_ARGB,
|
| - image_.get(),
|
| - size,
|
| - width_ * 4);
|
| - // Convert the B,G,R,A frame to R,G,B,A, which is accepted by GTK.
|
| - // The 'A' is just padding for GTK, so we can use it as temp.
|
| - uint8* pix = image_.get();
|
| - uint8* end = image_.get() + size;
|
| - while (pix < end) {
|
| - pix[3] = pix[0]; // Save B to A.
|
| - pix[0] = pix[2]; // Set Red.
|
| - pix[2] = pix[3]; // Set Blue.
|
| - pix[3] = 0xFF; // Fixed Alpha.
|
| - pix += 4;
|
| - }
|
| -
|
| - gdk_threads_leave();
|
| -
|
| - g_idle_add(Redraw, main_wnd_);
|
| -}
|
| -
|
| -
|
|
|