matroskaenc: add support for Spherical Video elements

Message ID 20170309181149.2244-1-jamrial@gmail.com
State New
Headers show

Commit Message

James Almer March 9, 2017, 6:11 p.m.
Signed-off-by: James Almer <jamrial@gmail.com>
---
 libavformat/matroskaenc.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++
 libavformat/version.h     |  2 +-
 2 files changed, 82 insertions(+), 1 deletion(-)

Comments

Vittorio Giovara March 15, 2017, 9:51 p.m. | #1
On Thu, Mar 9, 2017 at 1:11 PM, James Almer <jamrial@gmail.com> wrote:
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  libavformat/matroskaenc.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++
>  libavformat/version.h     |  2 +-
>  2 files changed, 82 insertions(+), 1 deletion(-)

This looks good, thanks.
Pushing with a couple of minor cosmetic changes as discussed.

Patch

diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 2fe6e0ed4..fb1b86168 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -24,6 +24,7 @@ 
 #include "avc.h"
 #include "hevc.h"
 #include "avformat.h"
+#include "avio_internal.h"
 #include "avlanguage.h"
 #include "flacenc.h"
 #include "internal.h"
@@ -44,6 +45,7 @@ 
 #include "libavutil/random_seed.h"
 #include "libavutil/samplefmt.h"
 #include "libavutil/stereo3d.h"
+#include "libavutil/spherical.h"
 
 #include "libavcodec/xiph.h"
 #include "libavcodec/mpeg4audio.h"
@@ -646,6 +648,82 @@  static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb,
     return ret;
 }
 
+static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, AVStream *st)
+{
+    int side_data_size = 0;
+    const AVSphericalMapping *spherical =
+        (const AVSphericalMapping*) av_stream_get_side_data(st, AV_PKT_DATA_SPHERICAL,
+                                                            &side_data_size);
+
+    if (side_data_size) {
+        AVIOContext *dyn_cp;
+        uint8_t *projection_ptr;
+        int ret, projection_size;
+
+        ret = avio_open_dyn_buf(&dyn_cp);
+        if (ret < 0)
+            return ret;
+
+        switch (spherical->projection) {
+        case AV_SPHERICAL_EQUIRECTANGULAR:
+            put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE,
+                          MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
+            break;
+        case AV_SPHERICAL_EQUIRECTANGULAR_TILE:
+        {
+            AVIOContext b;
+            uint8_t private[20];
+            ffio_init_context(&b, private, sizeof(private),
+                              1, NULL, NULL, NULL, NULL);
+            put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE,
+                          MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
+            avio_wb32(&b, 0); // version + flags
+            avio_wb32(&b, spherical->bound_top);
+            avio_wb32(&b, spherical->bound_bottom);
+            avio_wb32(&b, spherical->bound_left);
+            avio_wb32(&b, spherical->bound_right);
+            put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE, private, sizeof(private));
+            break;
+        }
+        case AV_SPHERICAL_CUBEMAP:
+        {
+            AVIOContext b;
+            uint8_t private[12];
+            ffio_init_context(&b, private, sizeof(private),
+                              1, NULL, NULL, NULL, NULL);
+            put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE,
+                          MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP);
+            avio_wb32(&b, 0); // version + flags
+            avio_wb32(&b, 0); // layout
+            avio_wb32(&b, spherical->padding);
+            put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE, private, sizeof(private));
+            break;
+        }
+        default:
+            av_log(s, AV_LOG_WARNING, "Unknown projection type\n");
+            goto end;
+        }
+
+        if (spherical->yaw)
+            put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEYAW,   (double)spherical->yaw   / (1 << 16));
+        if (spherical->pitch)
+            put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH, (double)spherical->pitch / (1 << 16));
+        if (spherical->roll)
+            put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEROLL,  (double)spherical->roll  / (1 << 16));
+
+end:
+        projection_size = avio_close_dyn_buf(dyn_cp, &projection_ptr);
+        if (projection_size) {
+            ebml_master projection = start_ebml_master(pb, MATROSKA_ID_VIDEOPROJECTION, projection_size);
+            avio_write(pb, projection_ptr, projection_size);
+            end_ebml_master(pb, projection);
+        }
+        av_freep(&projection_ptr);
+    }
+
+    return 0;
+}
+
 static void mkv_write_field_order(AVIOContext *pb,
                                   enum AVFieldOrder field_order)
 {
@@ -897,6 +975,9 @@  static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
         ret = mkv_write_stereo_mode(s, pb, st, mkv->mode);
         if (ret < 0)
             return ret;
+        ret = mkv_write_video_projection(s, pb, st);
+        if (ret < 0)
+            return ret;
 
         end_ebml_master(pb, subinfo);
         break;
diff --git a/libavformat/version.h b/libavformat/version.h
index 3e28cc280..34650f6ec 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,7 +31,7 @@ 
 
 #define LIBAVFORMAT_VERSION_MAJOR 57
 #define LIBAVFORMAT_VERSION_MINOR 11
-#define LIBAVFORMAT_VERSION_MICRO  3
+#define LIBAVFORMAT_VERSION_MICRO  4
 
 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                LIBAVFORMAT_VERSION_MINOR, \