virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/matroskaenc: Fix writing AV_SPHERICAL_EQUIRECTANGULAR

Browse Source 
According to the documentation, the ISOBMFF 'equi' box must
be present for equirectangular projections.

Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-01-20 16:33:17 +01:00
parent 0f5fd44dc9
commit 7512293cf9
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libavformat/matroskaenc.c
View File

@@ -1305,17 +1305,21 @@ static void mkv_write_video_projection(AVFormatContext *s, EbmlWriter *writer,
switch (spherical->projection) { switch (spherical->projection) {
case AV_SPHERICAL_EQUIRECTANGULAR: case AV_SPHERICAL_EQUIRECTANGULAR:
ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOPROJECTIONTYPE,
MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
break;
case AV_SPHERICAL_EQUIRECTANGULAR_TILE: case AV_SPHERICAL_EQUIRECTANGULAR_TILE:
ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOPROJECTIONTYPE, ebml_writer_add_uint(writer, MATROSKA_ID_VIDEOPROJECTIONTYPE,
MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR); MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR);
AV_WB32(private, 0); // version + flags AV_WB32(private, 0); // version + flags
AV_WB32(private + 4, spherical->bound_top); if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR) {
AV_WB32(private + 8, spherical->bound_bottom); AV_WB32(private + 4, 0);
AV_WB32(private + 12, spherical->bound_left); AV_WB32(private + 8, 0);
AV_WB32(private + 16, spherical->bound_right); AV_WB32(private + 12, 0);
AV_WB32(private + 16, 0);
} else {
AV_WB32(private + 4, spherical->bound_top);
AV_WB32(private + 8, spherical->bound_bottom);
AV_WB32(private + 12, spherical->bound_left);
AV_WB32(private + 16, spherical->bound_right);
}
ebml_writer_add_bin(writer, MATROSKA_ID_VIDEOPROJECTIONPRIVATE, ebml_writer_add_bin(writer, MATROSKA_ID_VIDEOPROJECTIONPRIVATE,
private, 20); private, 20);
break; break;