From patchwork Fri Apr 19 23:41:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 12831 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 6EE714494CF for ; Sat, 20 Apr 2019 02:50:34 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B0A368AB39; Sat, 20 Apr 2019 02:50:34 +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 7BF2968AA98 for ; Sat, 20 Apr 2019 02:50:32 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id w10so8528072wrm.4 for ; Fri, 19 Apr 2019 16:50:32 -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=TpvK6ildeqLPqJQ18vODKgRzzIxoouwnRxAFgOMWntk=; b=O/UbXcbVFq83mEKST/b7b+5gPB3v4vluYobKDVd0N8KbshrMr7RP4LvycBR68vOWS/ hfw/nOUdS2L3kqwEZdg1FzGaMUfiwvbysGY27Ff3ECy0UVZ8Lffy1FZjaNGkVR99k6Ft 8GkW/sfigMmQbWoanGsrNXovbulaNh/SeiAzufCSucZ08Y1vKvh1uKkV6zKrZshY+Yp2 dOKK+pUU+GEjN/pBE9FzJv+lS7iW5RDUDIbjTWsLm4vW9NaqQLlSjO1pEX4HTj4IPNcR ILTTDdhr5Ah8nZlDs60oFlByLFI1N21JewuHCm56SU9eytmSXwKk7r9okHV2rCKwPrQP h48Q== 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=TpvK6ildeqLPqJQ18vODKgRzzIxoouwnRxAFgOMWntk=; b=p5/5ZBNm7KX9pt+DAIzpnE3oW0qWJbaXuG8i37WNd9HLmv/o+usEggucgm5fKVtCdd 0iJAERv1Fi1e7ZDh1rP4T59wthj/epXPm2VoasT3jxCEGHDJzpF8iTDM+vsnZfwWNxNo ibbKMWsENIIBWbgm/UTpz2R6hVXCk6ChIpylgBFE44st8IlEg59iF84PtyqMTSrFxHgs 1QnUQQLNwar/pPW7NkkUY7tbPPgRhG7Cp5plz9/yVkVxVr1ImFNAmxdxNoYBPy7HCrVs tPhsUgq/qQgSOnMz0jLJFgZT09kW8aa/AsRQr2kccdU7WBGG6/OkfTTwXRXdME7IFDx7 PAxg== X-Gm-Message-State: APjAAAWJfuctOIiucICvuftBubqVzbmwONkuCYiOj3TcP7/+BG2BkCFa W8t0krxqg4KL9u81PmIFQPw9HHIO X-Google-Smtp-Source: APXvYqx7fMYn6Hon1ZH96nN58fqECrMwjhKYp2G7B5OR8BElzLQ9UYNXVYdIF/oPMyR0PDESiNce7Q== X-Received: by 2002:adf:ea92:: with SMTP id s18mr4652993wrm.61.1555717831655; Fri, 19 Apr 2019 16:50:31 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.gmail.com with ESMTPSA id t14sm6002395wmi.16.2019.04.19.16.50.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 16:50:31 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 20 Apr 2019 01:41:04 +0200 Message-Id: <20190419234110.32980-9-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190419234110.32980-1-andreas.rheinhardt@gmail.com> References: <20190402133305.3328-1-andreas.rheinhardt@googlemail.com> <20190419234110.32980-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/15] avformat/matroskaenc: Change variable types 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" A Matroska EBML ID can only be maximally four bytes long, so make the variables denoting EBML IDs uint32_t instead of unsigned int to better reflect this. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 316a632805..0be33419eb 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -63,7 +63,7 @@ typedef struct ebml_master { } ebml_master; typedef struct mkv_seekhead_entry { - unsigned int elementid; + uint32_t elementid; uint64_t segmentpos; } mkv_seekhead_entry; @@ -182,12 +182,12 @@ typedef struct MatroskaMuxContext { /** Seek preroll value for opus */ #define OPUS_SEEK_PREROLL 80000000 -static int ebml_id_size(unsigned int id) +static int ebml_id_size(uint32_t id) { return (av_log2(id + 1) - 1) / 7 + 1; } -static void put_ebml_id(AVIOContext *pb, unsigned int id) +static void put_ebml_id(AVIOContext *pb, uint32_t id) { int i = ebml_id_size(id); while (i--) @@ -242,7 +242,7 @@ static void put_ebml_num(AVIOContext *pb, uint64_t num, int bytes) avio_w8(pb, (uint8_t)(num >> i * 8)); } -static void put_ebml_uint(AVIOContext *pb, unsigned int elementid, uint64_t val) +static void put_ebml_uint(AVIOContext *pb, uint32_t elementid, uint64_t val) { int i, bytes = 1; uint64_t tmp = val; @@ -255,7 +255,7 @@ static void put_ebml_uint(AVIOContext *pb, unsigned int elementid, uint64_t val) avio_w8(pb, (uint8_t)(val >> i * 8)); } -static void put_ebml_sint(AVIOContext *pb, unsigned int elementid, int64_t val) +static void put_ebml_sint(AVIOContext *pb, uint32_t elementid, int64_t val) { int i, bytes = 1; uint64_t tmp = 2*(val < 0 ? val^-1 : val); @@ -268,14 +268,14 @@ static void put_ebml_sint(AVIOContext *pb, unsigned int elementid, int64_t val) avio_w8(pb, (uint8_t)(val >> i * 8)); } -static void put_ebml_float(AVIOContext *pb, unsigned int elementid, double val) +static void put_ebml_float(AVIOContext *pb, uint32_t elementid, double val) { put_ebml_id(pb, elementid); put_ebml_num(pb, 8, 0); avio_wb64(pb, av_double2int(val)); } -static void put_ebml_binary(AVIOContext *pb, unsigned int elementid, +static void put_ebml_binary(AVIOContext *pb, uint32_t elementid, const void *buf, int size) { put_ebml_id(pb, elementid); @@ -283,7 +283,7 @@ static void put_ebml_binary(AVIOContext *pb, unsigned int elementid, avio_write(pb, buf, size); } -static void put_ebml_string(AVIOContext *pb, unsigned int elementid, +static void put_ebml_string(AVIOContext *pb, uint32_t elementid, const char *str) { put_ebml_binary(pb, elementid, str, strlen(str)); @@ -312,7 +312,7 @@ static void put_ebml_void(AVIOContext *pb, uint64_t size) ffio_fill(pb, 0, currentpos + size - avio_tell(pb)); } -static ebml_master start_ebml_master(AVIOContext *pb, unsigned int elementid, +static ebml_master start_ebml_master(AVIOContext *pb, uint32_t elementid, uint64_t expectedsize) { int bytes = expectedsize ? ebml_num_size(expectedsize) : 8; @@ -332,7 +332,7 @@ static void end_ebml_master(AVIOContext *pb, ebml_master master) } static int start_ebml_master_crc32(AVIOContext *pb, AVIOContext **dyn_cp, MatroskaMuxContext *mkv, - ebml_master *master, unsigned int elementid, uint64_t expectedsize) + ebml_master *master, uint32_t elementid, uint64_t expectedsize) { int ret; @@ -463,7 +463,7 @@ static mkv_seekhead *mkv_start_seekhead(AVIOContext *pb, int64_t segment_offset, return new_seekhead; } -static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, unsigned int elementid, uint64_t filepos) +static int mkv_add_seekhead_entry(mkv_seekhead *seekhead, uint32_t elementid, uint64_t filepos) { mkv_seekhead_entry *entries = seekhead->entries; @@ -1575,7 +1575,7 @@ static int mkv_write_simpletag(AVIOContext *pb, AVDictionaryEntry *t) } static int mkv_write_tag_targets(AVFormatContext *s, - unsigned int elementid, unsigned int uid, + uint32_t elementid, unsigned int uid, ebml_master *tags, ebml_master* tag) { AVIOContext *pb; @@ -1599,7 +1599,7 @@ static int mkv_write_tag_targets(AVFormatContext *s, return 0; } -static int mkv_check_tag_name(const char *name, unsigned int elementid) +static int mkv_check_tag_name(const char *name, uint32_t elementid) { return av_strcasecmp(name, "title") && av_strcasecmp(name, "stereo_mode") && @@ -1613,7 +1613,7 @@ static int mkv_check_tag_name(const char *name, unsigned int elementid) av_strcasecmp(name, "mimetype"))); } -static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int elementid, +static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, uint32_t elementid, unsigned int uid, ebml_master *tags) { MatroskaMuxContext *mkv = s->priv_data; @@ -1637,7 +1637,7 @@ static int mkv_write_tag(AVFormatContext *s, AVDictionary *m, unsigned int eleme return 0; } -static int mkv_check_tag(AVDictionary *m, unsigned int elementid) +static int mkv_check_tag(AVDictionary *m, uint32_t elementid) { AVDictionaryEntry *t = NULL; @@ -2117,7 +2117,7 @@ fail: } static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, - unsigned int blockid, AVPacket *pkt, int keyframe) + uint32_t blockid, AVPacket *pkt, int keyframe) { MatroskaMuxContext *mkv = s->priv_data; AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;