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

Side by Side Diff: webrtc/common_types.h

Issue 2300323002: Revert of Ignore Camera and Flip bits in CVO when parsing video rotation (Closed)
Patch Set: Created 4 years, 3 months 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/DEPS ('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
11 #ifndef WEBRTC_COMMON_TYPES_H_ 11 #ifndef WEBRTC_COMMON_TYPES_H_
12 #define WEBRTC_COMMON_TYPES_H_ 12 #define WEBRTC_COMMON_TYPES_H_
13 13
14 #include <assert.h> 14 #include <assert.h>
15 #include <stddef.h> 15 #include <stddef.h>
16 #include <string.h> 16 #include <string.h>
17 17
18 #include <string> 18 #include <string>
19 #include <vector> 19 #include <vector>
20 20
21 #include "webrtc/common_video/rotation.h"
22 #include "webrtc/typedefs.h" 21 #include "webrtc/typedefs.h"
23 22
24 #if defined(_MSC_VER) 23 #if defined(_MSC_VER)
25 // Disable "new behavior: elements of array will be default initialized" 24 // Disable "new behavior: elements of array will be default initialized"
26 // warning. Affects OverUseDetectorOptions. 25 // warning. Affects OverUseDetectorOptions.
27 #pragma warning(disable:4351) 26 #pragma warning(disable:4351)
28 #endif 27 #endif
29 28
30 #ifdef WEBRTC_EXPORT 29 #ifdef WEBRTC_EXPORT
31 #define WEBRTC_DLLEXPORT _declspec(dllexport) 30 #define WEBRTC_DLLEXPORT _declspec(dllexport)
(...skipping 690 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 // Audio Level includes both level in dBov and voiced/unvoiced bit. See: 721 // Audio Level includes both level in dBov and voiced/unvoiced bit. See:
723 // https://datatracker.ietf.org/doc/draft-lennox-avt-rtp-audio-level-exthdr/ 722 // https://datatracker.ietf.org/doc/draft-lennox-avt-rtp-audio-level-exthdr/
724 bool hasAudioLevel; 723 bool hasAudioLevel;
725 bool voiceActivity; 724 bool voiceActivity;
726 uint8_t audioLevel; 725 uint8_t audioLevel;
727 726
728 // For Coordination of Video Orientation. See 727 // For Coordination of Video Orientation. See
729 // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/ 728 // http://www.etsi.org/deliver/etsi_ts/126100_126199/126114/12.07.00_60/
730 // ts_126114v120700p.pdf 729 // ts_126114v120700p.pdf
731 bool hasVideoRotation; 730 bool hasVideoRotation;
732 VideoRotation videoRotation; 731 uint8_t videoRotation;
733 732
734 PlayoutDelay playout_delay = {-1, -1}; 733 PlayoutDelay playout_delay = {-1, -1};
735 }; 734 };
736 735
737 struct RTPHeader { 736 struct RTPHeader {
738 RTPHeader(); 737 RTPHeader();
739 738
740 bool markerBit; 739 bool markerBit;
741 uint8_t payloadType; 740 uint8_t payloadType;
742 uint16_t sequenceNumber; 741 uint16_t sequenceNumber;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
853 enum class RtcpMode { kOff, kCompound, kReducedSize }; 852 enum class RtcpMode { kOff, kCompound, kReducedSize };
854 853
855 enum NetworkState { 854 enum NetworkState {
856 kNetworkUp, 855 kNetworkUp,
857 kNetworkDown, 856 kNetworkDown,
858 }; 857 };
859 858
860 } // namespace webrtc 859 } // namespace webrtc
861 860
862 #endif // WEBRTC_COMMON_TYPES_H_ 861 #endif // WEBRTC_COMMON_TYPES_H_
OLDNEW
« no previous file with comments | « webrtc/DEPS ('k') | webrtc/common_types.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698