From patchwork Wed Mar 15 21:39:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vittorio Giovara X-Patchwork-Id: 2940 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp480555vsy; Wed, 15 Mar 2017 14:45:37 -0700 (PDT) X-Received: by 10.28.95.87 with SMTP id t84mr21043315wmb.35.1489614337853; Wed, 15 Mar 2017 14:45:37 -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 y190si1952379wmy.7.2017.03.15.14.45.37; Wed, 15 Mar 2017 14:45:37 -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 9D69F680CE0; Wed, 15 Mar 2017 23:45:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EB8606803BC for ; Wed, 15 Mar 2017 23:45:09 +0200 (EET) Received: by mail-qt0-f193.google.com with SMTP id r45so3580514qte.0 for ; Wed, 15 Mar 2017 14:45:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=q4HpATIKdAZ8avG+Oe0R5gUik0bOD+yWeZ2zr07n914=; b=YDSERWLR/JwdA8mIeraOXpoeyADvvkb0zRWwlboOSSwGpJROruX+g/J+XbdGO+XCcS QpX1dUX2HhObZlCl45c64NxzyAc9ZoJ7BCfmd2Dr21PBQzW0vvoBmisIPIe8YwdRnUDD Y33/GtN6HIQDxWuWDEK+/J3glTBqnlPkBfKxGagepr85uJZGwpfHVQbb/HGFYuSghlV+ JybAFZi6W940Sx4HFz9LbX8+u6YTH0ITou5Nanaoje2yTQXS5wFDX8MezLI2YzEW8BFP IHN8rQ5s0Yiq0bWdOTSEfU2yv0k0fKDF6x+Dq2t5S8l/jxwy3wZihaJp7lbHMn3p3JzV XkTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=q4HpATIKdAZ8avG+Oe0R5gUik0bOD+yWeZ2zr07n914=; b=ntbH1c7RKJsNEOtqm0pHqpgGCss8FmKLPuxi0OUHl5+9yBRVBfyjN1+5OwFPObMa1G HD7iEHuOcVyTDGbTswq63S69OTl6MqFmsOxwTNfTFymA713+NgnJPQTklW593CAPuLjp u61klDZQ2ZJ3xbJE5HeSZojstsnfz+4RNyk0LDHQLkluYtxHlIw1hxaaWbgiWN/2YSkU wByp/7Hu1AuruoOOCAecrGwbuEc1cViIFnCFSQwrRBspjPkXowC4zPzuD02/h7Esi3pH +qp7mTVW39WjndwmjDpsZFoEmPO++DKhX3BTw56mPGTzxZ8ScesqGB45UyxvxGZDx+Uk wkbw== X-Gm-Message-State: AFeK/H31/KeF1rdTY3L9gg4AOCNsibK6gZe9g6QcJTgtcOzARZgrq/4hokGnqz25uGgvCQ== X-Received: by 10.200.1.142 with SMTP id x14mr5619682qtf.170.1489613971869; Wed, 15 Mar 2017 14:39:31 -0700 (PDT) Received: from vimacbookpro.vimeows.com ([8.40.92.161]) by smtp.gmail.com with ESMTPSA id 34sm2214160qtx.16.2017.03.15.14.39.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 15 Mar 2017 14:39:31 -0700 (PDT) From: Vittorio Giovara To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Mar 2017 17:39:30 -0400 Message-Id: <20170315213930.24234-1-vittorio.giovara@gmail.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170315145454.896.86101@localhost> References: <20170315145454.896.86101@localhost> Subject: [FFmpeg-devel] [PATCH] spherical: Change types of bounding and pad to uint32_t 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" These values are defined to be 32bit in the specification, so it makes more sense to store them as fixed width. Signed-off-by: Vittorio Giovara --- Updated commit message, changed a couple of internal types. Please CC or I can't see replies. Vittorio libavformat/dump.c | 2 +- libavformat/matroskadec.c | 6 +++--- libavformat/mov.c | 7 +++---- libavutil/spherical.h | 10 +++++----- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/libavformat/dump.c b/libavformat/dump.c index 7514aee7ac..c56895628d 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -339,7 +339,7 @@ static void dump_spherical(void *ctx, AVCodecParameters *par, AVPacketSideData * &l, &t, &r, &b); av_log(ctx, AV_LOG_INFO, "[%zu, %zu, %zu, %zu] ", l, t, r, b); } else if (spherical->projection == AV_SPHERICAL_CUBEMAP) { - av_log(ctx, AV_LOG_INFO, "[pad %zu] ", spherical->padding); + av_log(ctx, AV_LOG_INFO, "[pad %"PRIu32"] ", spherical->padding); } } diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 4fbf4b9a96..c6e1a190a8 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1601,8 +1601,8 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) AVSphericalMapping *spherical; enum AVSphericalProjection projection; size_t spherical_size; - size_t l = 0, t = 0, r = 0, b = 0; - size_t padding = 0; + uint32_t l = 0, t = 0, r = 0, b = 0; + uint32_t padding = 0; int ret; GetByteContext gb; @@ -1627,7 +1627,7 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) if (b >= UINT_MAX - t || r >= UINT_MAX - l) { av_log(NULL, AV_LOG_ERROR, "Invalid bounding rectangle coordinates " - "%zu,%zu,%zu,%zu\n", l, t, r, b); + "%"PRIu32",%"PRIu32",%"PRIu32",%"PRIu32"\n", l, t, r, b); return AVERROR_INVALIDDATA; } } else if (track->video.projection.private.size != 0) { diff --git a/libavformat/mov.c b/libavformat/mov.c index c6e7a38398..1c1857eaf9 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3237,9 +3237,8 @@ static int mov_read_sv3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) MOVStreamContext *sc; int size, version, layout; int32_t yaw, pitch, roll; - size_t l = 0, t = 0, r = 0, b = 0; - size_t padding = 0; - uint32_t tag; + uint32_t l = 0, t = 0, r = 0, b = 0; + uint32_t tag, padding = 0; enum AVSphericalProjection projection; if (c->fc->nb_streams < 1) @@ -3335,7 +3334,7 @@ static int mov_read_sv3d(MOVContext *c, AVIOContext *pb, MOVAtom atom) if (b >= UINT_MAX - t || r >= UINT_MAX - l) { av_log(c->fc, AV_LOG_ERROR, "Invalid bounding rectangle coordinates " - "%zu,%zu,%zu,%zu\n", l, t, r, b); + "%"PRIu32",%"PRIu32",%"PRIu32",%"PRIu32"\n", l, t, r, b); return AVERROR_INVALIDDATA; } diff --git a/libavutil/spherical.h b/libavutil/spherical.h index e7fc1d69fb..fd662cf676 100644 --- a/libavutil/spherical.h +++ b/libavutil/spherical.h @@ -164,10 +164,10 @@ typedef struct AVSphericalMapping { * projection type (@ref AV_SPHERICAL_EQUIRECTANGULAR_TILE), * and should be ignored in all other cases. */ - size_t bound_left; ///< Distance from the left edge - size_t bound_top; ///< Distance from the top edge - size_t bound_right; ///< Distance from the right edge - size_t bound_bottom; ///< Distance from the bottom edge + uint32_t bound_left; ///< Distance from the left edge + uint32_t bound_top; ///< Distance from the top edge + uint32_t bound_right; ///< Distance from the right edge + uint32_t bound_bottom; ///< Distance from the bottom edge /** * @} */ @@ -179,7 +179,7 @@ typedef struct AVSphericalMapping { * (@ref AV_SPHERICAL_CUBEMAP), and should be ignored in all other * cases. */ - size_t padding; + uint32_t padding; } AVSphericalMapping; /**