This matrix needs to be applied after all others have (currently only
display matrix from trak), but cannot be handled in movie box, since
streams are not allocated yet.

So store it in main context and if not identity, apply it when appropriate,
handling the case when trak display matrix is identity and when it is not.

Fate tests are updated accordingly.

Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com>
---
 libavformat/isom.h                |  2 ++
 libavformat/mov.c                 | 57 +++++++++++++++++++++++++++++----------
 tests/ref/fate/mov-ar             |  4 +--
 tests/ref/fate/mov-display-matrix |  2 +-
 4 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/libavformat/isom.h b/libavformat/isom.h
index 58f0a20..1aa2091 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -167,6 +167,8 @@ typedef struct MOVContext {
     int export_all;
     int export_xmp;
     int enable_drefs;
+
+    int32_t movie_display_matrix[3][3]; ///< display matrix from mvhd
 } MOVContext;
 
 int ff_mp4_read_descr_len(AVIOContext *pb);
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 36e75d5..c082ee4 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -950,6 +950,7 @@ static int mov_read_mdhd(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
 
 static int mov_read_mvhd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 {
+    int i;
     time_t creation_time;
     int version = avio_r8(pb); /* version */
     avio_rb24(pb); /* flags */
@@ -973,7 +974,12 @@ static int mov_read_mvhd(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
 
     avio_skip(pb, 10); /* reserved */
 
-    avio_skip(pb, 36); /* display matrix */
+    /* movie display matrix, store it in main context and use it later on */
+    for (i = 0; i < 3; i++) {
+        c->movie_display_matrix[i][0] = avio_rb32(pb); // 16.16 fixed point
+        c->movie_display_matrix[i][1] = avio_rb32(pb); // 16.16 fixed point
+        c->movie_display_matrix[i][2] = avio_rb32(pb); //  2.30 fixed point
+    }
 
     avio_rb32(pb); /* preview time */
     avio_rb32(pb); /* preview duration */
@@ -2747,17 +2753,34 @@ static int mov_read_meta(MOVContext *c, AVIOContext 
*pb, MOVAtom atom)
     return 0;
 }
 
+// return 0 when matrix is identity, 1 otherwise
+#define IS_MATRIX_FULL(matrix)       \
+    (matrix[0][0] != (1 << 16) ||    \
+     matrix[1][1] != (1 << 16) ||    \
+     matrix[2][2] != (1 << 30) ||    \
+     matrix[0][1] || matrix[0][2] || \
+     matrix[1][0] || matrix[1][2] || \
+     matrix[2][0] || matrix[2][1])
+
+// fixed point to double
+#define CONV_FP(x, sh) ((double) (x)) / (1 << (sh))
+
+// double to fixed point
+#define CONV_DB(x, sh) ((int32_t) ((x) * (1 << (sh))))
+
 static int mov_read_tkhd(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 {
-    int i;
+    int i, j, e;
     int width;
     int height;
     int64_t disp_transform[2];
     int display_matrix[3][3];
+    int res_display_matrix[3][3];
     AVStream *st;
     MOVStreamContext *sc;
     int version;
     int flags;
+    double val = 0;
 
     if (c->fc->nb_streams < 1)
         return 0;
@@ -2803,15 +2826,21 @@ static int mov_read_tkhd(MOVContext *c, AVIOContext 
*pb, MOVAtom atom)
     sc->width = width >> 16;
     sc->height = height >> 16;
 
-    // save the matrix when it is not the default identity
-    if (display_matrix[0][0] != (1 << 16) ||
-        display_matrix[1][1] != (1 << 16) ||
-        display_matrix[2][2] != (1 << 30) ||
-        display_matrix[0][1] || display_matrix[0][2] ||
-        display_matrix[1][0] || display_matrix[1][2] ||
-        display_matrix[2][0] || display_matrix[2][1]) {
-        int i, j;
+    // apply the moov display matrix
+    for (i = 0; i < 3; i++) {
+        for (j = 0; j < 3; j++) {
+            int sh = j == 2 ? 30 : 16;
+            for (e = 0; e < 3; e++) {
+                val += CONV_FP(display_matrix[i][e], sh) *
+                       CONV_FP(c->movie_display_matrix[e][j], sh);
+            }
+            res_display_matrix[i][j] = CONV_DB(val, sh);
+            val = 0;
+        }
+    }
 
+    // save the matrix when it is not the default identity
+    if (IS_MATRIX_FULL(res_display_matrix)) {
         av_freep(&sc->display_matrix);
         sc->display_matrix = av_malloc(sizeof(int32_t) * 9);
         if (!sc->display_matrix)
@@ -2819,7 +2848,7 @@ static int mov_read_tkhd(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
 
         for (i = 0; i < 3; i++)
             for (j = 0; j < 3; j++)
-                sc->display_matrix[i * 3 + j] = display_matrix[i][j];
+                sc->display_matrix[i * 3 + j] = res_display_matrix[i][j];
     }
 
     // transform the display width/height according to the matrix
@@ -2828,9 +2857,9 @@ static int mov_read_tkhd(MOVContext *c, AVIOContext *pb, 
MOVAtom atom)
     if (width && height && sc->display_matrix) {
         for (i = 0; i < 2; i++)
             disp_transform[i] =
-                (int64_t)  width  * display_matrix[0][i] +
-                (int64_t)  height * display_matrix[1][i] +
-                ((int64_t) display_matrix[2][i] << 16);
+                (int64_t)  width  * sc->display_matrix[0 + i] +
+                (int64_t)  height * sc->display_matrix[3 + i] +
+                ((int64_t) sc->display_matrix[6 + i] << 16);
 
         //sample aspect ratio is new width/height divided by old width/height
         if (disp_transform[0] > 0 && disp_transform[1] > 0)
diff --git a/tests/ref/fate/mov-ar b/tests/ref/fate/mov-ar
index 13cbd9c..57d0a38 100644
--- a/tests/ref/fate/mov-ar
+++ b/tests/ref/fate/mov-ar
@@ -1,2 +1,2 @@
-9:2
-3:1
+9:4
+3:2
diff --git a/tests/ref/fate/mov-display-matrix 
b/tests/ref/fate/mov-display-matrix
index 64c9599..6498148 100644
--- a/tests/ref/fate/mov-display-matrix
+++ b/tests/ref/fate/mov-display-matrix
@@ -1,5 +1,5 @@
 0
-65536
+131072
 0
 -65536
 0
-- 
2.10.0

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel

Reply via email to