Add decoder-specific settings with proper lifetime.

webrtc/config.h

 /*
  *  Copyright (c) 2013 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.
  */
 
 // TODO(pbos): Move Config from common.h to here.
 
 #ifndef WEBRTC_CONFIG_H_
 #define WEBRTC_CONFIG_H_
 
 #include <string>
 #include <vector>
 
+#include "webrtc/base/optional.h"
+#include "webrtc/base/refcount.h"
+#include "webrtc/base/scoped_ref_ptr.h"

[sprang_webrtc, 2016/07/27 08:37:25]

Not sure what the current policy is regarding importing utility classes into the
base api, as doing that may result in changes to those utilities breaking
external applications. Especially worried about scoped_ref_ptr. Would've been
nice with more support for stl here :/

 #include "webrtc/common.h"
 #include "webrtc/common_types.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
 
 // Settings for NACK, see RFC 4585 for details.
 struct NackConfig {
   NackConfig() : rtp_history_ms(0) {}
   std::string ToString() const;
@@ skipping 110 matching lines @@
   void* encoder_specific_settings;
 
   // Padding will be used up to this bitrate regardless of the bitrate produced
   // by the encoder. Padding above what's actually produced by the encoder helps
   // maintaining a higher bitrate estimate. Padding will however not be sent
   // unless the estimated bandwidth indicates that the link can handle it.
   int min_transmit_bitrate_bps;
   bool expect_encode_from_texture;
 };
 
+struct VideoDecoderH264extraSettings {
+  std::string spropParameterSets;
+};
+
+// These are reference counted to permit copying VideoDecoderConfig and be
+// kept alive until all decoder_specific_settings go out of scope.
+//
+class DecoderSpecificSettings : public rtc::RefCountInterface {
+ public:
+  virtual ~DecoderSpecificSettings() {}
+  rtc::Optional<VideoDecoderH264extraSettings> h264_extra_settings;
+  // vp8_extra_settings, and vp9_extra_settings will be added when required
+};

[sprang_webrtc, 2016/07/27 08:37:25]

If we're using an Optional for each codec, I'm not sure we really need the
refcounting (assuming copyable extras)?

+
 // Controls the capacity of the packet buffer in NetEq. The capacity is the
 // maximum number of packets that the buffer can contain. If the limit is
 // exceeded, the buffer will be flushed. The capacity does not affect the actual
 // audio delay in the general case, since this is governed by the target buffer
 // level (calculated from the jitter profile). It is only in the rare case of
 // severe network freezes that a higher capacity will lead to a (transient)
 // increase in audio delay.
 struct NetEqCapacityConfig {
   NetEqCapacityConfig() : enabled(false), capacity(0) {}
   explicit NetEqCapacityConfig(int value) : enabled(true), capacity(value) {}
@@ skipping 12 matching lines @@
 struct VoicePacing {
   VoicePacing() : enabled(false) {}
   explicit VoicePacing(bool value) : enabled(value) {}
   static const ConfigOptionID identifier = ConfigOptionID::kVoicePacing;
   bool enabled;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_CONFIG_H_