From patchwork Mon Mar 27 16:02:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Colwell X-Patchwork-Id: 3130 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp233120vss; Mon, 27 Mar 2017 09:09:55 -0700 (PDT) X-Received: by 10.28.91.82 with SMTP id p79mr10228882wmb.130.1490630995552; Mon, 27 Mar 2017 09:09:55 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 13si8775wmf.85.2017.03.27.09.09.53; Mon, 27 Mar 2017 09:09:55 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B388668836D; Mon, 27 Mar 2017 19:09:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw0-f180.google.com (mail-yw0-f180.google.com [209.85.161.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 13D0F688289 for ; Mon, 27 Mar 2017 19:09:22 +0300 (EEST) Received: by mail-yw0-f180.google.com with SMTP id d191so34913608ywe.2 for ; Mon, 27 Mar 2017 09:09:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=bJabQHII6oBNJu41fEwd2HJe9t9FVSMUzBUYeC1moZw=; b=Ce+VTY8pRiVKpoUcsLXnFUxMtr403eFLW3cqvqMzXJRMCKcvc55k58Oan0WKHgYdPd xqu7VZiP+R5nHwjqweqGyEFpYKDxHE3PMHDr3g/jE6YZd4uotRVvfs0A9m1yhbsqXdaE 14m8LDa802GavZeDRTZtL33+nf5qboULG4teiZRcspEahcVXkX6p8Tu1vVkiE84yLDM5 3GEWIdw0BUKmYteQn5Oiue9UgYb+HVd64rkVohOSy0/E2DfUDEaVYrK9V7FaFpPAYGaH v53Hkuif7AStj6QlDUpy42qvE43QevSjjohyEGlmVGKDu6tB2NwJ/aFE6CWzI+7adQUn 48EA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=bJabQHII6oBNJu41fEwd2HJe9t9FVSMUzBUYeC1moZw=; b=Q+VfgfC1Bs8nm1Iec4v775qpXepRHsS4iOJaZ0DWcwO3fNwnaaxy4FTS6ut3sDft77 TIgBgBzxEe3K3GNBy29un8YmTkmoq9kphmbXxFq6jMFIrIdj8Dj0iAiNsGpbXNdboqcq RTKJKXGB+su9dTWfRIiVAagQVesXxbOW7wInH1ZB3HNpwT+yzlsku0RyrfTjvQc252wt yIHeBAiTzZnQ0nKE8LC3DbyciPqjO0oicee0DehuGrrLf26ghQh+zH/DUWv3r75IP50w FMjsdIdOKSTmFuRdljgjy0kmjJBt0PfTmK0mnonDsI9LeEIMk5YswzWI0Ckoiw/n6i0M E3wA== X-Gm-Message-State: AFeK/H1Efib9HbBeK4UDA2drBdQ3no+WzjRggras/c9ovEneixMflrNMd08mS/UYCPLWlT355LtOjPUWIRWCxO63 X-Received: by 10.13.254.195 with SMTP id o186mr19236580ywf.256.1490630554602; Mon, 27 Mar 2017 09:02:34 -0700 (PDT) MIME-Version: 1.0 From: Aaron Colwell Date: Mon, 27 Mar 2017 16:02:23 +0000 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] movenc: Add support for writing st3d and sv3d boxes. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From 8654212c2f2a3ee404020cf5b948d7db3e6270f2 Mon Sep 17 00:00:00 2001 From: Aaron Colwell Date: Mon, 27 Mar 2017 08:00:12 -0700 Subject: [PATCH] movenc: Add support for writing st3d and sv3d boxes. --- libavformat/movenc.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 105 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 3b4e3b519c..4f408b20fa 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1603,6 +1603,101 @@ static int mov_write_subtitle_tag(AVIOContext *pb, MOVTrack *track) return update_size(pb, pos); } +static int mov_write_st3d_tag(AVIOContext *pb, AVStereo3D *stereo_3d) +{ + int8_t stereo_mode; + + if (stereo_3d->flags != 0) { + av_log(pb, AV_LOG_WARNING, "Unsupported stereo_3d flags %x. st3d not written.\n", stereo_3d->flags); + return 0; + } + + switch (stereo_3d->type) { + case AV_STEREO3D_2D: + stereo_mode = 0; + break; + case AV_STEREO3D_TOPBOTTOM: + stereo_mode = 1; + break; + case AV_STEREO3D_SIDEBYSIDE: + stereo_mode = 2; + break; + default: + av_log(pb, AV_LOG_WARNING, "Unsupported stereo_3d type %d. st3d not written.\n", stereo_3d->type); + return 0; + } + avio_wb32(pb, 13); /* size */ + ffio_wfourcc(pb, "st3d"); + avio_wb32(pb, 0); /* version = 0 & flags = 0 */ + avio_w8(pb, stereo_mode); + return 13; +} + +static int mov_write_sv3d_tag(AVIOContext *pb, AVSphericalMapping *spherical_mapping) +{ + int64_t sv3d_pos, svhd_pos, proj_pos; + + if (spherical_mapping->projection != AV_SPHERICAL_EQUIRECTANGULAR && + spherical_mapping->projection != AV_SPHERICAL_EQUIRECTANGULAR_TILE && + spherical_mapping->projection != AV_SPHERICAL_CUBEMAP) { + av_log(pb, AV_LOG_WARNING, "Unsupported projection %d. sv3d not written.\n", spherical_mapping->projection); + return 0; + } + + sv3d_pos = avio_tell(pb); + avio_wb32(pb, 0); /* size */ + ffio_wfourcc(pb, "sv3d"); + + svhd_pos = avio_tell(pb); + avio_wb32(pb, 0); /* size */ + ffio_wfourcc(pb, "svhd"); + avio_wb32(pb, 0); /* version = 0 & flags = 0 */ + avio_put_str(pb, LIBAVFORMAT_IDENT); /* metadata_source */ + update_size(pb, svhd_pos); + + proj_pos = avio_tell(pb); + avio_wb32(pb, 0); /* size */ + ffio_wfourcc(pb, "proj"); + + avio_wb32(pb, 24); /* size */ + ffio_wfourcc(pb, "prhd"); + avio_wb32(pb, 0); /* version = 0 & flags = 0 */ + avio_wb32(pb, spherical_mapping->yaw); + avio_wb32(pb, spherical_mapping->pitch); + avio_wb32(pb, spherical_mapping->roll); + + switch (spherical_mapping->projection) { + case AV_SPHERICAL_EQUIRECTANGULAR: + avio_wb32(pb, 28); /* size */ + ffio_wfourcc(pb, "equi"); + avio_wb32(pb, 0); /* version = 0 & flags = 0 */ + avio_wb32(pb, 0); /* projection_bounds_top */ + avio_wb32(pb, 0); /* projection_bounds_bottom */ + avio_wb32(pb, 0); /* projection_bounds_left */ + avio_wb32(pb, 0); /* projection_bounds_right */ + break; + case AV_SPHERICAL_EQUIRECTANGULAR_TILE: + avio_wb32(pb, 28); /* size */ + ffio_wfourcc(pb, "equi"); + avio_wb32(pb, 0); /* version = 0 & flags = 0 */ + avio_wb32(pb, spherical_mapping->bound_top); + avio_wb32(pb, spherical_mapping->bound_bottom); + avio_wb32(pb, spherical_mapping->bound_left); + avio_wb32(pb, spherical_mapping->bound_right); + break; + case AV_SPHERICAL_CUBEMAP: + avio_wb32(pb, 20); /* size */ + ffio_wfourcc(pb, "cbmp"); + avio_wb32(pb, 0); /* version = 0 & flags = 0 */ + avio_wb32(pb, 0); /* layout */ + avio_wb32(pb, spherical_mapping->padding); /* padding */ + break; + } + update_size(pb, proj_pos); + + return update_size(pb, sv3d_pos); +} + static int mov_write_pasp_tag(AVIOContext *pb, MOVTrack *track) { AVRational sar; @@ -1873,6 +1968,16 @@ static int mov_write_video_tag(AVIOContext *pb, MOVMuxContext *mov, MOVTrack *tr av_log(mov->fc, AV_LOG_WARNING, "Not writing 'colr' atom. Format is not MOV or MP4.\n"); } + if (mov->fc->strict_std_compliance <= FF_COMPLIANCE_EXPERIMENTAL) { + AVStereo3D* stereo_3d = (AVStereo3D*) av_stream_get_side_data(track->st, AV_PKT_DATA_STEREO3D, NULL); + AVSphericalMapping* spherical_mapping = (AVSphericalMapping*)av_stream_get_side_data(track->st, AV_PKT_DATA_SPHERICAL, NULL); + + if (stereo_3d) + mov_write_st3d_tag(pb, stereo_3d); + if (spherical_mapping) + mov_write_sv3d_tag(pb, spherical_mapping); + } + if (track->par->sample_aspect_ratio.den && track->par->sample_aspect_ratio.num) { mov_write_pasp_tag(pb, track); } -- 2.12.1.578.ge9c3154ca4-goog