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

Side by Side Diff: webrtc/common_types.h

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

Powered by Google App Engine
This is Rietveld 408576698