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/main_wnd.h" | 11 #include "webrtc/examples/peerconnection/client/main_wnd.h" |
12 | 12 |
13 #include <math.h> | 13 #include <math.h> |
14 | 14 |
15 #include "webrtc/examples/peerconnection/client/defaults.h" | 15 #include "webrtc/examples/peerconnection/client/defaults.h" |
16 #include "webrtc/base/arraysize.h" | 16 #include "webrtc/base/arraysize.h" |
17 #include "webrtc/base/common.h" | 17 #include "webrtc/base/common.h" |
18 #include "webrtc/base/logging.h" | 18 #include "webrtc/base/logging.h" |
| 19 #include "webrtc/media/engine/webrtcvideoframe.h" |
19 | 20 |
20 ATOM MainWnd::wnd_class_ = 0; | 21 ATOM MainWnd::wnd_class_ = 0; |
21 const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd"; | 22 const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd"; |
22 | 23 |
23 using rtc::sprintfn; | 24 using rtc::sprintfn; |
24 | 25 |
25 namespace { | 26 namespace { |
26 | 27 |
27 const char kConnecting[] = "Connecting... "; | 28 const char kConnecting[] = "Connecting... "; |
28 const char kNoVideoStreams[] = "(no video streams either way)"; | 29 const char kNoVideoStreams[] = "(no video streams either way)"; |
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
597 (bmi_.bmiHeader.biBitCount >> 3); | 598 (bmi_.bmiHeader.biBitCount >> 3); |
598 image_.reset(new uint8_t[bmi_.bmiHeader.biSizeImage]); | 599 image_.reset(new uint8_t[bmi_.bmiHeader.biSizeImage]); |
599 } | 600 } |
600 | 601 |
601 void MainWnd::VideoRenderer::OnFrame( | 602 void MainWnd::VideoRenderer::OnFrame( |
602 const cricket::VideoFrame& video_frame) { | 603 const cricket::VideoFrame& video_frame) { |
603 | 604 |
604 { | 605 { |
605 AutoLock<VideoRenderer> lock(this); | 606 AutoLock<VideoRenderer> lock(this); |
606 | 607 |
607 const cricket::VideoFrame* frame = | 608 const cricket::WebRtcVideoFrame frame( |
608 video_frame.GetCopyWithRotationApplied(); | 609 webrtc::VideoFrameBuffer::Rotate(video_frame.video_frame_buffer(), |
| 610 video_frame.rotation()), |
| 611 webrtc::kVideoRotation_0, |
| 612 video_frame.timestamp_us()); |
609 | 613 |
610 SetSize(frame->width(), frame->height()); | 614 SetSize(frame.width(), frame.height()); |
611 | 615 |
612 ASSERT(image_.get() != NULL); | 616 ASSERT(image_.get() != NULL); |
613 frame->ConvertToRgbBuffer(cricket::FOURCC_ARGB, | 617 frame.ConvertToRgbBuffer(cricket::FOURCC_ARGB, |
614 image_.get(), | 618 image_.get(), |
615 bmi_.bmiHeader.biSizeImage, | 619 bmi_.bmiHeader.biSizeImage, |
616 bmi_.bmiHeader.biWidth * | 620 bmi_.bmiHeader.biWidth * |
617 bmi_.bmiHeader.biBitCount / 8); | 621 bmi_.bmiHeader.biBitCount / 8); |
618 } | 622 } |
619 InvalidateRect(wnd_, NULL, TRUE); | 623 InvalidateRect(wnd_, NULL, TRUE); |
620 } | 624 } |
OLD | NEW |