[libav-devel] [PATCH 3/3] libx264: set frame packing information when relevant metadata is found

[Vittorio Giovara]

---
 libavcodec/libx264.c |   23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 89742e7..3736a26 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -23,6 +23,7 @@
 #include "libavutil/opt.h"
 #include "libavutil/mem.h"
 #include "libavutil/pixdesc.h"
+#include "libavutil/stereoscopy.h"
 #include "avcodec.h"
 #include "internal.h"
 
@@ -407,6 +408,7 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, 
const AVFrame *frame,
     x264_nal_t *nal;
     int nnal, i, ret;
     x264_picture_t pic_out;
+    AVFrameSideData *side_data;
 
     /* encoder does not pick b_interlaced changes from x264_encoder_reconfig() 
*/
     if (frame && frame->interlaced_frame && !x4->params.b_interlaced) {
@@ -442,8 +444,27 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, 
const AVFrame *frame,
             x4->params.vui.i_sar_width  = ctx->sample_aspect_ratio.num;
             x264_encoder_reconfig(x4->enc, &x4->params);
         }
-    }
 
+        side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_STEREO3D);
+        if (side_data) {
+            int type;
+
+            switch (*side_data->data & 0x00FFFFFF) {
+                case AV_STEREO3D_CHECKERS:      type = 0; break;
+                case AV_STEREO3D_LINES:         type = 1; break;
+                case AV_STEREO3D_COLUMNS:       type = 2; break;
+                case AV_STEREO3D_SIDEBYSIDE:    type = 3; break;
+                case AV_STEREO3D_TOPBOTTOM:     type = 4; break;
+                case AV_STEREO3D_FRAMESEQUENCE: type = 5; break;
+                default:                        type = -1; break;
+            }
+
+            if (type != x4->params.i_frame_packing) {
+                x4->params.i_frame_packing = type;
+                x264_encoder_reconfig(x4->enc, &x4->params);
+            }
+        }
+    }
     do {
         if (x264_encoder_encode(x4->enc, &nal, &nnal, frame? &x4->pic: NULL, 
&pic_out) < 0)
             return -1;
-- 
1.7.9.5

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