StVideoQueue - read rotation angle from stream side data

gkv311 · Feb 23, 2017 · 0b40285 · 0b40285
1 parent 7631318
commit 0b40285
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 3 deletions.
diff --git a/StMoviePlayer/StVideo/StVideoQueue.cpp b/StMoviePlayer/StVideo/StVideoQueue.cpp
@@ -173,6 +173,8 @@ StVideoQueue::StVideoQueue(const StHandle<StGLTextureQueue>& theTextureQueue,
   myAvDiscard(AVDISCARD_DEFAULT),
   myFramePts(0.0),
   myPixelRatio(1.0f),
+  myHParallax(0),
+  myRotateDeg(0),
   //
   myVideoClock(0.0),
   //
@@ -218,6 +220,8 @@ namespace {
         const char* name;
     };
 
+    static const StCString THE_ROTATE_KEY       = stCString("rotate");
+
     static const StCString THE_SRC_MODE_KEY     = stCString("STEREO_MODE");
     static const StCString THE_SRC_MODE_KEY_WMV = stCString("StereoscopicLayout");
 
@@ -408,6 +412,22 @@ bool StVideoQueue::init(AVFormatContext*   theFormatCtx,
         myHParallax = (int )stStringToLong(aValue.toCString(), 10, aCLocale);
     }
 
+    // we can read information from Display Matrix in side data or from metadata key
+    myRotateDeg = 0;
+#if(LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(55, 0, 0))
+    if(const uint8_t* aDispMatrix = av_stream_get_side_data(myStream, AV_PKT_DATA_DISPLAYMATRIX, NULL)) {
+        const double aRotDeg = -av_display_rotation_get((const int32_t* )aDispMatrix);
+        if(!st::isNaN(aRotDeg)) {
+            myRotateDeg = -int(aRotDeg - 360 * std::floor(aRotDeg / 360 + 0.9 / 360));
+        }
+    }
+#else
+    if(stAV::meta::readTag(myStream, THE_ROTATE_KEY, aValue)) {
+        StCLocale aCLocale;
+        myRotateDeg = (int )-stStringToLong(aValue.toCString(), 10, aCLocale);
+    }
+#endif
+
     // stereoscopic mode tags
     myStFormatInStream = is720in1080 ? StFormat_Tiled4x : StFormat_AUTO;
     if(stAV::meta::readTag(myFormatCtx, THE_SRC_MODE_KEY,     aValue)
@@ -862,14 +882,23 @@ void StVideoQueue::decodeLoop() {
 
         // we currently allow to override source format stored in metadata
     #ifdef ST_AV_NEWSTEREO
-        AVFrameSideData* aSideData = av_frame_get_side_data(myFrame.Frame, AV_FRAME_DATA_STEREO3D);
-        if(aSideData != NULL) {
-            AVStereo3D* aStereo = (AVStereo3D* )aSideData->data;
+        if(AVFrameSideData* aSideDataS3d = av_frame_get_side_data(myFrame.Frame, AV_FRAME_DATA_STEREO3D)) {
+            AVStereo3D* aStereo = (AVStereo3D* )aSideDataS3d->data;
             myStFormatInStream = stAV::stereo3dAvToSt(aStereo->type);
             if(aStereo->flags & AV_STEREO3D_FLAG_INVERT) {
                 myStFormatInStream = st::formatReversed(myStFormatInStream);
             }
         }
+    #endif
+    #if(LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(55, 0, 0))
+        if(const AVFrameSideData* aSideDataRot = av_frame_get_side_data(myFrame.Frame, AV_FRAME_DATA_DISPLAYMATRIX)) {
+            if(aSideDataRot->size >= 9 * sizeof(int32_t)) {
+                const double aRotDeg = -av_display_rotation_get((const int32_t* )aSideDataRot->data);
+                if(!st::isNaN(aRotDeg)) {
+                    myRotateDeg = -int(aRotDeg - 360 * std::floor(aRotDeg / 360 + 0.9 / 360));
+                }
+            }
+        }
     #endif
         if(stAV::meta::readTag(myFrame.Frame, THE_SRC_MODE_KEY, aTagValue)) {
             for(size_t aSrcId = 0;; ++aSrcId) {
@@ -907,6 +936,7 @@ void StVideoQueue::decodeLoop() {
                 StHandle<StStereoParams> aParams = aPacket->getSource();
                 if(!aParams.isNull()) {
                     aParams->setSeparationNeutral(myHParallax);
+                    aParams->setZRotateZero((float )myRotateDeg);
                 }
                 isStarted = false;
             }
@@ -951,6 +981,7 @@ void StVideoQueue::decodeLoop() {
                 StHandle<StStereoParams> aParams = aPacket->getSource();
                 if(!aParams.isNull()) {
                     aParams->setSeparationNeutral(myHParallax);
+                    aParams->setZRotateZero((float )myRotateDeg);
                 }
                 isStarted = false;
             }

diff --git a/StMoviePlayer/StVideo/StVideoQueue.h b/StMoviePlayer/StVideo/StVideoQueue.h
@@ -378,6 +378,7 @@ class StVideoQueue : public StAVPacketQueue {
     double                     myFramePts;
     GLfloat                    myPixelRatio;      //!< pixel aspect ratio
     int                        myHParallax;       //!< horizontal parallax in pixels stored in metadata
+    int                        myRotateDeg;       //!< rotate angle in degrees
 
     double                     myVideoClock;      //!< synchronization variable
 

diff --git a/include/StAV/stAV.h b/include/StAV/stAV.h
@@ -32,6 +32,10 @@ extern "C" {
     #include <libavutil/stereo3d.h>
 #endif
 
+#if(LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(55, 0, 0))
+    #include <libavutil/display.h>
+#endif
+
 #ifdef _MSC_VER
     #pragma warning(default : 4244)
 #endif

diff --git a/include/stTypes.h b/include/stTypes.h
@@ -63,6 +63,7 @@
 #endif
 
 #include <cmath>       // fabs
+#include <cfloat>
 #include <cstddef>     // size_t, NULL
 #include <cstdlib>
 #include <cstring>     // for memcpy
@@ -542,6 +543,19 @@ inline int getEvenNumber(const int number) {
     return isOddNumber(number) ? (number + 1) : number;
 }
 
+namespace st {
+    /**
+     * Return true for NaN.
+     */
+    inline bool isNaN(double theValue) {
+    #if defined(_MSC_VER)
+        return ::_isnan(theValue) != 0;
+    #else
+        return std::isnan(theValue);
+    #endif
+    }
+}
+
 #include <StTemplates/StTemplates.h> // include commonly-used templates
 
 /**