diff mbox series

[FFmpeg-devel,03/10,v3] avformat/mov: default to Monoscopic view when parsing eyes and st3d boxes

Message ID 20240622231520.7410-3-jamrial@gmail.com
State New
Headers show
Series [FFmpeg-devel,01/10,v4] avutil/stereo3d: add a Monoscopic view enum value | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

James Almer June 22, 2024, 11:15 p.m. UTC 
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/mov.c                 | 16 ++++++++++++++--
 tests/ref/fate/mov-spherical-mono |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index f08fec3fb6..b0930b2936 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -6298,6 +6298,7 @@  static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     AVStream *st;
     MOVStreamContext *sc;
     enum AVStereo3DType type;
+    enum AVStereo3DView view = AV_STEREO3D_VIEW_PACKED;
     int mode;
 
     if (c->fc->nb_streams < 1)
@@ -6320,6 +6321,7 @@  static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     switch (mode) {
     case 0:
         type = AV_STEREO3D_2D;
+        view = AV_STEREO3D_VIEW_MONO;
         break;
     case 1:
         type = AV_STEREO3D_TOPBOTTOM;
@@ -6337,6 +6339,7 @@  static int mov_read_st3d(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         return AVERROR(ENOMEM);
 
     sc->stereo3d->type = type;
+    sc->stereo3d->view = view;
     return 0;
 }
 
@@ -6546,7 +6549,8 @@  static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     int size, flags = 0;
     int64_t remaining;
     uint32_t tag, baseline = 0;
-    enum AVStereo3DView view = AV_STEREO3D_VIEW_PACKED;
+    enum AVStereo3DType type = AV_STEREO3D_2D;
+    enum AVStereo3DView view = AV_STEREO3D_VIEW_MONO;
     enum AVStereo3DPrimaryEye primary_eye = AV_PRIMARY_EYE_NONE;
     AVRational horizontal_disparity_adjustment = { 0, 1 };
 
@@ -6596,6 +6600,9 @@  static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom)
                 view = AV_STEREO3D_VIEW_LEFT;
             else if (has_right)
                 view = AV_STEREO3D_VIEW_RIGHT;
+            if (view)
+                type = AV_STEREO3D_UNSPEC;
+
             break;
         }
         case MKTAG('h','e','r','o'): {
@@ -6697,6 +6704,7 @@  static int mov_read_eyes(MOVContext *c, AVIOContext *pb, MOVAtom atom)
     }
 
     sc->stereo3d->flags                           = flags;
+    sc->stereo3d->type                            = type;
     sc->stereo3d->view                            = view;
     sc->stereo3d->primary_eye                     = primary_eye;
     sc->stereo3d->baseline                        = baseline;
@@ -6818,19 +6826,23 @@  static int mov_parse_uuid_spherical(MOVStreamContext *sc, AVIOContext *pb, size_
 
         if (av_stristr(buffer, "<GSpherical:StereoMode>") && !sc->stereo3d) {
             enum AVStereo3DType mode;
+            enum AVStereo3DView view = AV_STEREO3D_VIEW_PACKED;
 
             if (av_stristr(buffer, "left-right"))
                 mode = AV_STEREO3D_SIDEBYSIDE;
             else if (av_stristr(buffer, "top-bottom"))
                 mode = AV_STEREO3D_TOPBOTTOM;
-            else
+            else {
                 mode = AV_STEREO3D_2D;
+                view = AV_STEREO3D_VIEW_MONO;
+            }
 
             sc->stereo3d = av_stereo3d_alloc();
             if (!sc->stereo3d)
                 goto out;
 
             sc->stereo3d->type = mode;
+            sc->stereo3d->view = view;
         }
 
         /* orientation */
diff --git a/tests/ref/fate/mov-spherical-mono b/tests/ref/fate/mov-spherical-mono
index b108596350..aa17e9c624 100644
--- a/tests/ref/fate/mov-spherical-mono
+++ b/tests/ref/fate/mov-spherical-mono
@@ -3,7 +3,7 @@ 
 side_data_type=Stereo 3D
 type=2D
 inverted=0
-view=packed
+view=monoscopic
 primary_eye=none
 baseline=0
 horizontal_disparity_adjustment=0/1