virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-19 09:02:26 +02:00
Code Issues Releases Activity

Merge commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574'

Browse Source 
* commit '827a05eaa9482e9ac2a17f7f2e42ead07c1d7574':
  matroskaenc: add support for Spherical Video elements

See 58eb0f57f6702d57b6f97ec5010657bb2c076eff. Merged for cosmetics
purposes.
Also includes changes from d32d59bc977b43031007bb2ab21e232f96d2ebcb

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-10-21 12:56:33 -03:00
commit fd59207c1c
1 changed files with 62 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libavformat/matroskaenc.c
View File

@ -953,17 +953,22 @@ 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)
@ -975,11 +980,7 @@ static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, AVStr
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;
uint8_t private[20];
ffio_init_context(&b, private, sizeof(private),
1, NULL, NULL, NULL, NULL);
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);
avio_wb32(&b, 0); // version + flags avio_wb32(&b, 0); // version + flags
@ -987,44 +988,44 @@ static int mkv_write_video_projection(AVFormatContext *s, AVIOContext *pb, AVStr
avio_wb32(&b, spherical->bound_bottom); avio_wb32(&b, spherical->bound_bottom);
avio_wb32(&b, spherical->bound_left); avio_wb32(&b, spherical->bound_left);
avio_wb32(&b, spherical->bound_right); avio_wb32(&b, spherical->bound_right);
put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE, private, sizeof(private)); put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
private, avio_tell(&b));
break; break;
}
case AV_SPHERICAL_CUBEMAP: case AV_SPHERICAL_CUBEMAP:
{ ffio_init_context(&b, private, 12, 1, NULL, NULL, NULL, NULL);
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, put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE,
MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP); MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP);
avio_wb32(&b, 0); // version + flags avio_wb32(&b, 0); // version + flags
avio_wb32(&b, 0); // layout avio_wb32(&b, 0); // layout
avio_wb32(&b, spherical->padding); avio_wb32(&b, spherical->padding);
put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE, private, sizeof(private)); put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
private, avio_tell(&b));
break; break;
}
default: default:
av_log(s, AV_LOG_WARNING, "Unknown projection type\n"); av_log(s, AV_LOG_WARNING, "Unknown projection type\n");
goto end; 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,
(double) spherical->yaw / (1 << 16));
if (spherical->pitch) if (spherical->pitch)
put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH, (double)spherical->pitch / (1 << 16)); put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH,
(double) spherical->pitch / (1 << 16));
if (spherical->roll) if (spherical->roll)
put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEROLL, (double)spherical->roll / (1 << 16)); 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,
MATROSKA_ID_VIDEOPROJECTION,
projection_size);
avio_write(pb, projection_ptr, projection_size); avio_write(pb, projection_ptr, projection_size);
end_ebml_master(pb, projection); end_ebml_master(pb, projection);
} }
av_freep(&projection_ptr); av_freep(&projection_ptr);
}
return 0; return 0;
} }