Refactoring: Hide VideoCodec.codecSpecific as "private"

webrtc/common_types.h

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 575 matching lines @@
 struct SpatialLayer {
   int scaling_factor_num;
   int scaling_factor_den;
   int target_bitrate_bps;
   // TODO(ivica): Add max_quantizer and min_quantizer?
 };
 
 enum VideoCodecMode { kRealtimeVideo, kScreensharing };
 
 // Common video codec properties
-struct VideoCodec {
+class VideoCodec {
+ public:
+  VideoCodec();
+
+  // Public variables. TODO(hta): Make them private with accessors.
   VideoCodecType codecType;
   char plName[kPayloadNameSize];
   unsigned char plType;
 
   unsigned short width;
   unsigned short height;
 
   unsigned int startBitrate;   // kilobits/sec.
   unsigned int maxBitrate;     // kilobits/sec.
   unsigned int minBitrate;     // kilobits/sec.
   unsigned int targetBitrate;  // kilobits/sec.
 
   unsigned char maxFramerate;
 
-  VideoCodecUnion codecSpecific;
-
   unsigned int qpMax;
   unsigned char numberOfSimulcastStreams;
   SimulcastStream simulcastStream[kMaxSimulcastStreams];
   SpatialLayer spatialLayers[kMaxSpatialLayers];
 
   VideoCodecMode mode;
   bool expect_encode_from_texture;
 
   bool operator==(const VideoCodec& other) const = delete;
   bool operator!=(const VideoCodec& other) const = delete;
+
+  // Accessors for codec specific information.
+  // There is a const version of each that returns a reference,
+  // and a non-const version that returns a pointer, in order
+  // to allow modification of the parameters.
+  VideoCodecVP8* VP8();
+  const VideoCodecVP8& VP8() const;
+  VideoCodecVP9* VP9();
+  const VideoCodecVP9& VP9() const;
+  VideoCodecH264* H264();
+  const VideoCodecH264& H264() const;
+
+  // This variable will be declared private and renamed to codec_specific_
+  // once Chromium is not accessing it.
+  // TODO(hta): Consider replacing the union with a pointer type.
+  // This will allow removing the VideoCodec* types from this file.
+  VideoCodecUnion codecSpecific;
 };
 
 // Bandwidth over-use detector options.  These are used to drive
 // experimentation with bandwidth estimation parameters.
 // See modules/remote_bitrate_estimator/overuse_detector.h
 struct OverUseDetectorOptions {
   OverUseDetectorOptions()
       : initial_slope(8.0 / 512.0),
         initial_offset(0),
         initial_e(),
@@ skipping 188 matching lines @@
 enum class RtcpMode { kOff, kCompound, kReducedSize };
 
 enum NetworkState {
   kNetworkUp,
   kNetworkDown,
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_COMMON_TYPES_H_