Reland of Android: Change camera fps range selection (patchset #1 id:1 of https://codereview.webrtc.org/2021233002/ )
Reason for revert: Fixed gyp bug. Original issue's description: > Revert of Android: Change camera fps range selection (patchset #4 id:100001 of https://codereview.webrtc.org/2013413002/ ) > > Reason for revert: > Breaks chromium fyi: > https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/13565 > on step 'generate_build_files': > gyp: /b/build/slave/Mac_Builder/build/src/third_party/build/android/test_runner.gypi not found > > Original issue's description: > > Android: Change camera fps range selection > > > > This CL changes the logic in > > CameraEnumerationAndroid.getClosestSupportedFramerateRange() to prefer > > fps ranges with a low lower bound so the camera can adjust for > > brightness conditions. > > > > To test the functionality of the fps range selection, JUnit tests are > > added. This required a new target in api_tests.gyp. JUnit tests are > > preferable over instrumentation tests > > (libjingle_peerconnection_android_unittest) because they are faster and > > simpler. > > > > R=kjellander@webrtc.org, sakal@webrtc.org > > > > Committed: https://crrev.com/b4ddb5c3d3706b1c02437f6a538576f3552ab908 > > Cr-Commit-Position: refs/heads/master@{#12964} > > TBR=sakal@webrtc.org,kjellander@webrtc.org > # Skipping CQ checks because original CL landed less than 1 days ago. > NOPRESUBMIT=true > NOTREECHECKS=true > NOTRY=true > > Committed: https://crrev.com/b3f208d0ba45f140272e3e705b5cdadc3c76514b > Cr-Commit-Position: refs/heads/master@{#12966} TBR=sakal@webrtc.org,kjellander@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review-Url: https://codereview.webrtc.org/2028583002 Cr-Commit-Position: refs/heads/master@{#12980}
This commit is contained in:
2
webrtc/androidjunit/OWNERS
Normal file
2
webrtc/androidjunit/OWNERS
Normal file
@ -0,0 +1,2 @@
|
||||
magjed@webrtc.org
|
||||
sakal@webrtc.org
|
||||
@ -0,0 +1,55 @@
|
||||
/*
|
||||
* Copyright 2016 The WebRTC Project Authors. All rights reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
package org.webrtc;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.webrtc.CameraEnumerationAndroid.getClosestSupportedFramerateRange;
|
||||
|
||||
import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
|
||||
import org.webrtc.CameraEnumerationAndroid.CaptureFormat.FramerateRange;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RobolectricTestRunner;
|
||||
import org.robolectric.annotation.Config;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
/**
|
||||
* Tests for CameraEnumerationAndroid.
|
||||
*/
|
||||
@RunWith(RobolectricTestRunner.class)
|
||||
@Config(manifest = Config.NONE)
|
||||
public class CameraEnumerationTest {
|
||||
@Test
|
||||
public void testGetClosestSupportedFramerateRange() {
|
||||
assertEquals(new FramerateRange(10000, 30000),
|
||||
getClosestSupportedFramerateRange(
|
||||
Arrays.asList(new FramerateRange(10000, 30000),
|
||||
new FramerateRange(30000, 30000)),
|
||||
30 /* requestedFps */));
|
||||
|
||||
assertEquals(new FramerateRange(10000, 20000),
|
||||
getClosestSupportedFramerateRange(
|
||||
Arrays.asList(new FramerateRange(0, 30000),
|
||||
new FramerateRange(10000, 20000),
|
||||
new FramerateRange(14000, 16000),
|
||||
new FramerateRange(15000, 15000)),
|
||||
15 /* requestedFps */));
|
||||
|
||||
assertEquals(new FramerateRange(10000, 20000),
|
||||
getClosestSupportedFramerateRange(
|
||||
Arrays.asList(new FramerateRange(15000, 15000),
|
||||
new FramerateRange(10000, 20000),
|
||||
new FramerateRange(10000, 30000)),
|
||||
10 /* requestedFps */));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user