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

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

Issue 1696553003: Android: Make VideoCapturer an interface for all VideoCapturers to implement (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Replace 'replace' with 'dispose' in jni as well 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
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 RTC_CHECK(thread_checker_.CalledOnValidThread()); 219 RTC_CHECK(thread_checker_.CalledOnValidThread());
220 const cricket::VideoFormat& current = video_adapter()->output_format(); 220 const cricket::VideoFormat& current = video_adapter()->output_format();
221 cricket::VideoFormat format( 221 cricket::VideoFormat format(
222 width, height, cricket::VideoFormat::FpsToInterval(fps), current.fourcc); 222 width, height, cricket::VideoFormat::FpsToInterval(fps), current.fourcc);
223 video_adapter()->OnOutputFormatRequest(format); 223 video_adapter()->OnOutputFormatRequest(format);
224 } 224 }
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 VideoCapturer.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

Powered by Google App Engine
This is Rietveld 408576698