From patchwork Wed Mar 29 02:55:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3164 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.44.195 with SMTP id s186csp900930vss; Tue, 28 Mar 2017 19:58:29 -0700 (PDT) X-Received: by 10.223.161.132 with SMTP id u4mr19925340wru.203.1490756309184; Tue, 28 Mar 2017 19:58:29 -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 136si5454121wmr.62.2017.03.28.19.58.28; Tue, 28 Mar 2017 19:58:29 -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=@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 963996899F8; Wed, 29 Mar 2017 05:57:55 +0300 (EEST) 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 BC1656883DA for ; Wed, 29 Mar 2017 05:57:48 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id p22so459716qka.0 for ; Tue, 28 Mar 2017 19:58:11 -0700 (PDT) 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=5FDY1tCeUYdfsziaS0mCtbcwnxprlseNr2oTH71w8PY=; b=MSQYRiVaJ/If+RVCSJXlnCs6EiZOCQRlS92C4SWTNzdtesULgLBuoAjA4VNXwSXcBo GrF+w9KEKEk3MRhMqVdtrOxomCysx2T4evf6h0gaq5QvQxWQx82kk61GUfdq3HmpyJwE 4OmXeuWhV8vYuc8fH1FgywEXlzH7a3Dlqoe5o9soaxVt9t7MMLh3fsAqq9m+hR1xcFIT NBzIq3Z4yL1t6XDD3Wp3rXBOPigOMSHBE9bUl68mh+5klfEwLPKQwDBIQ0q3B+gfiSR6 PjHJVZe5R1Tws86NkYtxTxRda+ckZ5eC52KSW/BEQGTeeox1LeEEuczH0Yu/jWZTvGg5 9cyA== 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=5FDY1tCeUYdfsziaS0mCtbcwnxprlseNr2oTH71w8PY=; b=uCkKZl9Fa+64/qBNexlckUbaSYu2kFk7EdF1fdsYnh9VtmTmw1EgZgFlFMQumTm79h tDYl3DQL6tf9RZc8et0M9drOgXvMIbedTGrWuqKLW9LYUO20eYJ8lqrNteyJgNqcnk8c NvrIE9nB6kBm8dRrM2ZOYeZYTZmtevtc4SnBPN1a7JiOU5dj3J/8+4y8zdc6R8yBaJ8s dhRxVUYBQ/b6cOLTcI4Kqt3pSVWEYLgFyQwN0eKtBKOfT2DAMii8exAbi7uXVZH6+0cW Uj4WkIV32qlTjkgmxsrL2SNRPhkQ343NN+zhBovRV1/2Hb9C33XVnyxw9QOg7N2qbU0L a+pg== X-Gm-Message-State: AFeK/H0NHyzFenqU2A59Sv+8hgrAGJlWasC0m72O6IkerzgPwM87waY+N6+dYQ710pp34g== X-Received: by 10.55.75.86 with SMTP id y83mr14301440qka.25.1490756290251; Tue, 28 Mar 2017 19:58:10 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id e16sm4018899qkj.64.2017.03.28.19.58.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Mar 2017 19:58:09 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Mar 2017 23:55:56 -0300 Message-Id: <20170329025557.952-2-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170329025557.952-1-jamrial@gmail.com> References: <20170329025557.952-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] avformat/dump: use av_spherical_projection_name() to print spherical projection names 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/dump.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/libavformat/dump.c b/libavformat/dump.c index 3e6218303d..cb0468559e 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -353,21 +353,18 @@ static void dump_spherical(void *ctx, AVCodecParameters *par, AVPacketSideData * return; } - if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR) - av_log(ctx, AV_LOG_INFO, "equirectangular "); - else if (spherical->projection == AV_SPHERICAL_CUBEMAP) - av_log(ctx, AV_LOG_INFO, "cubemap "); - else if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE) - av_log(ctx, AV_LOG_INFO, "tiled equirectangular "); - else { - av_log(ctx, AV_LOG_WARNING, "unknown"); + av_log(ctx, AV_LOG_INFO, "%s", av_spherical_projection_name(spherical->projection)); + + if (spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR && + spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR_TILE && + spherical->projection != AV_SPHERICAL_CUBEMAP) { return; } yaw = ((double)spherical->yaw) / (1 << 16); pitch = ((double)spherical->pitch) / (1 << 16); roll = ((double)spherical->roll) / (1 << 16); - av_log(ctx, AV_LOG_INFO, "(%f/%f/%f) ", yaw, pitch, roll); + av_log(ctx, AV_LOG_INFO, " (%f/%f/%f) ", yaw, pitch, roll); if (spherical->projection == AV_SPHERICAL_EQUIRECTANGULAR_TILE) { size_t l, t, r, b;