Skip to content
Snippets Groups Projects
Commit fd59207c authored by James Almer's avatar James Almer
Browse files

Merge commit '827a05ea' 


* commit '827a05ea':
  matroskaenc: add support for Spherical Video elements

See 58eb0f57. Merged for cosmetics
purposes.
Also includes changes from d32d59bc

Merged-by: default avatarJames Almer <jamrial@gmail.com>
parents 13c84b07 827a05ea
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
libavformat/matroskaenc.c
+ 63
− 62
View file @ fd59207c
...@@ -953,78 +953,79 @@ static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStre ...@@ -953,78 +953,79 @@ static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStre
return 0; return 0;
} }
static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, AVStream *st) static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb,
AVStream *st)
{ {
AVIOContext b;
AVIOContext *dyn_cp;
int side_data_size = 0; int side_data_size = 0;
int ret, projection_size;
uint8_t *projection_ptr;
uint8_t private[20];
const AVSphericalMapping *spherical = const AVSphericalMapping *spherical =
(const AVSphericalMapping*) av_stream_get_side_data(st, AV_PKT_DATA_SPHERICAL, (const AVSphericalMapping *)av_stream_get_side_data(st, AV_PKT_DATA_SPHERICAL,
&side_data_size); &side_data_size);
if (side_data_size) { if (!side_data_size)
AVIOContext *dyn_cp; return 0;
uint8_t *projection_ptr;
int ret, projection_size;
ret = avio_open_dyn_buf(&dyn_cp); ret = avio_open_dyn_buf(&dyn_cp);
if (ret < 0) if (ret < 0)
return ret; return ret;
switch (spherical->projection) { switch (spherical->projection) {
case AV_SPHERICAL_EQUIRECTANGULAR: case AV_SPHERICAL_EQUIRECTANGULAR:
put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE, put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE,
MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR); MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
break; break;
case AV_SPHERICAL_EQUIRECTANGULAR_TILE: case AV_SPHERICAL_EQUIRECTANGULAR_TILE:
{ ffio_init_context(&b, private, 20, 1, NULL, NULL, NULL, NULL);
AVIOContext b; put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE,
uint8_t private[20]; MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
ffio_init_context(&b, private, sizeof(private), avio_wb32(&b, 0); // version + flags
1, NULL, NULL, NULL, NULL); avio_wb32(&b, spherical->bound_top);
put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE, avio_wb32(&b, spherical->bound_bottom);
MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR); avio_wb32(&b, spherical->bound_left);
avio_wb32(&b, 0); // version + flags avio_wb32(&b, spherical->bound_right);
avio_wb32(&b, spherical->bound_top); put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
avio_wb32(&b, spherical->bound_bottom); private, avio_tell(&b));
avio_wb32(&b, spherical->bound_left); break;
avio_wb32(&b, spherical->bound_right); case AV_SPHERICAL_CUBEMAP:
put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE, private, sizeof(private)); ffio_init_context(&b, private, 12, 1, NULL, NULL, NULL, NULL);
break; put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE,
} MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP);
case AV_SPHERICAL_CUBEMAP: avio_wb32(&b, 0); // version + flags
{ avio_wb32(&b, 0); // layout
AVIOContext b; avio_wb32(&b, spherical->padding);
uint8_t private[12]; put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
ffio_init_context(&b, private, sizeof(private), private, avio_tell(&b));
1, NULL, NULL, NULL, NULL); break;
put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE, default:
MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP); av_log(s, AV_LOG_WARNING, "Unknown projection type\n");
avio_wb32(&b, 0); // version + flags goto end;
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) if (spherical->yaw)
put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEYAW, (double)spherical->yaw / (1 << 16)); put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEYAW,
if (spherical->pitch) (double) spherical->yaw / (1 << 16));
put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH, (double)spherical->pitch / (1 << 16)); if (spherical->pitch)
if (spherical->roll) put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH,
put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEROLL, (double)spherical->roll / (1 << 16)); (double) spherical->pitch / (1 << 16));
if (spherical->roll)
put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEROLL,
(double) spherical->roll / (1 << 16));
end: end:
projection_size = avio_close_dyn_buf(dyn_cp, &projection_ptr); projection_size = avio_close_dyn_buf(dyn_cp, &projection_ptr);
if (projection_size) { if (projection_size) {
ebml_master projection = start_ebml_master(pb, MATROSKA_ID_VIDEOPROJECTION, projection_size); ebml_master projection = start_ebml_master(pb,
avio_write(pb, projection_ptr, projection_size); MATROSKA_ID_VIDEOPROJECTION,
end_ebml_master(pb, projection); projection_size);
} avio_write(pb, projection_ptr, projection_size);
av_freep(&projection_ptr); end_ebml_master(pb, projection);
} }
av_freep(&projection_ptr);
return 0; return 0;
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment