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

Side by Side Diff: webrtc/api/androidvideocapturer.cc

Issue 1684163002: Rename webrtc/media/webrtc -> webrtc/media/engine (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase f396f6085f9e4f16f37471a7828e3e31308c0d52 #11590 Created 4 years, 10 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 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 2015 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/api/androidvideocapturer.h" 11 #include "webrtc/api/androidvideocapturer.h"
12 12
13 #include "webrtc/api/java/jni/native_handle_impl.h" 13 #include "webrtc/api/java/jni/native_handle_impl.h"
14 #include "webrtc/base/common.h" 14 #include "webrtc/base/common.h"
15 #include "webrtc/base/json.h" 15 #include "webrtc/base/json.h"
16 #include "webrtc/base/timeutils.h" 16 #include "webrtc/base/timeutils.h"
17 #include "webrtc/media/webrtc/webrtcvideoframe.h" 17 #include "webrtc/media/engine/webrtcvideoframe.h"
18 18
19 namespace webrtc { 19 namespace webrtc {
20 20
21 // A hack for avoiding deep frame copies in 21 // A hack for avoiding deep frame copies in
22 // cricket::VideoCapturer.SignalFrameCaptured() using a custom FrameFactory. 22 // cricket::VideoCapturer.SignalFrameCaptured() using a custom FrameFactory.
23 // A frame is injected using UpdateCapturedFrame(), and converted into a 23 // A frame is injected using UpdateCapturedFrame(), and converted into a
24 // cricket::VideoFrame with CreateAliasedFrame(). UpdateCapturedFrame() should 24 // cricket::VideoFrame with CreateAliasedFrame(). UpdateCapturedFrame() should
25 // be called before CreateAliasedFrame() for every frame. 25 // be called before CreateAliasedFrame() for every frame.
26 // TODO(magjed): Add an interface cricket::VideoCapturer::OnFrameCaptured() 26 // TODO(magjed): Add an interface cricket::VideoCapturer::OnFrameCaptured()
27 // for ref counted I420 frames instead of this hack. 27 // for ref counted I420 frames instead of this hack.
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 225
226 bool AndroidVideoCapturer::GetBestCaptureFormat( 226 bool AndroidVideoCapturer::GetBestCaptureFormat(
227 const cricket::VideoFormat& desired, 227 const cricket::VideoFormat& desired,
228 cricket::VideoFormat* best_format) { 228 cricket::VideoFormat* best_format) {
229 // Delegate this choice to VideoCapturerAndroid.startCapture(). 229 // Delegate this choice to VideoCapturerAndroid.startCapture().
230 *best_format = desired; 230 *best_format = desired;
231 return true; 231 return true;
232 } 232 }
233 233
234 } // namespace webrtc 234 } // namespace webrtc
OLDNEW
« no previous file with comments | « talk/session/media/channelmanager_unittest.cc ('k') | webrtc/api/java/jni/androidmediadecoder_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698