From patchwork Thu May 16 22:30:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13152 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 67F3944964F for ; Fri, 17 May 2019 01:43:30 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 541D968A52D; Fri, 17 May 2019 01:43:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D695368A196 for ; Fri, 17 May 2019 01:43:26 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id c5so5012145wrs.11 for ; Thu, 16 May 2019 15:43:26 -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 :mime-version:content-transfer-encoding; bh=g5QVyR9oggb/Y83fwJZZKwkYSvHR4ngLnbhBHL8X+MA=; b=PBTN512E94nuHXyD83m8ZQs1DpGgl7dMWnklU2LOYAAUaHRx9HelQFYPv4HrhyeAV7 gyyBVEqiijsXKLYS84SFeWS+BudfGpkqrzp01VWwXIOl2JqKxNXkWLkEhS3jgdHcv+qe iNjgNHzVI1gQ4k2poEZfrcJ1yqWVXsrqynheHozlZuWmNsO5LQXNwjBLZ41tEINmW8jf a/Ld3CMcIkUHNOpX9f0RCA1fXaSXM7ggWbO90NNv85NJd6SqYDVBJQy+9cs3rm4qkEiF X1pw56R1YMuXi3nnzeQSp3XUrZ6/hgfLM89w0ji1mEK265DbD5ksQOtnLyON272mhW4N vcbA== 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:mime-version:content-transfer-encoding; bh=g5QVyR9oggb/Y83fwJZZKwkYSvHR4ngLnbhBHL8X+MA=; b=Q3+8D456F0dSVrZO97rRTOXXljIRCorDx27cYxfHvEqRPFiRhWpcBBIovYW+X8ybPR DugV5IteDfk0vfsb6hroIQ2Dv3ruP6dBbjoMxcCT4NIYSg3fM4yNL1wuRmTe/Rl+3oGV 0y4eYFgRQXFvHODb62NClYKxciXRjk9yCSpKvY4u0dxr3ZNFTVya+Z6Fs+CNzFTsUNHz xoBACyKtDf02oU+uJ0Ek5qCHsUA5U7O2pCld/0Wb2asloK1IHHRSVXvMXOI/zyZ/0LX1 m8qTu48Cqo2DAEXwMd9/Vr5OP5EZg8qFi8xWQkNcssjJ0r162wj17KQbsGWIGjDpshKh b/Ag== X-Gm-Message-State: APjAAAVtT47H3aWTvQ88SNeg883jJZRAXC0geYUuWZoqdrKRH4cbVRDJ PFtdq7K9ytVtXtcuabEsXpapBnNR X-Google-Smtp-Source: APXvYqzoprwA/mhPXsS6XufLbYtkWau4okjnAT8KFNnAwrVLQ40xcgHomIdvHE5kA0q14BNnCk4S9Q== X-Received: by 2002:adf:978b:: with SMTP id s11mr8804241wrb.169.1558046606100; Thu, 16 May 2019 15:43:26 -0700 (PDT) Received: from localhost.localdomain (ipbcc18715.dynamic.kabel-deutschland.de. [188.193.135.21]) by smtp.gmail.com with ESMTPSA id i185sm11168725wmg.32.2019.05.16.15.43.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 May 2019 15:43:25 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 17 May 2019 00:30:13 +0200 Message-Id: <20190516223018.30827-30-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190516223018.30827-1-andreas.rheinhardt@gmail.com> References: <20190516223018.30827-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 29/37] avformat/matroskadec: Typos, nits and cosmetics 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Cosmetics include reordering EbmlType so that EBML_SINT is adjacent to the other numbers (and matches the order in the switch in ebml_parse) and also reordering the switch for assignment of default values so that it matches the order in EbmlType. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 3dddcd234f..2fab6612fa 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -77,6 +77,7 @@ typedef enum { EBML_NONE, EBML_UINT, + EBML_SINT, EBML_FLOAT, EBML_STR, EBML_UTF8, @@ -84,7 +85,6 @@ typedef enum { EBML_NEST, EBML_LEVEL1, EBML_STOP, - EBML_SINT, EBML_TYPE_COUNT } EbmlType; @@ -183,7 +183,7 @@ typedef struct MatroskaTrackVideo { uint64_t display_height; uint64_t pixel_width; uint64_t pixel_height; - EbmlBin color_space; + EbmlBin color_space; uint64_t display_unit; uint64_t interlaced; uint64_t field_order; @@ -314,7 +314,7 @@ typedef struct MatroskaBlock { EbmlBin bin; uint64_t additional_id; EbmlBin additional; - int64_t discard_padding; + int64_t discard_padding; } MatroskaBlock; typedef struct MatroskaCluster { @@ -334,8 +334,8 @@ typedef struct MatroskaDemuxContext { AVFormatContext *ctx; /* EBML stuff */ - int num_levels; MatroskaLevel levels[EBML_MAX_DEPTH]; + int num_levels; uint32_t current_id; int64_t resync_pos; @@ -343,7 +343,7 @@ typedef struct MatroskaDemuxContext { double duration; char *title; char *muxingapp; - EbmlBin date_utc; + EbmlBin date_utc; EbmlList tracks; EbmlList attachments; EbmlList chapters; @@ -1072,12 +1072,12 @@ static int ebml_parse_nest(MatroskaDemuxContext *matroska, EbmlSyntax *syntax, for (i = 0; syntax[i].id; i++) switch (syntax[i].type) { - case EBML_SINT: - *(int64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.i; - break; case EBML_UINT: *(uint64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.u; break; + case EBML_SINT: + *(int64_t *) ((char *) data + syntax[i].data_offset) = syntax[i].def.i; + break; case EBML_FLOAT: *(double *) ((char *) data + syntax[i].data_offset) = syntax[i].def.f; break; @@ -1172,7 +1172,6 @@ static int ebml_parse(MatroskaDemuxContext *matroska, uint64_t length; int64_t pos = avio_tell(pb), pos_alt; int res, update_pos = 1, level_check; - void *newelem; MatroskaLevel1Element *level1_elem; MatroskaLevel *level = matroska->num_levels ? &matroska->levels[matroska->num_levels - 1] : NULL; @@ -1228,7 +1227,8 @@ static int ebml_parse(MatroskaDemuxContext *matroska, data = (char *) data + syntax->data_offset; if (syntax->list_elem_size) { EbmlList *list = data; - newelem = av_realloc_array(list->elem, list->nb_elem + 1, syntax->list_elem_size); + void *newelem = av_realloc_array(list->elem, list->nb_elem + 1, + syntax->list_elem_size); if (!newelem) return AVERROR(ENOMEM); list->elem = newelem; @@ -1251,8 +1251,6 @@ static int ebml_parse(MatroskaDemuxContext *matroska, pos_alt += res; if (matroska->num_levels > 0) { - MatroskaLevel *level = &matroska->levels[matroska->num_levels - 1]; - if (length != EBML_UNKNOWN_LENGTH && level->length != EBML_UNKNOWN_LENGTH) { uint64_t elem_end = pos_alt + length, @@ -1719,9 +1717,8 @@ static void matroska_convert_tags(AVFormatContext *s) static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, uint64_t pos) { - uint32_t saved_id = matroska->current_id; + uint32_t saved_id = matroska->current_id; int64_t before_pos = avio_tell(matroska->ctx->pb); - MatroskaLevel level; int64_t offset; int ret = 0; @@ -1736,9 +1733,7 @@ static int matroska_parse_seekhead_entry(MatroskaDemuxContext *matroska, "cannot parse further.\n", EBML_MAX_DEPTH); ret = AVERROR_INVALIDDATA; } else { - level.start = 0; - level.length = EBML_UNKNOWN_LENGTH; - matroska->levels[matroska->num_levels] = level; + matroska->levels[matroska->num_levels] = (MatroskaLevel) { 0, EBML_UNKNOWN_LENGTH }; matroska->num_levels++; matroska->current_id = 0; @@ -2770,7 +2765,7 @@ static int matroska_read_header(AVFormatContext *s) /* The next thing is a segment. */ pos = avio_tell(matroska->ctx->pb); res = ebml_parse(matroska, matroska_segments, matroska); - // try resyncing until we find a EBML_STOP type element. + // Try resyncing until we find an EBML_STOP type element. while (res != 1) { res = matroska_resync(matroska, pos); if (res < 0) @@ -3621,8 +3616,8 @@ static int matroska_parse_cluster(MatroskaDemuxContext *matroska) block->discard_padding); } - ebml_free(matroska_blockgroup, block); - memset(block, 0, sizeof(*block)); + ebml_free(matroska_blockgroup, block); + memset(block, 0, sizeof(*block)); } else if (!matroska->num_levels) { if (!avio_feof(matroska->ctx->pb)) { avio_r8(matroska->ctx->pb); @@ -4038,7 +4033,7 @@ static int webm_dash_manifest_cues(AVFormatContext *s, int64_t init_range) // cues end av_dict_set_int(&s->streams[0]->metadata, CUES_END, cues_end, 0); - // if the file has cues at the start, fix up the init range so tht + // if the file has cues at the start, fix up the init range so that // it does not include it if (cues_start <= init_range) av_dict_set_int(&s->streams[0]->metadata, INITIALIZATION_RANGE, cues_start - 1, 0);