commit 414dda1a10d465ee61b0a52f036b854dc0e00739
author perkj <perkj@webrtc.org> Mon Jul 04 01:45:23 2016 -0700
committer Commit bot <commit-bot@chromium.org> Mon Jul 04 08:45:28 2016 +0000
tree 9c15ec95196ef6dc7c5e663471bb9322abfc6dee
parent 2c332bb6829c43fdc5017fa4d783208631625d27

Change VCMFrameBuffer and VCMEncodedFrame to use rotation from base class EncodedImage.

BUG=webrtc:5687

Review-Url: https://codereview.webrtc.org/2037633002
Cr-Commit-Position: refs/heads/master@{#13376}

webrtc/modules/video_coding/encoded_frame.cc

diff --git a/webrtc/modules/video_coding/encoded_frame.cc b/webrtc/modules/video_coding/encoded_frame.cc
index cc3a91e..23e681d 100644
--- a/webrtc/modules/video_coding/encoded_frame.cc
+++ b/webrtc/modules/video_coding/encoded_frame.cc
@@ -22,7 +22,6 @@
       _missingFrame(false),
       _codec(kVideoCodecUnknown),
       _fragmentation(),
-      _rotation(kVideoRotation_0),
       _rotation_set(false) {
   _codecSpecificInfo.codecType = kVideoCodecUnknown;
 }
@@ -34,7 +33,6 @@
       _missingFrame(false),
       _codec(kVideoCodecUnknown),
       _fragmentation(),
-      _rotation(kVideoRotation_0),
       _rotation_set(false) {
   _codecSpecificInfo.codecType = kVideoCodecUnknown;
   _buffer = NULL;
@@ -55,7 +53,6 @@
       _codecSpecificInfo(rhs._codecSpecificInfo),
       _codec(rhs._codec),
       _fragmentation(),
-      _rotation(rhs._rotation),
       _rotation_set(rhs._rotation_set) {
   _buffer = NULL;
   _size = 0;
@@ -93,7 +90,7 @@
   _length = 0;
   _codecSpecificInfo.codecType = kVideoCodecUnknown;
   _codec = kVideoCodecUnknown;
-  _rotation = kVideoRotation_0;
+  rotation_ = kVideoRotation_0;
   _rotation_set = false;
 }
 

webrtc/modules/video_coding/encoded_frame.h

diff --git a/webrtc/modules/video_coding/encoded_frame.h b/webrtc/modules/video_coding/encoded_frame.h
index 9034200..953ab36 100644
--- a/webrtc/modules/video_coding/encoded_frame.h
+++ b/webrtc/modules/video_coding/encoded_frame.h
@@ -75,7 +75,7 @@
   /**
   *   Get frame rotation
   */
-  VideoRotation rotation() const { return _rotation; }
+  VideoRotation rotation() const { return rotation_; }
   /**
   *   True if this frame is complete, false otherwise
   */
@@ -119,7 +119,6 @@
   CodecSpecificInfo _codecSpecificInfo;
   webrtc::VideoCodecType _codec;
   RTPFragmentationHeader _fragmentation;
-  VideoRotation _rotation;
 
   // Video rotation is only set along with the last packet for each frame
   // (same as marker bit). This |_rotation_set| is only for debugging purpose

webrtc/modules/video_coding/frame_buffer.cc

diff --git a/webrtc/modules/video_coding/frame_buffer.cc b/webrtc/modules/video_coding/frame_buffer.cc
index 61db0d1..1c7301f 100644
--- a/webrtc/modules/video_coding/frame_buffer.cc
+++ b/webrtc/modules/video_coding/frame_buffer.cc
@@ -153,7 +153,7 @@
   // (HEVC)).
   if (packet.markerBit) {
     RTC_DCHECK(!_rotation_set);
-    _rotation = packet.video_header.rotation;
+    rotation_ = packet.video_header.rotation;
     _rotation_set = true;
   }