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

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

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
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
11 #include "webrtc/examples/peerconnection/client/linux/main_wnd.h" 11 #include "webrtc/examples/peerconnection/client/linux/main_wnd.h"
12 12
13 #include <gdk/gdkkeysyms.h> 13 #include <gdk/gdkkeysyms.h>
14 #include <gtk/gtk.h> 14 #include <gtk/gtk.h>
15 #include <stddef.h> 15 #include <stddef.h>
16 16
17 #include "libyuv/convert_from.h" 17 #include "libyuv/convert_from.h"
18 #include "webrtc/examples/peerconnection/client/defaults.h" 18 #include "webrtc/examples/peerconnection/client/defaults.h"
19 #include "webrtc/base/common.h" 19 #include "webrtc/base/common.h"
20 #include "webrtc/base/logging.h" 20 #include "webrtc/base/logging.h"
21 #include "webrtc/base/stringutils.h" 21 #include "webrtc/base/stringutils.h"
22 #include "webrtc/media/engine/webrtcvideoframe.h"
22 23
23 using rtc::sprintfn; 24 using rtc::sprintfn;
24 25
25 namespace { 26 namespace {
26 27
27 // 28 //
28 // Simple static functions that simply forward the callback to the 29 // Simple static functions that simply forward the callback to the
29 // GtkMainWnd instance. 30 // GtkMainWnd instance.
30 // 31 //
31 32
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 return; 476 return;
476 } 477 }
477 478
478 width_ = width; 479 width_ = width;
479 height_ = height; 480 height_ = height;
480 image_.reset(new uint8_t[width * height * 4]); 481 image_.reset(new uint8_t[width * height * 4]);
481 gdk_threads_leave(); 482 gdk_threads_leave();
482 } 483 }
483 484
484 void GtkMainWnd::VideoRenderer::OnFrame( 485 void GtkMainWnd::VideoRenderer::OnFrame(
485 const webrtc::VideoFrame& video_frame) { 486 const cricket::VideoFrame& video_frame) {
486 gdk_threads_enter(); 487 gdk_threads_enter();
487 488
489 const cricket::WebRtcVideoFrame frame(
490 webrtc::I420Buffer::Rotate(video_frame.video_frame_buffer(),
491 video_frame.rotation()),
492 webrtc::kVideoRotation_0, video_frame.timestamp_us());
493
494 SetSize(frame.width(), frame.height());
495
488 rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer( 496 rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
489 webrtc::I420Buffer::Rotate(video_frame.video_frame_buffer(), 497 frame.video_frame_buffer());
490 video_frame.rotation()));
491
492 SetSize(buffer->width(), buffer->height());
493
494 libyuv::I420ToRGBA(buffer->DataY(), buffer->StrideY(), 498 libyuv::I420ToRGBA(buffer->DataY(), buffer->StrideY(),
495 buffer->DataU(), buffer->StrideU(), 499 buffer->DataU(), buffer->StrideU(),
496 buffer->DataV(), buffer->StrideV(), 500 buffer->DataV(), buffer->StrideV(),
497 image_.get(), width_ * 4, 501 image_.get(), width_ * 4,
498 buffer->width(), buffer->height()); 502 buffer->width(), buffer->height());
499 503
500 gdk_threads_leave(); 504 gdk_threads_leave();
501 505
502 g_idle_add(Redraw, main_wnd_); 506 g_idle_add(Redraw, main_wnd_);
503 } 507 }
OLDNEW
« no previous file with comments | « webrtc/examples/peerconnection/client/linux/main_wnd.h ('k') | webrtc/examples/peerconnection/client/main_wnd.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698