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

Side by Side Diff: webrtc/common_types.h

Issue 2508853002: Reland of Declare VideoCodec.codec_specific_info private (Closed)
Patch Set: Rebase 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 619 matching lines...) Expand 10 before | Expand all | Expand 10 after
630 // There is a const version of each that returns a reference, 630 // There is a const version of each that returns a reference,
631 // and a non-const version that returns a pointer, in order 631 // and a non-const version that returns a pointer, in order
632 // to allow modification of the parameters. 632 // to allow modification of the parameters.
633 VideoCodecVP8* VP8(); 633 VideoCodecVP8* VP8();
634 const VideoCodecVP8& VP8() const; 634 const VideoCodecVP8& VP8() const;
635 VideoCodecVP9* VP9(); 635 VideoCodecVP9* VP9();
636 const VideoCodecVP9& VP9() const; 636 const VideoCodecVP9& VP9() const;
637 VideoCodecH264* H264(); 637 VideoCodecH264* H264();
638 const VideoCodecH264& H264() const; 638 const VideoCodecH264& H264() const;
639 639
640 // This variable will be declared private and renamed to codec_specific_ 640 private:
641 // once Chromium is not accessing it.
642 // TODO(hta): Consider replacing the union with a pointer type. 641 // TODO(hta): Consider replacing the union with a pointer type.
643 // This will allow removing the VideoCodec* types from this file. 642 // This will allow removing the VideoCodec* types from this file.
644 VideoCodecUnion codecSpecific; 643 VideoCodecUnion codec_specific_;
645 }; 644 };
646 645
647 class BitrateAllocation { 646 class BitrateAllocation {
648 public: 647 public:
649 static const uint32_t kMaxBitrateBps; 648 static const uint32_t kMaxBitrateBps;
650 BitrateAllocation(); 649 BitrateAllocation();
651 650
652 bool SetBitrate(size_t spatial_index, 651 bool SetBitrate(size_t spatial_index,
653 size_t temporal_index, 652 size_t temporal_index,
654 uint32_t bitrate_bps); 653 uint32_t bitrate_bps);
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
872 enum class RtcpMode { kOff, kCompound, kReducedSize }; 871 enum class RtcpMode { kOff, kCompound, kReducedSize };
873 872
874 enum NetworkState { 873 enum NetworkState {
875 kNetworkUp, 874 kNetworkUp,
876 kNetworkDown, 875 kNetworkDown,
877 }; 876 };
878 877
879 } // namespace webrtc 878 } // namespace webrtc
880 879
881 #endif // WEBRTC_COMMON_TYPES_H_ 880 #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