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

Unified Diff: webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java

Issue 2021233002: Revert of Android: Change camera fps range selection (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/androidjunit/OWNERS ('k') | webrtc/api/java/android/org/webrtc/CameraEnumerationAndroid.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java
diff --git a/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java b/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java
deleted file mode 100644
index b1ebb6c360bed1e49681a80077fd7413655479a9..0000000000000000000000000000000000000000
--- a/webrtc/androidjunit/src/org/webrtc/CameraEnumerationTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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 */));
- }
-}
« no previous file with comments | « webrtc/androidjunit/OWNERS ('k') | webrtc/api/java/android/org/webrtc/CameraEnumerationAndroid.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698