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

Side by Side Diff: webrtc/common_types.h

Issue 2337453002: H.264 packetization mode 0 (try 2) (Closed)
Patch Set: Addressed hbos comments 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
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 524 matching lines...) Expand 10 before | Expand all | Expand 10 after
535 bool denoisingOn; 535 bool denoisingOn;
536 bool frameDroppingOn; 536 bool frameDroppingOn;
537 int keyFrameInterval; 537 int keyFrameInterval;
538 bool adaptiveQpMode; 538 bool adaptiveQpMode;
539 bool automaticResizeOn; 539 bool automaticResizeOn;
540 unsigned char numberOfSpatialLayers; 540 unsigned char numberOfSpatialLayers;
541 bool flexibleMode; 541 bool flexibleMode;
542 }; 542 };
543 543
544 // H264 specific. 544 // H264 specific.
545 enum H264PacketizationMode {
546 // Because VideoCodecH264 was initialized in multiple places using memset,
547 // we let 0 have the meaning of "not set".
548 kH264PacketizationModeNotSet = 0,
549 kH264PacketizationMode0, // Only single NALU allowed
550 kH264PacketizationMode1 // Non-interleaved - STAP-A, FU-A is allowed
551 };
552
545 struct VideoCodecH264 { 553 struct VideoCodecH264 {
546 VideoCodecProfile profile; 554 VideoCodecProfile profile;
547 bool frameDroppingOn; 555 bool frameDroppingOn;
548 int keyFrameInterval; 556 int keyFrameInterval;
557 H264PacketizationMode packetization_mode;
549 // These are NULL/0 if not externally negotiated. 558 // These are NULL/0 if not externally negotiated.
550 const uint8_t* spsData; 559 const uint8_t* spsData;
551 size_t spsLen; 560 size_t spsLen;
552 const uint8_t* ppsData; 561 const uint8_t* ppsData;
553 size_t ppsLen; 562 size_t ppsLen;
554 }; 563 };
555 564
556 // Video codec types 565 // Video codec types
557 enum VideoCodecType { 566 enum VideoCodecType {
558 kVideoCodecVP8, 567 kVideoCodecVP8,
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 enum class RtcpMode { kOff, kCompound, kReducedSize }; 849 enum class RtcpMode { kOff, kCompound, kReducedSize };
841 850
842 enum NetworkState { 851 enum NetworkState {
843 kNetworkUp, 852 kNetworkUp,
844 kNetworkDown, 853 kNetworkDown,
845 }; 854 };
846 855
847 } // namespace webrtc 856 } // namespace webrtc
848 857
849 #endif // WEBRTC_COMMON_TYPES_H_ 858 #endif // WEBRTC_COMMON_TYPES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698