From patchwork Tue Mar 7 22:35:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 2792 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp766140vsy; Tue, 7 Mar 2017 14:35:34 -0800 (PST) X-Received: by 10.28.238.66 with SMTP id m63mr2822238wmh.121.1488926134619; Tue, 07 Mar 2017 14:35:34 -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 62si1738432wro.132.2017.03.07.14.35.30; Tue, 07 Mar 2017 14:35:34 -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 D2DCE6807EB; Wed, 8 Mar 2017 00:35:13 +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 D357B6804B4 for ; Wed, 8 Mar 2017 00:35:07 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id o135so5367232qke.2 for ; Tue, 07 Mar 2017 14:35:21 -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=o/IjJ9MMlgrGm2+0res3wW7wmV9TJhg3IFht+GpL/EQ=; b=FAbNFWKxp3KPY6dV6Z0Kj2p3pgmhAy9G8hnk0T4mQWiaz3c5mURXHl4/U+Kd77vk54 n88NGjlKJNhCqmLvnFx67lYIEOJUHXMwxMG2XxSb+eDDxTXl0j4nZT5cN0X0EUZT6NnC DT2LgWEao4dM6VnIDnzQaXhDaBV0X14ve27XHBtx1DUExfrPRLYAnSsjqPAOawsmSf/N lMjLQYnX7DsbSZkHmChZgYoFLs/N53cocEAdT8nXEMbBOQFJQKz9TrPjX5gbrhpG839k 3Z49D8Zw/H2nbGs4BNqKXtZavJTI6V5uWGbNuO1ChX8+1uI3MMtzY/bTNsK15boKqlTL t6Mg== 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=o/IjJ9MMlgrGm2+0res3wW7wmV9TJhg3IFht+GpL/EQ=; b=bgtMVoYtvW7OWNBoee5mWwe3cCQCxq8Yo02VvM8Cs+u1/sVs6uYNNi2uNsW/lLDlrN ShrTrpgwFg6O2dSUUQLaEcYdpWT3W0x8X4A1k9zPbWZG50xQSuAYFmcLpO42AU52u3cP fJY+Fa5fIOX31QwqUCcZrYAk253PmpR2NNdGPSyEUrVldxBX1qoQI8KDL1jnKhEvMlKY dZ/l8RLIr2mD8mrgkt2lZrpamsrsTtGUeMzGmR0WbGWAIKaBNIb6PnhP5ENc+DzEQloG XYRkdAZ90zdMYqxfxDM1tJdIJd0BZXYUEU7z09Lq0Kgw6tqxx+oQeKRFyH4cJ1o9nRXh 8ybQ== X-Gm-Message-State: AMke39nvYnDItw7fff665/0idFtJJwFgRDxgs6SXX4sJcyg/Z5EkguTJ7APGrxtO9tG98A== X-Received: by 10.233.220.134 with SMTP id q128mr3406052qkf.220.1488926120081; Tue, 07 Mar 2017 14:35:20 -0800 (PST) Received: from vimacbookpro.vimeows.com ([8.40.92.161]) by smtp.gmail.com with ESMTPSA id n130sm918037qkn.4.2017.03.07.14.35.19 (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 07 Mar 2017 14:35:19 -0800 (PST) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Mar 2017 17:35:18 -0500 Message-Id: <20170307223518.36948-1-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] matroskadec: cosmetics: Rearrange checks for projection-depedendent properties 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: jamrial@gmail.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- ... and this chunk for matroska too. Vittorio libavformat/matroskadec.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index fdc3f268aa..fdb23ab05e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1930,9 +1930,7 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) switch (track->video.projection.type) { case MATROSKA_VIDEO_PROJECTION_TYPE_EQUIRECTANGULAR: - if (track->video.projection.private.size == 0) - projection = AV_SPHERICAL_EQUIRECTANGULAR; - else if (track->video.projection.private.size == 20) { + if (track->video.projection.private.size == 20) { t = bytestream2_get_be32(&gb); b = bytestream2_get_be32(&gb); l = bytestream2_get_be32(&gb); @@ -1946,15 +1944,15 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) l, t, r, b); return AVERROR_INVALIDDATA; } - - if (l || t || r || b) - projection = AV_SPHERICAL_EQUIRECTANGULAR_TILE; - else - projection = AV_SPHERICAL_EQUIRECTANGULAR; - } else { + } else if (track->video.projection.private.size != 0) { av_log(NULL, AV_LOG_ERROR, "Unknown spherical metadata\n"); return AVERROR_INVALIDDATA; } + + if (l || t || r || b) + projection = AV_SPHERICAL_EQUIRECTANGULAR_TILE; + else + projection = AV_SPHERICAL_EQUIRECTANGULAR; break; case MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP: if (track->video.projection.private.size < 4) { @@ -1962,13 +1960,12 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) return AVERROR_INVALIDDATA; } else if (track->video.projection.private.size == 12) { uint32_t layout = bytestream2_get_be32(&gb); - if (layout == 0) { - projection = AV_SPHERICAL_CUBEMAP; - } else { + if (layout) { av_log(NULL, AV_LOG_WARNING, "Unknown spherical cubemap layout %"PRIu32"\n", layout); return 0; } + projection = AV_SPHERICAL_CUBEMAP; padding = bytestream2_get_be32(&gb); } else { av_log(NULL, AV_LOG_ERROR, "Unknown spherical metadata\n");