From patchwork Wed Mar 8 19:46:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 2838 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp10427vsy; Wed, 8 Mar 2017 11:47:24 -0800 (PST) X-Received: by 10.28.91.1 with SMTP id p1mr9729965wmb.63.1489002444163; Wed, 08 Mar 2017 11:47:24 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l24si5635987wrb.169.2017.03.08.11.47.23; Wed, 08 Mar 2017 11:47:24 -0800 (PST) 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=@gmail.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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6E5E06882EA; Wed, 8 Mar 2017 21:47:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCF056882AF for ; Wed, 8 Mar 2017 21:47:00 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id n141so14150671qke.3 for ; Wed, 08 Mar 2017 11:47:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=sIdzG0WOBLQ4pNwlDepWdukFK6q3SLgk9Eulf7L9fqU=; b=gnZ9LlO/MaII0F9jMVJmG4E7iNVBykNnPDW4WeGNfznlS0LGWlfCEzDlkf4WGUQYsZ s74ZytxgDJHwWKSsdcPA+Wg6AOYxoGWH1iZju1Jjksk0/0jISCKm6v/FnrttfXcqOrBa DJazLQd1UJ9ekSVvPbXtaAzQJ/LnhxoO+ThJszB2L82uIMs5ERwI6y/+ibJ5Xr1lZaVO 2V8O9QoWlAQkx62f0B2VdubxS5kJHwImicikPQ/LP08IZLpKCUdSl4/hBORsUVV4LAQA xFfC6cgzIj1xe0CTwnTHNJv8jxqVMAkCWDWalDP6Em/igJyBOFf3/k84XPfoBzTxlgqO guUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=sIdzG0WOBLQ4pNwlDepWdukFK6q3SLgk9Eulf7L9fqU=; b=UWpgEWvgNl3e2Eh0Atf06kgMIOOmCsra+0DieS63zs8Xw5zcm7RZm06yhWjIQlNOW7 JAwRfPuxMlWuvWoAiQPMlsm74k0yQAIyuwhpMv6GJCwWEv9LVolExgXgloouLlet/nPg 8N9YNJWV8O6qQgFWrGdNwZb/jlrte7XpZxxJS7Z8MZeBtxEtw55eEonvYGDkzojNIItR btD9x/UuqN8KShsvAloR/o+pklnfiJsS+ULhbmJATyY/rZDt6mzqySBBTrWETuo+aq0B 38KnYGvk8aFntqjI3t8sMTzNBXWysoVT4X0lm6UHsA4mgU6WY9UJzwZnWFxyZkR9tOCh FOaA== X-Gm-Message-State: AMke39mUpatV7zUqemFFICS4QhNBmHw1ppeteXPnGhatZq17oPgeftfF9tzN3eTAkM9Z1w== X-Received: by 10.200.57.106 with SMTP id t39mr10386354qtb.20.1489002433037; Wed, 08 Mar 2017 11:47:13 -0800 (PST) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id s46sm2736185qtc.62.2017.03.08.11.47.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Mar 2017 11:47:12 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Mar 2017 16:46:49 -0300 Message-Id: <20170308194649.5728-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.0 Subject: [FFmpeg-devel] [PATCH] avformat/matroskaenc: add support for Spherical Video elements 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 Cc: Vittorio Giovara MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavformat/matroskaenc.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 1605f0cafe..0ee927d63e 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -918,6 +918,72 @@ static int mkv_write_video_color(AVIOContext *pb, AVCodecParameters *par, AVStre return 0; } +static int mkv_write_video_projection(AVIOContext *pb, AVStream *st) { + int side_data_size = 0; + const AVSphericalMapping *spherical = + (const AVSphericalMapping*) av_stream_get_side_data(st, AV_PKT_DATA_SPHERICAL, + &side_data_size); + + if (side_data_size == sizeof(AVSphericalMapping)) { + AVIOContext *dyn_cp; + uint8_t *projection_ptr; + int ret, projection_size; + + ret = avio_open_dyn_buf(&dyn_cp); + if (ret < 0) + return ret; + + switch (spherical->projection) { + case AV_SPHERICAL_EQUIRECTANGULAR_TILE: + { + uint8_t private[20]; + put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE, + MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR); + AV_WB32(private + 0, 0); // version + flags + 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); + put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE, private, sizeof(private)); + break; + } + case AV_SPHERICAL_EQUIRECTANGULAR: + put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE, + MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR); + break; + case AV_SPHERICAL_CUBEMAP: + { + uint8_t private[12]; + put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE, + MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP); + AV_WB32(private + 0, 0); // version + flags + AV_WB32(private + 4, 0); // layout + AV_WB32(private + 8, spherical->padding); + put_ebml_binary(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPRIVATE, private, sizeof(private)); + break; + } + default: + // TODO: Mesh projection once implemented in AVSphericalMapping + goto end; + } + + put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEYAW, (double)spherical->yaw / (1 << 16)); + put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH, (double)spherical->pitch / (1 << 16)); + put_ebml_float(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONPOSEROLL, (double)spherical->roll / (1 << 16)); + +end: + projection_size = avio_close_dyn_buf(dyn_cp, &projection_ptr); + if (projection_size) { + ebml_master projection = start_ebml_master(pb, MATROSKA_ID_VIDEOPROJECTION, projection_size); + avio_write(pb, projection_ptr, projection_size); + end_ebml_master(pb, projection); + } + av_freep(&projection_ptr); + } + + return 0; +} + static void mkv_write_field_order(AVIOContext *pb, int mode, enum AVFieldOrder field_order) { @@ -1268,6 +1334,9 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, ret = mkv_write_video_color(pb, par, st); if (ret < 0) return ret; + ret = mkv_write_video_projection(pb, st); + if (ret < 0) + return ret; end_ebml_master(pb, subinfo); break;