MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/matroskaenc: add support for Spherical Video elements

Browse Source 
Reviewed-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-03-08 16:12:32 -03:00
parent f940492bb2
commit 58eb0f57f6
2 changed files with 80 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
libavformat/matroskaenc.c
View File

@ -918,6 +918,82 @@ static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStre
return 0;
}
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, int mode,
enum AVFieldOrder field_order)
{
@ -1266,6 +1342,9 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
put_ebml_binary(pb, MATROSKA_ID_VIDEOCOLORSPACE, &color_space, sizeof(color_space));
}
ret = mkv_write_video_color(pb, par, st);
if (ret < 0)
return ret;
ret = mkv_write_video_projection(s, pb, st);
if (ret < 0)
return ret;
end_ebml_master(pb, subinfo);

2
libavformat/version.h
View File

@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 66
#define LIBAVFORMAT_VERSION_MICRO 103
#define LIBAVFORMAT_VERSION_MICRO 104
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \