Android: Add FramerateRange class

webrtc/api/androidtests/src/org/webrtc/VideoCapturerAndroidTestFixtures.java

 /*
  *  Copyright 2015 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;
@@ skipping 271 matching lines @@
   }
 
   static public void cameraEventsInvoked(VideoCapturerAndroid capturer, CameraEvents events,
       Context appContext) throws InterruptedException {
     final List<CaptureFormat> formats = capturer.getSupportedFormats();
     final CameraEnumerationAndroid.CaptureFormat format = formats.get(0);
 
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     final FakeCapturerObserver observer = new FakeCapturerObserver();
-    capturer.startCapture(format.width, format.height, format.maxFramerate,
+    capturer.startCapture(format.width, format.height, format.framerate.max,
         surfaceTextureHelper, appContext, observer);
     // Make sure camera is started and first frame is received and then stop it.
     assertTrue(observer.WaitForCapturerToStart());
     observer.WaitForNextCapturedFrame();
     capturer.stopCapture();
     if (capturer.isCapturingToTexture()) {
       surfaceTextureHelper.returnTextureFrame();
     }
     release(capturer);
     surfaceTextureHelper.dispose();
 
     assertTrue(events.onCameraOpeningCalled);
     assertTrue(events.onFirstFrameAvailableCalled);
   }
 
   static public void cameraCallsAfterStop(
       VideoCapturerAndroid capturer, Context appContext) throws InterruptedException {
     final List<CaptureFormat> formats = capturer.getSupportedFormats();
     final CameraEnumerationAndroid.CaptureFormat format = formats.get(0);
 
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     final FakeCapturerObserver observer = new FakeCapturerObserver();
-    capturer.startCapture(format.width, format.height, format.maxFramerate,
+    capturer.startCapture(format.width, format.height, format.framerate.max,
         surfaceTextureHelper, appContext, observer);
     // Make sure camera is started and then stop it.
     assertTrue(observer.WaitForCapturerToStart());
     capturer.stopCapture();
     if (capturer.isCapturingToTexture()) {
       surfaceTextureHelper.returnTextureFrame();
     }
 
     // We can't change |capturer| at this point, but we should not crash.
     capturer.switchCamera(null);
@@ skipping 29 matching lines @@
 
   static public void startStopWithDifferentResolutions(VideoCapturerAndroid capturer,
       Context appContext) throws InterruptedException {
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     FakeCapturerObserver observer = new FakeCapturerObserver();
     List<CaptureFormat> formats = capturer.getSupportedFormats();
 
     for(int i = 0; i < 3 ; ++i) {
       CameraEnumerationAndroid.CaptureFormat format = formats.get(i);
-      capturer.startCapture(format.width, format.height, format.maxFramerate,
+      capturer.startCapture(format.width, format.height, format.framerate.max,
           surfaceTextureHelper, appContext, observer);
       assertTrue(observer.WaitForCapturerToStart());
       observer.WaitForNextCapturedFrame();
 
       // Check the frame size. The actual width and height depend on how the capturer is mounted.
       final boolean identicalResolution = (observer.frameWidth() == format.width
           &&  observer.frameHeight() == format.height);
       final boolean flippedResolution = (observer.frameWidth() == format.height
           && observer.frameHeight() == format.width);
       if (!identicalResolution && !flippedResolution) {
@@ skipping 28 matching lines @@
 
   static public void startWhileCameraIsAlreadyOpen(
       VideoCapturerAndroid capturer, Context appContext) throws InterruptedException {
     final List<CaptureFormat> formats = capturer.getSupportedFormats();
     final CameraEnumerationAndroid.CaptureFormat format = formats.get(0);
     Camera camera = Camera.open(capturer.getCurrentCameraId());
 
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     final FakeCapturerObserver observer = new FakeCapturerObserver();
-    capturer.startCapture(format.width, format.height, format.maxFramerate,
+    capturer.startCapture(format.width, format.height, format.framerate.max,
         surfaceTextureHelper, appContext, observer);
 
     if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.LOLLIPOP_MR1) {
       // The first opened camera client will be evicted.
       assertTrue(observer.WaitForCapturerToStart());
       capturer.stopCapture();
     } else {
       assertFalse(observer.WaitForCapturerToStart());
     }
 
     release(capturer);
     camera.release();
     surfaceTextureHelper.dispose();
   }
 
   static public void startWhileCameraIsAlreadyOpenAndCloseCamera(
       VideoCapturerAndroid capturer, Context appContext) throws InterruptedException {
     final List<CaptureFormat> formats = capturer.getSupportedFormats();
     final CameraEnumerationAndroid.CaptureFormat format = formats.get(0);
     Camera camera = Camera.open(capturer.getCurrentCameraId());
 
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     final FakeCapturerObserver observer = new FakeCapturerObserver();
-    capturer.startCapture(format.width, format.height, format.maxFramerate,
+    capturer.startCapture(format.width, format.height, format.framerate.max,
         surfaceTextureHelper, appContext, observer);
     waitUntilIdle(capturer);
 
     camera.release();
 
     // Make sure camera is started and first frame is received and then stop it.
     assertTrue(observer.WaitForCapturerToStart());
     observer.WaitForNextCapturedFrame();
     capturer.stopCapture();
     if (capturer.isCapturingToTexture()) {
       surfaceTextureHelper.returnTextureFrame();
     }
     release(capturer);
     surfaceTextureHelper.dispose();
   }
 
   static public void startWhileCameraIsAlreadyOpenAndStop(
       VideoCapturerAndroid capturer, Context appContext) throws InterruptedException {
     final List<CaptureFormat> formats = capturer.getSupportedFormats();
     final CameraEnumerationAndroid.CaptureFormat format = formats.get(0);
     Camera camera = Camera.open(capturer.getCurrentCameraId());
 
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     final FakeCapturerObserver observer = new FakeCapturerObserver();
-    capturer.startCapture(format.width, format.height, format.maxFramerate,
+    capturer.startCapture(format.width, format.height, format.framerate.max,
         surfaceTextureHelper, appContext, observer);
     capturer.stopCapture();
     release(capturer);
     camera.release();
     surfaceTextureHelper.dispose();
   }
 
   static public void returnBufferLate(VideoCapturerAndroid capturer,
       Context appContext) throws InterruptedException {
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     FakeCapturerObserver observer = new FakeCapturerObserver();
 
     List<CaptureFormat> formats = capturer.getSupportedFormats();
     CameraEnumerationAndroid.CaptureFormat format = formats.get(0);
-    capturer.startCapture(format.width, format.height, format.maxFramerate,
+    capturer.startCapture(format.width, format.height, format.framerate.max,
         surfaceTextureHelper, appContext, observer);
     assertTrue(observer.WaitForCapturerToStart());
 
     observer.WaitForNextCapturedFrame();
     capturer.stopCapture();
     List<Long> listOftimestamps = observer.getCopyAndResetListOftimeStamps();
     assertTrue(listOftimestamps.size() >= 1);
 
     format = formats.get(1);
-    capturer.startCapture(format.width, format.height, format.maxFramerate,
+    capturer.startCapture(format.width, format.height, format.framerate.max,
         surfaceTextureHelper, appContext, observer);
     observer.WaitForCapturerToStart();
     if (capturer.isCapturingToTexture()) {
       surfaceTextureHelper.returnTextureFrame();
     }
 
     observer.WaitForNextCapturedFrame();
     capturer.stopCapture();
 
     listOftimestamps = observer.getCopyAndResetListOftimeStamps();
@@ skipping 43 matching lines @@
       VideoCapturerAndroid capturer,
       CameraEvents events, Context appContext) throws InterruptedException {
     assertTrue("Not capturing to textures.", capturer.isCapturingToTexture());
 
     final List<CaptureFormat> formats = capturer.getSupportedFormats();
     final CameraEnumerationAndroid.CaptureFormat format = formats.get(0);
 
     final SurfaceTextureHelper surfaceTextureHelper = SurfaceTextureHelper.create(
         "SurfaceTextureHelper test" /* threadName */, null /* sharedContext */);
     final FakeCapturerObserver observer = new FakeCapturerObserver();
-    capturer.startCapture(format.width, format.height, format.maxFramerate,
+    capturer.startCapture(format.width, format.height, format.framerate.max,
         surfaceTextureHelper, appContext, observer);
     // Make sure camera is started.
     assertTrue(observer.WaitForCapturerToStart());
     // Since we don't return the buffer, we should get a starvation message if we are
     // capturing to a texture.
     assertEquals("Camera failure. Client must return video buffers.",
         events.WaitForCameraFreezed());
 
     capturer.stopCapture();
     if (capturer.isCapturingToTexture()) {
@@ skipping 36 matching lines @@
     source.stop();
     track.dispose();
     source.dispose();
     factory.dispose();
     assertTrue(capturer.isDisposed());
 
     assertTrue(gotExpectedResolution);
   }
 
 }