From patchwork Wed Mar 8 21:24:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 2839 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp45300vsy; Wed, 8 Mar 2017 13:25:26 -0800 (PST) X-Received: by 10.28.169.87 with SMTP id s84mr24004145wme.77.1489008326655; Wed, 08 Mar 2017 13:25:26 -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 90si5928796wrd.118.2017.03.08.13.25.26; Wed, 08 Mar 2017 13:25:26 -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 A2EA7688305; Wed, 8 Mar 2017 23:25:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAE2D680757 for ; Wed, 8 Mar 2017 23:25:02 +0200 (EET) Received: by mail-qk0-f193.google.com with SMTP id v125so14929346qkh.1 for ; Wed, 08 Mar 2017 13:25:16 -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:in-reply-to:references; bh=cQYlUyAGJ/LLUn+62vuwiPbhpLhH+6084WfbZaZKWtE=; b=nsWzuedbIJfhunaAD9KztWIchAwWGO5bokN0ROVi2h9AMp0i/JrxeiqFLylg7sxYdi gMSLYMKf59ofvSwxxbvJbA0ywxWP1LiIEpkyj3WFhcbA072Dw4ZUfcSkyOrU5Sm98RHI Rq9Mmwtye/TnZe2meI/+btU0++0zeq0lGQ78nL8lfosKaADqzxm8vBc+8wZJk9y5M/js s1q5Xf5b+F3VCcDSyrdoLK7KsAWvDhkaxwePIBbLjY7R710XKEyJS6uLGoKEAfHVUX/m 8QgAsUvc8PlT6VxaAnG3/YVMngjfbisa7Zte0O/B5zESZoodZA92Np+Wot7rsNYZVQEU +SRg== 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:in-reply-to :references; bh=cQYlUyAGJ/LLUn+62vuwiPbhpLhH+6084WfbZaZKWtE=; b=KOWdJ61cM8qn57h17I3+BsLdTk1OUwPjy/Wlw6FBEoUkbr5BohgjuA8F349/K0/ADY f01uvMeEcGtv3AHm5o+ZbNC3KaMMjwecJLTZpsCkpRw2msfEWA2hi6sazhOOhQKILfLo xfa8VuyDQ4R0Xd3WydSLwLQE/Vpt1VtkcCNbf9tjvy/xQQVy+IS0EGYRk7ibBaZQETDI 1ets0i7HbcT6tmHN2CTkMqE1W7Gh8o0tTUyn/8hiVmN25ymWY895FfdHpEXT4+lcIY6N RWEwY05er+Yjgm/iz+Stg8v+dur/XLZQWVjbyuWnCvKzvR9s6OX3IyiSzWxM9DsQaLJa GGug== X-Gm-Message-State: AMke39nqhmnWSQmVOVa/mKsNxjdH4kr+/emdu3bt/YFy0OBhMt2Cwb+jBQZRU3Nsk0H7mA== X-Received: by 10.237.53.231 with SMTP id d36mr10112094qte.240.1489008315383; Wed, 08 Mar 2017 13:25:15 -0800 (PST) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id o16sm2904540qkl.67.2017.03.08.13.25.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Mar 2017 13:25:14 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Mar 2017 18:24:36 -0300 Message-Id: <20170308212436.4944-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH v2] 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 | 75 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 1605f0cafe..70b0ced226 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -918,6 +918,78 @@ 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) { + 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]; + AVIOContext b; + ffio_init_context(&b, private, sizeof(private), + 1, NULL, NULL, NULL, NULL); + put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE, + MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR); + avio_wb32(&b, 0); // version + flags + avio_wb32(&b, spherical->bound_top); + avio_wb32(&b, spherical->bound_bottom); + avio_wb32(&b, spherical->bound_left); + avio_wb32(&b, 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]; + AVIOContext b; + ffio_init_context(&b, private, sizeof(private), + 1, NULL, NULL, NULL, NULL); + put_ebml_uint(dyn_cp, MATROSKA_ID_VIDEOPROJECTIONTYPE, + MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP); + avio_wb32(&b, 0); // version + flags + avio_wb32(&b, 0); // layout + avio_wb32(&b, 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 +1340,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;