[libav-devel] [PATCH 4/9] mpeg12dec: parse frame packing arrangment user_data and save relevant stereo3d information

[Vittorio Giovara]

---
 libavcodec/mpeg12dec.c |   63 +++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 12 deletions(-)

diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 9d0c3be..633bbcf 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -27,6 +27,7 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/internal.h"
+#include "libavutil/stereo3d.h"
 #include "internal.h"
 #include "avcodec.h"
 #include "dsputil.h"
@@ -2108,18 +2109,56 @@ static void mpeg_decode_user_data(AVCodecContext *avctx,
     const uint8_t *buf_end = p + buf_size;
 
     /* we parse the DTG active format information */
-    if (buf_end - p >= 5 &&
-        p[0] == 'D' && p[1] == 'T' && p[2] == 'G' && p[3] == '1') {
-        int flags = p[4];
-        p += 5;
-        if (flags & 0x80) {
-            /* skip event id */
-            p += 2;
-        }
-        if (flags & 0x40) {
-            if (buf_end - p < 1)
-                return;
-            avctx->dtg_active_format = p[0] & 0x0f;
+    if (buf_end - p >= 5) {
+        if (p[0] == 'D' &&
+            p[1] == 'T' &&
+            p[2] == 'G' &&
+            p[3] == '1') {
+            int flags = p[4];
+            p += 5;
+            if (flags & 0x80) {
+                /* skip event id */
+                p += 2;
+            }
+            if (flags & 0x40) {
+                if (buf_end - p < 1)
+                    return;
+                avctx->dtg_active_format = p[0] & 0x0f;
+            }
+        } else if (p[0] == 'J' &&
+                   p[1] == 'P' &&
+                   p[2] == '3' &&
+                   p[3] == 'D') {
+            if (p[4] == 0x03) { // S3D_video_format_length
+                // the mask ignores reserved_bit
+                const uint8_t S3D_video_format_type = p[5] & 0x7F;
+
+                if (S3D_video_format_type == 0x03 ||
+                    S3D_video_format_type == 0x04 ||
+                    S3D_video_format_type == 0x08 ||
+                    S3D_video_format_type == 0x23) {
+                    Mpeg1Context *s1   = avctx->priv_data;
+                    MpegEncContext *s  = &s1->mpeg_enc_ctx;
+                    AVStereo3D *stereo = 
av_stereo3d_create_side_data(&s->current_picture_ptr->f);
+                    if (!stereo)
+                        return;
+
+                    switch (S3D_video_format_type) {
+                    case 0x03:
+                        stereo->type = AV_STEREO3D_SIDEBYSIDE;
+                        break;
+                    case 0x04:
+                        stereo->type = AV_STEREO3D_TOPBOTTOM;
+                        break;
+                    case 0x08:
+                        stereo->type = AV_STEREO3D_2D;
+                        break;
+                    case 0x23:
+                        stereo->type = AV_STEREO3D_SIDEBYSIDE_QUINCUNX;
+                        break;
+                    }
+                }
+            }
         }
     } else if (mpeg_decode_a53_cc(avctx, p, buf_size)) {
         return;
-- 
1.7.9.5

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