OLD | NEW |
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/api/video/i420_buffer.h" |
18 #include "webrtc/examples/peerconnection/client/defaults.h" | 19 #include "webrtc/examples/peerconnection/client/defaults.h" |
19 #include "webrtc/base/common.h" | 20 #include "webrtc/base/common.h" |
20 #include "webrtc/base/logging.h" | 21 #include "webrtc/base/logging.h" |
21 #include "webrtc/base/stringutils.h" | 22 #include "webrtc/base/stringutils.h" |
22 | 23 |
23 using rtc::sprintfn; | 24 using rtc::sprintfn; |
24 | 25 |
25 namespace { | 26 namespace { |
26 | 27 |
27 // | 28 // |
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
516 height_ = height; | 517 height_ = height; |
517 image_.reset(new uint8_t[width * height * 4]); | 518 image_.reset(new uint8_t[width * height * 4]); |
518 gdk_threads_leave(); | 519 gdk_threads_leave(); |
519 } | 520 } |
520 | 521 |
521 void GtkMainWnd::VideoRenderer::OnFrame( | 522 void GtkMainWnd::VideoRenderer::OnFrame( |
522 const webrtc::VideoFrame& video_frame) { | 523 const webrtc::VideoFrame& video_frame) { |
523 gdk_threads_enter(); | 524 gdk_threads_enter(); |
524 | 525 |
525 rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer( | 526 rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer( |
526 webrtc::I420Buffer::Rotate(video_frame.video_frame_buffer(), | 527 video_frame.video_frame_buffer()); |
527 video_frame.rotation())); | 528 if (video_frame.rotation() != webrtc::kVideoRotation_0) { |
528 | 529 buffer = webrtc::I420Buffer::Rotate(*buffer, video_frame.rotation()); |
| 530 } |
529 SetSize(buffer->width(), buffer->height()); | 531 SetSize(buffer->width(), buffer->height()); |
530 | 532 |
531 libyuv::I420ToRGBA(buffer->DataY(), buffer->StrideY(), | 533 libyuv::I420ToRGBA(buffer->DataY(), buffer->StrideY(), |
532 buffer->DataU(), buffer->StrideU(), | 534 buffer->DataU(), buffer->StrideU(), |
533 buffer->DataV(), buffer->StrideV(), | 535 buffer->DataV(), buffer->StrideV(), |
534 image_.get(), width_ * 4, | 536 image_.get(), width_ * 4, |
535 buffer->width(), buffer->height()); | 537 buffer->width(), buffer->height()); |
536 | 538 |
537 gdk_threads_leave(); | 539 gdk_threads_leave(); |
538 | 540 |
539 g_idle_add(Redraw, main_wnd_); | 541 g_idle_add(Redraw, main_wnd_); |
540 } | 542 } |
OLD | NEW |