summaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2017-02-10 16:02:22 -0500
committerVittorio Giovara <vittorio.giovara@gmail.com>2017-03-07 11:07:03 -0500
commit0429f01e4722b8e0c3576a4810a16ca8f6dbc4d4 (patch)
treee8f057cecfe07fd1d2d9d4efd641008d389886d8 /libavformat
parent251849f06ce36ce8dc076e0fca2922119fa7e39e (diff)
downloadffmpeg-streaming-0429f01e4722b8e0c3576a4810a16ca8f6dbc4d4.zip
ffmpeg-streaming-0429f01e4722b8e0c3576a4810a16ca8f6dbc4d4.tar.gz
mkv: Export bounds and padding from spherical metadata
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/matroskadec.c55
-rw-r--r--libavformat/version.h2
2 files changed, 54 insertions, 3 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 3dd54eb..4fbf4b9 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1601,18 +1601,62 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track)
AVSphericalMapping *spherical;
enum AVSphericalProjection projection;
size_t spherical_size;
+ size_t l = 0, t = 0, r = 0, b = 0;
+ size_t padding = 0;
int ret;
+ GetByteContext gb;
+
+ bytestream2_init(&gb, track->video.projection.private.data,
+ track->video.projection.private.size);
+
+ if (bytestream2_get_byte(&gb) != 0) {
+ av_log(NULL, AV_LOG_WARNING, "Unknown spherical metadata\n");
+ return 0;
+ }
+
+ bytestream2_skip(&gb, 3); // flags
switch (track->video.projection.type) {
case MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR:
- projection = AV_SPHERICAL_EQUIRECTANGULAR;
+ if (track->video.projection.private.size == 20) {
+ t = bytestream2_get_be32(&gb);
+ b = bytestream2_get_be32(&gb);
+ l = bytestream2_get_be32(&gb);
+ r = bytestream2_get_be32(&gb);
+
+ if (b >= UINT_MAX - t || r >= UINT_MAX - l) {
+ av_log(NULL, AV_LOG_ERROR,
+ "Invalid bounding rectangle coordinates "
+ "%zu,%zu,%zu,%zu\n", l, t, r, b);
+ return AVERROR_INVALIDDATA;
+ }
+ } else if (track->video.projection.private.size != 0) {
+ av_log(NULL, AV_LOG_ERROR, "Unknown spherical metadata\n");
+ return AVERROR_INVALIDDATA;
+ }
+
+ if (l || t || r || b)
+ projection = AV_SPHERICAL_EQUIRECTANGULAR_TILE;
+ else
+ projection = AV_SPHERICAL_EQUIRECTANGULAR;
break;
case MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP:
if (track->video.projection.private.size < 4) {
av_log(NULL, AV_LOG_ERROR, "Missing projection private properties\n");
return AVERROR_INVALIDDATA;
+ } else if (track->video.projection.private.size == 12) {
+ uint32_t layout = bytestream2_get_be32(&gb);
+ if (layout) {
+ av_log(NULL, AV_LOG_WARNING,
+ "Unknown spherical cubemap layout %"PRIu32"\n", layout);
+ return 0;
+ }
+ projection = AV_SPHERICAL_CUBEMAP;
+ padding = bytestream2_get_be32(&gb);
+ } else {
+ av_log(NULL, AV_LOG_ERROR, "Unknown spherical metadata\n");
+ return AVERROR_INVALIDDATA;
}
- projection = AV_SPHERICAL_CUBEMAP;
break;
default:
av_log(NULL, AV_LOG_WARNING,
@@ -1631,6 +1675,13 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track)
spherical->pitch = (int32_t) (track->video.projection.pitch * (1 << 16));
spherical->roll = (int32_t) (track->video.projection.roll * (1 << 16));
+ spherical->padding = padding;
+
+ spherical->bound_left = l;
+ spherical->bound_top = t;
+ spherical->bound_right = r;
+ spherical->bound_bottom = b;
+
ret = av_stream_add_side_data(st, AV_PKT_DATA_SPHERICAL, (uint8_t *)spherical,
spherical_size);
if (ret < 0) {
diff --git a/libavformat/version.h b/libavformat/version.h
index fdf3e30..3e28cc2 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 2
+#define LIBAVFORMAT_VERSION_MICRO 3
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
OpenPOWER on IntegriCloud