Backed out changeset 998ed936f745 (bug 1228601) for reftest failure in 1frame_rotation_90.mp4. r=backout on a CLOSED TREE

dom/media/MediaInfo.h

@@ -177,12 +177,6 @@ private:
 // Stores info relevant to presenting media frames.
 class VideoInfo : public TrackInfo {
 public:
-  enum Rotation {
-    kDegree_0 = 0,
-    kDegree_90 = 90,
-    kDegree_180 = 180,
-    kDegree_270 = 270,
-  };
   VideoInfo()
     : VideoInfo(-1, -1)
   {
@@ -196,7 +190,6 @@ public:
     , mImage(nsIntSize(aWidth, aHeight))
     , mCodecSpecificConfig(new MediaByteBuffer)
     , mExtraData(new MediaByteBuffer)
-    , mRotation(kDegree_0)
     , mImageRect(nsIntRect(0, 0, aWidth, aHeight))
   {
   }
@@ -208,7 +201,6 @@ public:
     , mImage(aOther.mImage)
     , mCodecSpecificConfig(aOther.mCodecSpecificConfig)
     , mExtraData(aOther.mExtraData)
-    , mRotation(aOther.mRotation)
     , mImageRect(aOther.mImageRect)
   {
   }
@@ -267,21 +259,6 @@ public:
     return imageRect;
   }
 
-  Rotation ToSupportedRotation(int32_t aDegree)
-  {
-    switch (aDegree) {
-      case 90:
-        return kDegree_90;
-      case 180:
-        return kDegree_180;
-      case 270:
-        return kDegree_270;
-      default:
-        NS_WARN_IF_FALSE(aDegree == 0, "Invalid rotation degree, ignored");
-        return kDegree_0;
-    }
-  }
-
   // Size in pixels at which the video is rendered. This is after it has
   // been scaled by its aspect ratio.
   nsIntSize mDisplay;
@@ -295,10 +272,6 @@ public:
   RefPtr<MediaByteBuffer> mCodecSpecificConfig;
   RefPtr<MediaByteBuffer> mExtraData;
 
-  // Describing how many degrees video frames should be rotated in clock-wise to
-  // get correct view.
-  Rotation mRotation;
-
 private:
   // mImage may be cropped; currently only used with the WebM container.
   // A negative width or height indicate that no cropping is to occur.

media/libstagefright/binding/DecoderData.cpp

@@ -164,7 +164,6 @@ MP4VideoInfo::Update(const MetaData* aMetaData, const char* aMimeType)
   mDisplay.height = FindInt32(aMetaData, kKeyDisplayHeight);
   mImage.width = FindInt32(aMetaData, kKeyWidth);
   mImage.height = FindInt32(aMetaData, kKeyHeight);
-  mRotation = VideoInfo::ToSupportedRotation(FindInt32(aMetaData, kKeyRotation));
 
   FindData(aMetaData, kKeyAVCC, mExtraData);
   if (!mExtraData->Length()) {