Avoid unnecessary HW video encoder reconfiguration

webrtc/media/engine/webrtcvideoengine2.h

Index: webrtc/media/engine/webrtcvideoengine2.h
diff --git a/webrtc/media/engine/webrtcvideoengine2.h b/webrtc/media/engine/webrtcvideoengine2.h
index 4c402d4256f1879763267283b1f090e857ac21ff..61bc3cda02abba4f782e851f5afe5a96072b4508 100644
--- a/webrtc/media/engine/webrtcvideoengine2.h
+++ b/webrtc/media/engine/webrtcvideoengine2.h
@@ -254,7 +254,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
         bool enable_cpu_overuse_detection,
         int max_bitrate_bps,
         const rtc::Optional<VideoCodecSettings>& codec_settings,
-        const std::vector<webrtc::RtpExtension>& rtp_extensions,
+        const rtc::Optional<std::vector<webrtc::RtpExtension>>& rtp_extensions,
         const VideoSendParameters& send_params);
     virtual ~WebRtcVideoSendStream();
 
@@ -332,7 +332,8 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
         const VideoCodec& codec,
         const VideoOptions& options,
         int max_bitrate_bps,
-        size_t num_streams);
+        size_t num_streams,
+        bool encode_from_texture);
     static std::vector<webrtc::VideoStream> CreateSimulcastVideoStreams(
         const VideoCodec& codec,
         const VideoOptions& options,
@@ -351,9 +352,9 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
     void RecreateWebRtcStream() EXCLUSIVE_LOCKS_REQUIRED(lock_);
     webrtc::VideoEncoderConfig CreateVideoEncoderConfig(
         const Dimensions& dimensions,
+        bool encode_from_texture,
         const VideoCodec& codec) const EXCLUSIVE_LOCKS_REQUIRED(lock_);
-    void SetDimensions(int width, int height)
-        EXCLUSIVE_LOCKS_REQUIRED(lock_);
+    void ReconfigureEncoderIfNecessary() EXCLUSIVE_LOCKS_REQUIRED(lock_);
     bool ValidateRtpParameters(const webrtc::RtpParameters& parameters);
 
     // Calls Start or Stop according to whether or not |sending_| is true,
@@ -395,6 +396,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
     Dimensions last_dimensions_ GUARDED_BY(lock_);
     webrtc::VideoRotation last_rotation_ GUARDED_BY(lock_) =
         webrtc::kVideoRotation_0;
+    bool last_frame_in_texture_ GUARDED_BY(lock_) = false;

[perkj_webrtc, 2016/06/15 11:31:29]

last_frame_is_texture_ ?

[skvlad, 2016/06/15 19:44:34]

Done.

 
     bool sending_ GUARDED_BY(lock_);
 
@@ -538,7 +540,7 @@ class WebRtcVideoChannel2 : public VideoMediaChannel, public webrtc::Transport {
   std::set<uint32_t> receive_ssrcs_ GUARDED_BY(stream_crit_);
 
   rtc::Optional<VideoCodecSettings> send_codec_;
-  std::vector<webrtc::RtpExtension> send_rtp_extensions_;
+  rtc::Optional<std::vector<webrtc::RtpExtension>> send_rtp_extensions_;
 
   WebRtcVideoEncoderFactory* const external_encoder_factory_;
   WebRtcVideoDecoderFactory* const external_decoder_factory_;