Add proper lifetime of encoder-specific settings.

webrtc/config.cc

 /*
  *  Copyright (c) 2014 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/config.h"
 
 #include <sstream>
 #include <string>
 
+#include "webrtc/base/checks.h"
+
 namespace webrtc {
 std::string NackConfig::ToString() const {
   std::stringstream ss;
   ss << "{rtp_history_ms: " << rtp_history_ms;
   ss << '}';
   return ss.str();
 }
 
 std::string FecConfig::ToString() const {
   std::stringstream ss;
@@ skipping 81 matching lines @@
       ss << ", ";
   }
   ss << ']';
 
   ss << '}';
   return ss.str();
 }
 
 VideoEncoderConfig::VideoEncoderConfig()
     : content_type(ContentType::kRealtimeVideo),
-      encoder_specific_settings(NULL),
+      encoder_specific_settings(nullptr),
       min_transmit_bitrate_bps(0),
       expect_encode_from_texture(false) {}
 
 VideoEncoderConfig::~VideoEncoderConfig() = default;
 
 std::string VideoEncoderConfig::ToString() const {
   std::stringstream ss;
 
   ss << "{streams: [";
   for (size_t i = 0; i < streams.size(); ++i) {
@@ skipping 12 matching lines @@
       break;
   }
   ss << ", encoder_specific_settings: ";
   ss << (encoder_specific_settings != NULL ? "(ptr)" : "NULL");
 
   ss << ", min_transmit_bitrate_bps: " << min_transmit_bitrate_bps;
   ss << '}';
   return ss.str();
 }
 
+void VideoEncoderConfig::EncoderSpecificSettings::FillEncoderSpecificSettings(
+    VideoCodec* codec) const {
+  if (codec->codecType == kVideoCodecH264) {
+    FillVideoCodecH264(&codec->codecSpecific.H264);
+  } else if (codec->codecType == kVideoCodecVP8) {
+    FillVideoCodecVp8(&codec->codecSpecific.VP8);
+  } else if (codec->codecType == kVideoCodecVP9) {
+    FillVideoCodecVp9(&codec->codecSpecific.VP9);
+  } else {
+    RTC_NOTREACHED() << "Encoder specifics set/used for unknown codec type.";
+  }
+}
+
+void VideoEncoderConfig::EncoderSpecificSettings::FillVideoCodecH264(
+    VideoCodecH264* h264_settings) const {
+  RTC_NOTREACHED();
+}
+
+void VideoEncoderConfig::EncoderSpecificSettings::FillVideoCodecVp8(
+    VideoCodecVP8* vp9_settings) const {

[mflodman, 2016/08/04 13:53:23]

s/vp9_settings/vp8_settings

[pbos-webrtc, 2016/08/08 20:42:21]

Done.

+  RTC_NOTREACHED();
+}
+
+void VideoEncoderConfig::EncoderSpecificSettings::FillVideoCodecVp9(
+    VideoCodecVP9* vp8_settings) const {

[mflodman, 2016/08/04 13:53:23]

s/vp8_settings/vp9_settings

[pbos-webrtc, 2016/08/08 20:42:21]

Done.

+  RTC_NOTREACHED();
+}
+
+VideoEncoderConfig::H264EncoderSpecificSettings::H264EncoderSpecificSettings(
+    const VideoCodecH264& specifics)
+    : specifics_(specifics) {}
+
+void VideoEncoderConfig::H264EncoderSpecificSettings::FillVideoCodecH264(
+    VideoCodecH264* h264_settings) const {
+  *h264_settings = specifics_;
+}
+
+VideoEncoderConfig::Vp8EncoderSpecificSettings::Vp8EncoderSpecificSettings(
+    const VideoCodecVP8& specifics)
+    : specifics_(specifics) {}
+
+void VideoEncoderConfig::Vp8EncoderSpecificSettings::FillVideoCodecVp8(
+    VideoCodecVP8* vp8_settings) const {
+  *vp8_settings = specifics_;
+}
+
+VideoEncoderConfig::Vp9EncoderSpecificSettings::Vp9EncoderSpecificSettings(
+    const VideoCodecVP9& specifics)
+    : specifics_(specifics) {}
+
+void VideoEncoderConfig::Vp9EncoderSpecificSettings::FillVideoCodecVp9(
+    VideoCodecVP9* vp9_settings) const {
+  *vp9_settings = specifics_;
+}
+
 }  // namespace webrtc