Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: webrtc/common_types.h

Issue 2491933002: Revert of Declare VideoCodec.codec_specific_info private (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/api/android/jni/androidmediaencoder_jni.cc ('k') | webrtc/common_types.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 // There is a const version of each that returns a reference, 625 // There is a const version of each that returns a reference,
626 // and a non-const version that returns a pointer, in order 626 // and a non-const version that returns a pointer, in order
627 // to allow modification of the parameters. 627 // to allow modification of the parameters.
628 VideoCodecVP8* VP8(); 628 VideoCodecVP8* VP8();
629 const VideoCodecVP8& VP8() const; 629 const VideoCodecVP8& VP8() const;
630 VideoCodecVP9* VP9(); 630 VideoCodecVP9* VP9();
631 const VideoCodecVP9& VP9() const; 631 const VideoCodecVP9& VP9() const;
632 VideoCodecH264* H264(); 632 VideoCodecH264* H264();
633 const VideoCodecH264& H264() const; 633 const VideoCodecH264& H264() const;
634 634
635 private: 635 // This variable will be declared private and renamed to codec_specific_
636 // once Chromium is not accessing it.
636 // TODO(hta): Consider replacing the union with a pointer type. 637 // TODO(hta): Consider replacing the union with a pointer type.
637 // This will allow removing the VideoCodec* types from this file. 638 // This will allow removing the VideoCodec* types from this file.
638 VideoCodecUnion codec_specific_; 639 VideoCodecUnion codecSpecific;
639 }; 640 };
640 641
641 // Bandwidth over-use detector options. These are used to drive 642 // Bandwidth over-use detector options. These are used to drive
642 // experimentation with bandwidth estimation parameters. 643 // experimentation with bandwidth estimation parameters.
643 // See modules/remote_bitrate_estimator/overuse_detector.h 644 // See modules/remote_bitrate_estimator/overuse_detector.h
644 struct OverUseDetectorOptions { 645 struct OverUseDetectorOptions {
645 OverUseDetectorOptions() 646 OverUseDetectorOptions()
646 : initial_slope(8.0 / 512.0), 647 : initial_slope(8.0 / 512.0),
647 initial_offset(0), 648 initial_offset(0),
648 initial_e(), 649 initial_e(),
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
837 enum class RtcpMode { kOff, kCompound, kReducedSize }; 838 enum class RtcpMode { kOff, kCompound, kReducedSize };
838 839
839 enum NetworkState { 840 enum NetworkState {
840 kNetworkUp, 841 kNetworkUp,
841 kNetworkDown, 842 kNetworkDown,
842 }; 843 };
843 844
844 } // namespace webrtc 845 } // namespace webrtc
845 846
846 #endif // WEBRTC_COMMON_TYPES_H_ 847 #endif // WEBRTC_COMMON_TYPES_H_
OLDNEW
« no previous file with comments | « webrtc/api/android/jni/androidmediaencoder_jni.cc ('k') | webrtc/common_types.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698