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

Side by Side Diff: webrtc/sdk/objc/Framework/Classes/objcvideotracksource.mm

Issue 2845333002: Revert of Delete deprecated and transitional stuff related to video frame refactoring. (Closed)
Patch Set: Created 3 years, 7 months 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 (c) 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2017 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/sdk/objc/Framework/Classes/objcvideotracksource.h" 11 #include "webrtc/sdk/objc/Framework/Classes/objcvideotracksource.h"
12 12
13 #import "RTCVideoFrame+Private.h" 13 #import "RTCVideoFrame+Private.h"
14 14
15 #include "webrtc/api/video/i420_buffer.h"
16 #include "webrtc/common_video/include/corevideo_frame_buffer.h" 15 #include "webrtc/common_video/include/corevideo_frame_buffer.h"
17 16
18 namespace webrtc { 17 namespace webrtc {
19 18
20 ObjcVideoTrackSource::ObjcVideoTrackSource() {} 19 ObjcVideoTrackSource::ObjcVideoTrackSource() {}
21 20
22 void ObjcVideoTrackSource::OnOutputFormatRequest(int width, int height, int fps) { 21 void ObjcVideoTrackSource::OnOutputFormatRequest(int width, int height, int fps) {
23 cricket::VideoFormat format(width, height, cricket::VideoFormat::FpsToInterval (fps), 0); 22 cricket::VideoFormat format(width, height, cricket::VideoFormat::FpsToInterval (fps), 0);
24 video_adapter()->OnOutputFormatRequest(format); 23 video_adapter()->OnOutputFormatRequest(format);
25 } 24 }
(...skipping 28 matching lines...) Expand all
54 // TODO(magjed): Optimize this I420 path. 53 // TODO(magjed): Optimize this I420 path.
55 rtc::scoped_refptr<I420Buffer> i420_buffer = I420Buffer::Create(adapted_widt h, adapted_height); 54 rtc::scoped_refptr<I420Buffer> i420_buffer = I420Buffer::Create(adapted_widt h, adapted_height);
56 i420_buffer->CropAndScaleFrom(*frame.videoBuffer, crop_x, crop_y, crop_width , crop_height); 55 i420_buffer->CropAndScaleFrom(*frame.videoBuffer, crop_x, crop_y, crop_width , crop_height);
57 buffer = i420_buffer; 56 buffer = i420_buffer;
58 } 57 }
59 58
60 // Applying rotation is only supported for legacy reasons and performance is 59 // Applying rotation is only supported for legacy reasons and performance is
61 // not critical here. 60 // not critical here.
62 webrtc::VideoRotation rotation = static_cast<webrtc::VideoRotation>(frame.rota tion); 61 webrtc::VideoRotation rotation = static_cast<webrtc::VideoRotation>(frame.rota tion);
63 if (apply_rotation() && rotation != kVideoRotation_0) { 62 if (apply_rotation() && rotation != kVideoRotation_0) {
64 buffer = I420Buffer::Rotate(*buffer->NativeToI420Buffer(), rotation); 63 buffer = I420Buffer::Rotate(buffer->NativeToI420Buffer(), rotation);
65 rotation = kVideoRotation_0; 64 rotation = kVideoRotation_0;
66 } 65 }
67 66
68 OnFrame(webrtc::VideoFrame(buffer, rotation, translated_timestamp_us)); 67 OnFrame(webrtc::VideoFrame(buffer, rotation, translated_timestamp_us));
69 } 68 }
70 69
71 } // namespace webrtc 70 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/sdk/objc/Framework/Classes/avfoundationvideocapturer.mm ('k') | webrtc/test/fake_texture_frame.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698