AndroidVideoCapturer: Delegate framerate choice to VideoCapturerAndroid.java

talk/app/webrtc/androidvideocapturer.cc

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 119 matching lines @@
   }
   SetSupportedFormats(formats);
 }
 
 AndroidVideoCapturer::~AndroidVideoCapturer() {
   CHECK(!running_);
 }
 
 cricket::CaptureState AndroidVideoCapturer::Start(
     const cricket::VideoFormat& capture_format) {
-  LOG(LS_INFO) << " AndroidVideoCapturer::Start w = " << capture_format.width
-               << " h = " << capture_format.height;
   CHECK(thread_checker_.CalledOnValidThread());
   CHECK(!running_);
+  const int fps = cricket::VideoFormat::IntervalToFps(capture_format.interval);
+  LOG(LS_INFO) << " AndroidVideoCapturer::Start " << capture_format.width << "x"
+               << capture_format.height << "@" << fps;
 
   frame_factory_ = new AndroidVideoCapturer::FrameFactory(delegate_.get());
   set_frame_factory(frame_factory_);
 
   running_ = true;
-  delegate_->Start(
-      capture_format.width, capture_format.height,
-      cricket::VideoFormat::IntervalToFps(capture_format.interval), this);
+  delegate_->Start(capture_format.width, capture_format.height, fps, this);
   SetCaptureFormat(&capture_format);
   current_state_ = cricket::CS_STARTING;
   return current_state_;
 }
 
 void AndroidVideoCapturer::Stop() {
   LOG(LS_INFO) << " AndroidVideoCapturer::Stop ";
   CHECK(thread_checker_.CalledOnValidThread());
   CHECK(running_);
   running_ = false;
@@ skipping 41 matching lines @@
 
 void AndroidVideoCapturer::OnOutputFormatRequest(
     int width, int height, int fps) {
   CHECK(thread_checker_.CalledOnValidThread());
   const cricket::VideoFormat& current = video_adapter()->output_format();
   cricket::VideoFormat format(
       width, height, cricket::VideoFormat::FpsToInterval(fps), current.fourcc);
   video_adapter()->OnOutputFormatRequest(format);
 }
 
+bool AndroidVideoCapturer::GetBestCaptureFormat(
+    const cricket::VideoFormat& desired,
+    cricket::VideoFormat* best_format) {
+  // Delegate this choice to VideoCapturerAndroid.startCapture().
+  *best_format = desired;
+  return true;
+}
+
 }  // namespace webrtc