summaryrefslogtreecommitdiffstats
path: root/libavformat/matroskaenc.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-03-09 15:11:49 -0300
committerVittorio Giovara <vittorio.giovara@gmail.com>2017-03-15 17:52:12 -0400
commit827a05eaa9482e9ac2a17f7f2e42ead07c1d7574 (patch)
tree116334d7f7305a17d1946763870fde9c10a7d15c /libavformat/matroskaenc.c
parent0d8013b88b1cb7d65da891a8819d3beebafb9bb5 (diff)
downloadffmpeg-streaming-827a05eaa9482e9ac2a17f7f2e42ead07c1d7574.zip
ffmpeg-streaming-827a05eaa9482e9ac2a17f7f2e42ead07c1d7574.tar.gz
matroskaenc: add support for Spherical Video elements
Signed-off-by: James Almer <jamrial@gmail.com> Minor cosmetic changes by committer. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavformat/matroskaenc.c')
-rw-r--r--libavformat/matroskaenc.c84
1 files changed, 84 insertions, 0 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index 2fe6e0e..34d9833 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,85 @@ static int mkv_write_codecprivate(AVFormatContext *s, AVIOContext *pb,
return ret;
}
+static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
+ AVStream *st)
+{
+ AVIOContext b;
+ AVIOContext *dyn_cp;
+ int side_data_size = 0;
+ int ret, projection_size;
+ uint8_t *projection_ptr;
+ uint8_t private[20];
+
+ const AVSphericalMapping *spherical =
+ (const AVSphericalMapping *)av_stream_get_side_data(st, AV_PKT_DATA_SPHERICAL,
+ &side_data_size);
+
+ if (!side_data_size) {
+ av_log(NULL, AV_LOG_WARNING, "Unknown spherical metadata\n");
+ return 0;
+ }
+
+ 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:
+ ffio_init_context(&b, private, 20, 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:
+ ffio_init_context(&b, private, 12, 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 +978,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;
OpenPOWER on IntegriCloud