Revert of Android: Add FramerateRange class

webrtc/api/java/jni/androidvideocapturer_jni.cc

 /*
  *  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.
  */
 
@@ skipping 116 matching lines @@
   jobject j_list_of_formats = jni->CallObjectMethod(
       *j_video_capturer_,
       GetMethodID(jni, *j_video_capturer_class_, "getSupportedFormats",
                   "()Ljava/util/List;"));
   CHECK_EXCEPTION(jni) << "error during getSupportedFormats";
 
   // Extract Java List<CaptureFormat> to std::vector<cricket::VideoFormat>.
   jclass j_list_class = jni->FindClass("java/util/List");
   jclass j_format_class =
       jni->FindClass("org/webrtc/CameraEnumerationAndroid$CaptureFormat");
-  jclass j_framerate_class = jni->FindClass(
-      "org/webrtc/CameraEnumerationAndroid$CaptureFormat$FramerateRange");
   const int size = jni->CallIntMethod(
       j_list_of_formats, GetMethodID(jni, j_list_class, "size", "()I"));
   jmethodID j_get =
       GetMethodID(jni, j_list_class, "get", "(I)Ljava/lang/Object;");
-  jfieldID j_framerate_field = GetFieldID(
-      jni, j_format_class, "framerate",
-      "org/webrtc/CameraEnumerationAndroid$CaptureFormat$FramerateRange");
   jfieldID j_width_field = GetFieldID(jni, j_format_class, "width", "I");
   jfieldID j_height_field = GetFieldID(jni, j_format_class, "height", "I");
   jfieldID j_max_framerate_field =
-      GetFieldID(jni, j_framerate_class, "max", "I");
+      GetFieldID(jni, j_format_class, "maxFramerate", "I");
 
   std::vector<cricket::VideoFormat> formats;
   formats.reserve(size);
   for (int i = 0; i < size; ++i) {
     jobject j_format = jni->CallObjectMethod(j_list_of_formats, j_get, i);
-    jobject j_framerate = GetObjectField(jni, j_format, j_framerate_field);
     const int frame_interval = cricket::VideoFormat::FpsToInterval(
-        (GetIntField(jni, j_framerate, j_max_framerate_field) + 999) / 1000);
+        (GetIntField(jni, j_format, j_max_framerate_field) + 999) / 1000);
     formats.emplace_back(GetIntField(jni, j_format, j_width_field),
                          GetIntField(jni, j_format, j_height_field),
                          frame_interval, cricket::FOURCC_NV21);
   }
   CHECK_EXCEPTION(jni) << "error while extracting formats";
   return formats;
 }
 
 void AndroidVideoCapturerJni::OnCapturerStarted(bool success) {
   LOG(LS_INFO) << "AndroidVideoCapturerJni capture started: " << success;
@@ skipping 172 matching lines @@
 
 JOW(void, VideoCapturer_00024NativeObserver_nativeOnOutputFormatRequest)
     (JNIEnv* jni, jclass, jlong j_capturer, jint j_width, jint j_height,
         jint j_fps) {
   LOG(LS_INFO) << "NativeObserver_nativeOnOutputFormatRequest";
   reinterpret_cast<AndroidVideoCapturerJni*>(j_capturer)->OnOutputFormatRequest(
       j_width, j_height, j_fps);
 }
 
 }  // namespace webrtc_jni