(Auto)update libjingle 74873066-> 74873164

git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7089 4adac7df-926f-26a2-2b94-8c16560cd09d

7 files changed, 30 insertions, 0 deletions

diff --git a/media/base/fakemediaengine.h b/media/base/fakemediaengine.h
index 8963aa7..a6eabef 100644
--- a/media/base/fakemediaengine.h
+++ b/media/base/fakemediaengine.h
@@ -930,6 +930,10 @@ class FakeVideoEngine : public FakeBaseEngine {
     capture_ = capture;
     return true;
   }
+  VideoFormat GetStartCaptureFormat() const {
+    return VideoFormat(640, 480, cricket::VideoFormat::FpsToInterval(30),
+                       FOURCC_I420);
+  }
 
   sigslot::repeater2<VideoCapturer*, CaptureState> SignalCaptureStateChange;
 
diff --git a/media/base/filemediaengine.h b/media/base/filemediaengine.h
index ad6c938..981e945 100644
--- a/media/base/filemediaengine.h
+++ b/media/base/filemediaengine.h
@@ -150,6 +150,9 @@ class FileMediaEngine : public MediaEngineInterface {
                                         MediaProcessorDirection direction) {
     return true;
   }
+  VideoFormat GetStartCaptureFormat() const {
+    return VideoFormat();
+  }
 
   virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
       SignalVideoCaptureStateChange() {
diff --git a/media/base/mediaengine.h b/media/base/mediaengine.h
index 9daa05d..25f7eb3 100644
--- a/media/base/mediaengine.h
+++ b/media/base/mediaengine.h
@@ -147,6 +147,8 @@ class MediaEngineInterface {
                                         VoiceProcessor* video_processor,
                                         MediaProcessorDirection direction) = 0;
 
+  virtual VideoFormat GetStartCaptureFormat() const = 0;
+
   virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
       SignalVideoCaptureStateChange() = 0;
 };
@@ -276,6 +278,9 @@ class CompositeMediaEngine : public MediaEngineInterface {
                                         MediaProcessorDirection direction) {
     return voice_.UnregisterProcessor(ssrc, processor, direction);
   }
+  virtual VideoFormat GetStartCaptureFormat() const {
+    return video_.GetStartCaptureFormat();
+  }
   virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
       SignalVideoCaptureStateChange() {
     return signal_state_change_;
@@ -356,6 +361,7 @@ class NullVideoEngine {
     return rtp_header_extensions_;
   }
   void SetLogging(int min_sev, const char* filter) {}
+  VideoFormat GetStartCaptureFormat() const { return VideoFormat(); }
 
   sigslot::signal2<VideoCapturer*, CaptureState> SignalCaptureStateChange;
  private:
diff --git a/media/webrtc/webrtcmediaengine.h b/media/webrtc/webrtcmediaengine.h
index 1700878..2a8c66c 100644
--- a/media/webrtc/webrtcmediaengine.h
+++ b/media/webrtc/webrtcmediaengine.h
@@ -185,6 +185,9 @@ class DelegatingWebRtcMediaEngine : public cricket::MediaEngineInterface {
     return delegate_->UnregisterVoiceProcessor(ssrc, video_processor,
         direction);
   }
+  virtual VideoFormat GetStartCaptureFormat() const OVERRIDE {
+    return delegate_->GetStartCaptureFormat();
+  }
   virtual sigslot::repeater2<VideoCapturer*, CaptureState>&
       SignalVideoCaptureStateChange() {
     return delegate_->SignalVideoCaptureStateChange();
diff --git a/media/webrtc/webrtcvideoengine.h b/media/webrtc/webrtcvideoengine.h
index b6c37af..4e41809 100644
--- a/media/webrtc/webrtcvideoengine.h
+++ b/media/webrtc/webrtcvideoengine.h
@@ -169,6 +169,8 @@ class WebRtcVideoEngine : public sigslot::has_slots<>,
   bool ShouldIgnoreTrace(const std::string& trace);
   int GetNumOfChannels();
 
+  VideoFormat GetStartCaptureFormat() const { return default_codec_format_; }
+
   rtc::CpuMonitor* cpu_monitor() { return cpu_monitor_.get(); }
 
  protected:
diff --git a/media/webrtc/webrtcvideoengine2.cc b/media/webrtc/webrtcvideoengine2.cc
index d63e8f4..44c1bf8 100644
--- a/media/webrtc/webrtcvideoengine2.cc
+++ b/media/webrtc/webrtcvideoengine2.cc
@@ -286,6 +286,10 @@ WebRtcVideoEngine2::WebRtcVideoEngine2()
     : worker_thread_(NULL),
       voice_engine_(NULL),
       video_codecs_(DefaultVideoCodecs()),
+      default_codec_format_(kDefaultVideoCodecPref.width,
+                            kDefaultVideoCodecPref.height,
+                            FPS_TO_INTERVAL(kDefaultFramerate),
+                            FOURCC_ANY),
       initialized_(false),
       cpu_monitor_(new rtc::CpuMonitor(NULL)),
       channel_factory_(NULL) {
@@ -354,6 +358,11 @@ bool WebRtcVideoEngine2::SetDefaultEncoderConfig(
     return false;
   }
 
+  default_codec_format_ =
+      VideoFormat(codec.width,
+                  codec.height,
+                  VideoFormat::FpsToInterval(codec.framerate),
+                  FOURCC_ANY);
   video_codecs_.clear();
   video_codecs_.push_back(codec);
   return true;
diff --git a/media/webrtc/webrtcvideoengine2.h b/media/webrtc/webrtcvideoengine2.h
index ab644d0..d77afb9 100644
--- a/media/webrtc/webrtcvideoengine2.h
+++ b/media/webrtc/webrtcvideoengine2.h
@@ -168,6 +168,8 @@ class WebRtcVideoEngine2 : public sigslot::has_slots<> {
   // Check whether the supplied trace should be ignored.
   bool ShouldIgnoreTrace(const std::string& trace);
 
+  VideoFormat GetStartCaptureFormat() const { return default_codec_format_; }
+
   rtc::CpuMonitor* cpu_monitor() { return cpu_monitor_.get(); }
 
   virtual WebRtcVideoEncoderFactory2* GetVideoEncoderFactory();
@@ -177,6 +179,7 @@ class WebRtcVideoEngine2 : public sigslot::has_slots<> {
   WebRtcVoiceEngine* voice_engine_;
   std::vector<VideoCodec> video_codecs_;
   std::vector<RtpHeaderExtension> rtp_header_extensions_;
+  VideoFormat default_codec_format_;
 
   bool initialized_;