Chromium Code Reviews

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

Issue 2287233002: Delete cricket::VideoFrame::ConvertToRgbBuffer. (Closed)
Patch Set: Rebase. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « webrtc/examples/peerconnection/client/linux/main_wnd.cc ('k') | webrtc/media/base/videoframe.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 "libyuv/convert_argb.h"
15 #include "webrtc/examples/peerconnection/client/defaults.h" 16 #include "webrtc/examples/peerconnection/client/defaults.h"
16 #include "webrtc/base/arraysize.h" 17 #include "webrtc/base/arraysize.h"
17 #include "webrtc/base/common.h" 18 #include "webrtc/base/common.h"
18 #include "webrtc/base/logging.h" 19 #include "webrtc/base/logging.h"
19 #include "webrtc/media/engine/webrtcvideoframe.h" 20 #include "webrtc/media/engine/webrtcvideoframe.h"
20 21
21 ATOM MainWnd::wnd_class_ = 0; 22 ATOM MainWnd::wnd_class_ = 0;
22 const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd"; 23 const wchar_t MainWnd::kClassName[] = L"WebRTC_MainWnd";
23 24
24 using rtc::sprintfn; 25 using rtc::sprintfn;
(...skipping 581 matching lines...)
606 AutoLock<VideoRenderer> lock(this); 607 AutoLock<VideoRenderer> lock(this);
607 608
608 const cricket::WebRtcVideoFrame frame( 609 const cricket::WebRtcVideoFrame frame(
609 webrtc::I420Buffer::Rotate(video_frame.video_frame_buffer(), 610 webrtc::I420Buffer::Rotate(video_frame.video_frame_buffer(),
610 video_frame.rotation()), 611 video_frame.rotation()),
611 webrtc::kVideoRotation_0, video_frame.timestamp_us()); 612 webrtc::kVideoRotation_0, video_frame.timestamp_us());
612 613
613 SetSize(frame.width(), frame.height()); 614 SetSize(frame.width(), frame.height());
614 615
615 ASSERT(image_.get() != NULL); 616 ASSERT(image_.get() != NULL);
616 frame.ConvertToRgbBuffer(cricket::FOURCC_ARGB, 617 rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer(
617 image_.get(), 618 frame.video_frame_buffer());
618 bmi_.bmiHeader.biSizeImage, 619 libyuv::I420ToARGB(buffer->DataY(), buffer->StrideY(),
619 bmi_.bmiHeader.biWidth * 620 buffer->DataU(), buffer->StrideU(),
620 bmi_.bmiHeader.biBitCount / 8); 621 buffer->DataV(), buffer->StrideV(),
622 image_.get(),
623 bmi_.bmiHeader.biWidth *
624 bmi_.bmiHeader.biBitCount / 8,
625 buffer->width(), buffer->height());
621 } 626 }
622 InvalidateRect(wnd_, NULL, TRUE); 627 InvalidateRect(wnd_, NULL, TRUE);
623 } 628 }
OLDNEW
« no previous file with comments | « webrtc/examples/peerconnection/client/linux/main_wnd.cc ('k') | webrtc/media/base/videoframe.h » ('j') | no next file with comments »

Powered by Google App Engine