Revert of Ignore Camera and Flip bits in CVO when parsing video rotation

webrtc/modules/rtp_rtcp/source/rtp_utility.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_utility.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
index 7dd59736fd044d855d0ae11ed146bd327c948e7f..e38b3a3b4346b5dbd9b29a02346c3fc77459b4db 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_utility.cc
@@ -13,7 +13,6 @@
 #include <string.h>
 
 #include "webrtc/base/logging.h"
-#include "webrtc/modules/rtp_rtcp/include/rtp_cvo.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 
 namespace webrtc {
@@ -247,7 +246,7 @@
 
   // May not be present in packet.
   header->extension.hasVideoRotation = false;
-  header->extension.videoRotation = kVideoRotation_0;
+  header->extension.videoRotation = 0;
 
   // May not be present in packet.
   header->extension.playout_delay.min_ms = -1;
@@ -398,8 +397,7 @@
           // |  ID   | len=0 |0 0 0 0 C F R R|
           // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
           header->extension.hasVideoRotation = true;
-          header->extension.videoRotation =
-              ConvertCVOByteToVideoRotation(ptr[0]);
+          header->extension.videoRotation = ptr[0];
           break;
         }
         case kRtpExtensionTransportSequenceNumber: {