ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avformat/movenc: add support for writting vexu boxes

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2024-06-21 15:19:43 -03:00
parent d4e2af4144
commit 6a428876fc
1 changed files with 154 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
libavformat/movenc.c
View File

@ -2190,6 +2190,138 @@ static int mov_write_sv3d_tag(AVFormatContext *s, AVIOContext *pb, AVSphericalMa
return update_size(pb, sv3d_pos);
}
static inline int64_t rescale_rational(AVRational q, int b)
{
return av_rescale(q.num, b, q.den);
}
static void mov_write_vexu_proj_tag(AVFormatContext *s, AVIOContext *pb,
const AVSphericalMapping *spherical_mapping)
{
avio_wb32(pb, 24); /* size */
ffio_wfourcc(pb, "proj");
avio_wb32(pb, 16); /* size */
ffio_wfourcc(pb, "prji");
avio_wb32(pb, 0); /* version + flags */
switch (spherical_mapping->projection) {
case AV_SPHERICAL_RECTILINEAR:
ffio_wfourcc(pb, "rect");
break;
case AV_SPHERICAL_EQUIRECTANGULAR:
ffio_wfourcc(pb, "equi");
break;
case AV_SPHERICAL_HALF_EQUIRECTANGULAR:
ffio_wfourcc(pb, "hequ");
break;
case AV_SPHERICAL_FISHEYE:
ffio_wfourcc(pb, "fish");
break;
default:
av_assert0(0);
}
}
static int mov_write_eyes_tag(AVFormatContext *s, AVIOContext *pb,
const AVStereo3D *stereo3d)
{
int64_t pos = avio_tell(pb);
int view = 0;
avio_wb32(pb, 0); /* size */
ffio_wfourcc(pb, "eyes");
// stri is mandatory
avio_wb32(pb, 13); /* size */
ffio_wfourcc(pb, "stri");
avio_wb32(pb, 0); /* version + flags */
switch (stereo3d->view) {
case AV_STEREO3D_VIEW_LEFT:
view |= 1 << 0;
break;
case AV_STEREO3D_VIEW_RIGHT:
view |= 1 << 1;
break;
case AV_STEREO3D_VIEW_PACKED:
view |= (1 << 0) | (1 << 1);
break;
}
view |= !!(stereo3d->flags & AV_STEREO3D_FLAG_INVERT) << 3;
avio_w8(pb, view);
// hero is optional
if (stereo3d->primary_eye != AV_PRIMARY_EYE_NONE) {
avio_wb32(pb, 13); /* size */
ffio_wfourcc(pb, "hero");
avio_wb32(pb, 0); /* version + flags */
avio_w8(pb, stereo3d->primary_eye);
}
// it's not clear if cams is mandatory or optional
if (stereo3d->baseline) {
avio_wb32(pb, 24); /* size */
ffio_wfourcc(pb, "cams");
avio_wb32(pb, 16); /* size */
ffio_wfourcc(pb, "blin");
avio_wb32(pb, 0); /* version + flags */
avio_wb32(pb, stereo3d->baseline);
}
// it's not clear if cmfy is mandatory or optional
if (stereo3d->horizontal_disparity_adjustment.num) {
avio_wb32(pb, 24); /* size */
ffio_wfourcc(pb, "cmfy");
avio_wb32(pb, 16); /* size */
ffio_wfourcc(pb, "dadj");
avio_wb32(pb, 0); /* version + flags */
avio_wb32(pb, rescale_rational(stereo3d->horizontal_disparity_adjustment, 10000));
}
return update_size(pb, pos);
}
static int mov_write_vexu_tag(AVFormatContext *s, AVIOContext *pb,
const AVStereo3D *stereo3d,
const AVSphericalMapping *spherical_mapping)
{
int64_t pos;
if (spherical_mapping &&
spherical_mapping->projection != AV_SPHERICAL_RECTILINEAR &&
spherical_mapping->projection != AV_SPHERICAL_EQUIRECTANGULAR &&
spherical_mapping->projection != AV_SPHERICAL_HALF_EQUIRECTANGULAR &&
spherical_mapping->projection != AV_SPHERICAL_FISHEYE) {
av_log(s, AV_LOG_WARNING, "Unsupported projection %d. proj not written.\n",
spherical_mapping->projection);
spherical_mapping = NULL;
}
if (stereo3d && (stereo3d->type == AV_STEREO3D_2D ||
(!(stereo3d->flags & AV_STEREO3D_FLAG_INVERT) &&
stereo3d->view == AV_STEREO3D_VIEW_UNSPEC &&
stereo3d->primary_eye == AV_PRIMARY_EYE_NONE &&
!stereo3d->baseline &&
!stereo3d->horizontal_disparity_adjustment.num))) {
av_log(s, AV_LOG_WARNING, "Unsupported stereo 3d metadata. eyes not written.\n");
stereo3d = NULL;
}
if (!spherical_mapping && !stereo3d)
return 0;
pos = avio_tell(pb);
avio_wb32(pb, 0); /* size */
ffio_wfourcc(pb, "vexu");
if (spherical_mapping)
mov_write_vexu_proj_tag(s, pb, spherical_mapping);
if (stereo3d)
mov_write_eyes_tag(s, pb, stereo3d);
return update_size(pb, pos);
}
static int mov_write_dvcc_dvvc_tag(AVFormatContext *s, AVIOContext *pb, AVDOVIDecoderConfigurationRecord *dovi)
{
uint8_t buf[ISOM_DVCC_DVVC_SIZE];
@ -2326,11 +2458,6 @@ static int mov_write_clli_tag(AVIOContext *pb, MOVTrack *track)
return 12;
}
static inline int64_t rescale_rational(AVRational q, int b)
{
return av_rescale(q.num, b, q.den);
}
static int mov_write_mdcv_tag(AVIOContext *pb, MOVTrack *track)
{
const int chroma_den = 50000;
@ -2623,6 +2750,28 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex
mov_write_sv3d_tag(mov->fc, pb, (AVSphericalMapping*)spherical_mapping->data);
}
if (track->mode == MODE_MOV || (track->mode == MODE_MP4 &&
mov->fc->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL)) {
const AVPacketSideData *sd;
const AVStereo3D *stereo3d = NULL;
const AVSphericalMapping *spherical_mapping = NULL;
sd = av_packet_side_data_get(track->st->codecpar->coded_side_data,
track->st->codecpar->nb_coded_side_data,
AV_PKT_DATA_STEREO3D);
if (sd)
stereo3d = (AVStereo3D *)sd->data;
sd = av_packet_side_data_get(track->st->codecpar->coded_side_data,
track->st->codecpar->nb_coded_side_data,
AV_PKT_DATA_SPHERICAL);
if (sd)
spherical_mapping = (AVSphericalMapping *)sd->data;
if (stereo3d || spherical_mapping)
mov_write_vexu_tag(s, pb, stereo3d, spherical_mapping);
}
if (track->mode == MODE_MP4) {
const AVPacketSideData *dovi = av_packet_side_data_get(track->st->codecpar->coded_side_data,
track->st->codecpar->nb_coded_side_data,