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

Side by Side Diff: webrtc/common_types.h

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