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

Side by Side Diff: webrtc/common_types.h

Issue 2529143002: Revert of Add H264 profile to webrtc::VideoCodecH264 and webrtc::VideoPayload (Closed)
Patch Set: Created 4 years 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 | « no previous file | webrtc/common_video/h264/profile_level_id.h » ('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 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 unsigned char numberOfTemporalLayers; 541 unsigned char numberOfTemporalLayers;
542 bool denoisingOn; 542 bool denoisingOn;
543 bool frameDroppingOn; 543 bool frameDroppingOn;
544 int keyFrameInterval; 544 int keyFrameInterval;
545 bool adaptiveQpMode; 545 bool adaptiveQpMode;
546 bool automaticResizeOn; 546 bool automaticResizeOn;
547 unsigned char numberOfSpatialLayers; 547 unsigned char numberOfSpatialLayers;
548 bool flexibleMode; 548 bool flexibleMode;
549 }; 549 };
550 550
551 // TODO(magjed): Move this and other H264 related classes out to their own file.
552 namespace H264 {
553
554 enum Profile {
555 kProfileConstrainedBaseline,
556 kProfileBaseline,
557 kProfileMain,
558 kProfileConstrainedHigh,
559 kProfileHigh,
560 };
561
562 } // namespace H264
563
564 // H264 specific. 551 // H264 specific.
565 struct VideoCodecH264 { 552 struct VideoCodecH264 {
566 bool frameDroppingOn; 553 bool frameDroppingOn;
567 int keyFrameInterval; 554 int keyFrameInterval;
568 // These are NULL/0 if not externally negotiated. 555 // These are NULL/0 if not externally negotiated.
569 const uint8_t* spsData; 556 const uint8_t* spsData;
570 size_t spsLen; 557 size_t spsLen;
571 const uint8_t* ppsData; 558 const uint8_t* ppsData;
572 size_t ppsLen; 559 size_t ppsLen;
573 H264::Profile profile;
574 }; 560 };
575 561
576 // Video codec types 562 // Video codec types
577 enum VideoCodecType { 563 enum VideoCodecType {
578 kVideoCodecVP8, 564 kVideoCodecVP8,
579 kVideoCodecVP9, 565 kVideoCodecVP9,
580 kVideoCodecH264, 566 kVideoCodecH264,
581 kVideoCodecI420, 567 kVideoCodecI420,
582 kVideoCodecRED, 568 kVideoCodecRED,
583 kVideoCodecULPFEC, 569 kVideoCodecULPFEC,
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
893 enum class RtcpMode { kOff, kCompound, kReducedSize }; 879 enum class RtcpMode { kOff, kCompound, kReducedSize };
894 880
895 enum NetworkState { 881 enum NetworkState {
896 kNetworkUp, 882 kNetworkUp,
897 kNetworkDown, 883 kNetworkDown,
898 }; 884 };
899 885
900 } // namespace webrtc 886 } // namespace webrtc
901 887
902 #endif // WEBRTC_COMMON_TYPES_H_ 888 #endif // WEBRTC_COMMON_TYPES_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/common_video/h264/profile_level_id.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698