AndroidVideoCapturer getSupportedFormats(): Change interface from JSON string to List/vector

webrtc/api/androidvideocapturer.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.
  */
 
 #include "webrtc/api/androidvideocapturer.h"
 
 #include "webrtc/api/java/jni/native_handle_impl.h"
 #include "webrtc/base/common.h"
-#include "webrtc/base/json.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/media/engine/webrtcvideoframe.h"
 
 namespace webrtc {
 
 // A hack for avoiding deep frame copies in
 // cricket::VideoCapturer.SignalFrameCaptured() using a custom FrameFactory.
 // A frame is injected using UpdateCapturedFrame(), and converted into a
 // cricket::VideoFrame with CreateAliasedFrame(). UpdateCapturedFrame() should
 // be called before CreateAliasedFrame() for every frame.
@@ skipping 86 matching lines @@
   rtc::scoped_refptr<AndroidVideoCapturerDelegate> delegate_;
 };
 
 AndroidVideoCapturer::AndroidVideoCapturer(
     const rtc::scoped_refptr<AndroidVideoCapturerDelegate>& delegate)
     : running_(false),
       delegate_(delegate),
       frame_factory_(NULL),
       current_state_(cricket::CS_STOPPED) {
   thread_checker_.DetachFromThread();
-  std::string json_string = delegate_->GetSupportedFormats();
-  LOG(LS_INFO) << json_string;
-
-  Json::Value json_values;
-  Json::Reader reader(Json::Features::strictMode());
-  if (!reader.parse(json_string, json_values)) {
-    LOG(LS_ERROR) << "Failed to parse formats.";
-  }
-
-  std::vector<cricket::VideoFormat> formats;
-  for (Json::ArrayIndex i = 0; i < json_values.size(); ++i) {
-      const Json::Value& json_value = json_values[i];
-      RTC_CHECK(!json_value["width"].isNull() &&
-                !json_value["height"].isNull() &&
-                !json_value["framerate"].isNull());
-      cricket::VideoFormat format(
-          json_value["width"].asInt(),
-          json_value["height"].asInt(),
-          cricket::VideoFormat::FpsToInterval(json_value["framerate"].asInt()),
-          cricket::FOURCC_YV12);
-      formats.push_back(format);
+  const std::vector<cricket::VideoFormat> formats =
+      delegate_->GetSupportedFormats();
+  LOG(LS_INFO) << formats.size() << " supported formats: ";

[perkj_webrtc, 2016/02/16 14:35:41]

is this logged in Java- if so - remove from here.

[magjed_webrtc, 2016/02/18 10:43:35]

Done, but this will be a change from current code.

+  for (const cricket::VideoFormat& format : formats) {
+    LOG(LS_INFO) << format.width << "x" << format.height << "@"
+                 << format.framerate();
   }
   SetSupportedFormats(formats);
 }
 
 AndroidVideoCapturer::~AndroidVideoCapturer() {
   RTC_CHECK(!running_);
 }
 
 cricket::CaptureState AndroidVideoCapturer::Start(
     const cricket::VideoFormat& capture_format) {
@@ skipping 71 matching lines @@
 
 bool AndroidVideoCapturer::GetBestCaptureFormat(
     const cricket::VideoFormat& desired,
     cricket::VideoFormat* best_format) {
   // Delegate this choice to VideoCapturer.startCapture().
   *best_format = desired;
   return true;
 }
 
 }  // namespace webrtc