From patchwork Sat May 30 16:05:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20029 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bac9:0:0:0:0:0 with SMTP id a9csp1500953ybk; Sat, 30 May 2020 09:12:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/hePSv1IewKVEwFL/Fkca0M9yAFxRCmc4AttIFZtk6fP/zJmBlkbe6Zuh3urufh/+slx1 X-Received: by 2002:a5d:6b81:: with SMTP id n1mr13700282wrx.411.1590855121964; Sat, 30 May 2020 09:12:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590855121; cv=none; d=google.com; s=arc-20160816; b=FiZHQAIfcQw6Coq8q46po0vIFnZhmog9fXE8KHJlbMtIIsjxhlEPyTCCbDI7I8HM35 RmMi0cFehK3XaXnnN30n6U20RUnpZsDl9jhSlrmoIgtUw0kVnpdudSwgERKXCblAhRMh r+LW64fo0HUPurVKTY9sgySvQHd/tFcq2wZ6MMvRJNESQca01tyjZT6As/wBzoWz8t7y MHqO8GnDH4CcfGsIAN71Piz1PK3xIp4pPbq/2UKIlVCbNXq3sId19QVwGEBaTSb987r3 9CqEXGCABHfSIUvv+iuv+NAZs4Xk1ghwAjktwpOzFMCuuRFOOfqH7UnXIAvzbCKdCoA7 uhLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=Dd0ShlStgd58sQ3vvYT+SQzHopuZvZrCIsiEKl/uufc=; b=gfIVJGqCjt6o1xRNu4H1xlHJC3+UsVBc5Jywvf9TugP24d2xYJA3yMtYLMGiHc1IWQ i1xhfGVw8tJ+QRv2T8b1pkYxpnpee5acWpf+n+tG2mDADdC+6YMszbGkc9PJbfzm912I dIajc2IzHClVgJMiH+s3o+gMl/Bj1zhkiBvFHfX/1Bg2Pioi2r/OviFckqGRoEYOMDb4 M88CHtVrJYcwM68/8r6u6Of7zO6loTfLQ76BUyI+fd8cFYfpn6AHduhcHsPjuByzk1cj Q5BBjPodMf2oSqBCRYiFIFvtM1KwkuvgJTwA6PnYyKWMyb0TW2fA/WfsGSdJAISVGThQ OmTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WD3vKZyI; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l9si3060913wmg.167.2020.05.30.09.12.01; Sat, 30 May 2020 09:12:01 -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 header.s=20161025 header.b=WD3vKZyI; 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=QUARANTINE 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 9A36968B087; Sat, 30 May 2020 19:07:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9058568B112 for ; Sat, 30 May 2020 19:06:52 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id r15so7114255wmh.5 for ; Sat, 30 May 2020 09:06:52 -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=7AbrS/LXwDv+Tr0duKSmTkM/zIqXkJasgcmSL42KJpc=; b=WD3vKZyIgzbg9V1xHrfoJIVQyaQwrZMwOoLvC6/0gDch6PGiaz2hhj0ANTS0iaogwI DNqw6sONupUzRH7x8jdFE891zrEbXWa8ev6cXpbN1avojHVOlGMDyM60oYfIpUjeG7tX 1cSb4WXtdIvYNrw5wGrxPc1iDPqZFbNgXtRCkZoii9bf3LrnPlF9jBgvHnsXE/QKq0xQ ldNcjHDvOVvHoy1Cx5hB61+oMtz1qA4MEiSe1d5FYykhkhgDFzVFQpmAxc60HKNDYeqc uUkr0YkUbNP9uSRVst3PgYx6aNYkxuNJnpT+BadUI74XSTFjF3m2TiupJDxzp7i0FdWD rbhQ== 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=7AbrS/LXwDv+Tr0duKSmTkM/zIqXkJasgcmSL42KJpc=; b=t2HJ1hY9DLkMNDica6PhtmbR5oIvYUoNc2q5IoPsoDfYuPjklqeJGu0sQD1o3lRNCx kP817eW+dDvihmxOOax291oyXeTSFGfiPV4cyMwT83cMtC+dGBwSRT0aoSGAHgpKN6n9 Q+uobv2yCTfSewdHavB81lRY9Z3wp+AHpEgs5eI7/q0H8IVO7p+1UGvT6fThGSGOBqCf liLdYfTMjedVL2zxkTY3D+MqMTvd+LK2U4r5qe9mSK5RHVs9kFwILBf6yCxlLnoSA8UG ia4cHGDTsBHQ/J8Rdqp00o9vHFkepj4if+BTcWSkrPrwr7kr4PS2ynFYLXV5/xLQMpgB 59cw== X-Gm-Message-State: AOAM5332StN3W0OK9J62M9e8+BxdD3KM7RfEyL1blV/h4mQVsL5o05G6 mOsgZYYATnsGK80+vrMXYap5umHW X-Received: by 2002:a1c:230a:: with SMTP id j10mr13470509wmj.124.1590854811724; Sat, 30 May 2020 09:06:51 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v27sm15186517wrv.81.2020.05.30.09.06.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:51 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:38 +0200 Message-Id: <20200530160541.29517-33-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> References: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 33/36] avcodec/dump_extradata_bsf: Store pointer for access 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" X-TUID: 8A3t5T8uo85P Content-Length: 3457 Using par->extradata instead of ctx->par_in->extradata makes the code more readable and removes an overlong line. Furthermore, check for extradata_size instead of for the existence of extradata as nothing needs to be done in case extradata_size is zero. Signed-off-by: Andreas Rheinhardt --- libavcodec/dump_extradata_bsf.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/dump_extradata_bsf.c b/libavcodec/dump_extradata_bsf.c index b6ef8b3e6b..be5e23ba5b 100644 --- a/libavcodec/dump_extradata_bsf.c +++ b/libavcodec/dump_extradata_bsf.c @@ -40,6 +40,7 @@ typedef struct DumpExtradataContext { static int dump_extradata(AVBSFContext *ctx, AVPacket *out) { DumpExtradataContext *s = ctx->priv_data; + const AVCodecParameters *par; AVPacket *in = &s->pkt; int ret = 0; @@ -47,17 +48,17 @@ static int dump_extradata(AVBSFContext *ctx, AVPacket *out) if (ret < 0) return ret; - if (ctx->par_in->extradata && + if ((par = ctx->par_in)->extradata_size && (s->freq == DUMP_FREQ_ALL || (s->freq == DUMP_FREQ_KEYFRAME && in->flags & AV_PKT_FLAG_KEY)) && - (in->size < ctx->par_in->extradata_size || - memcmp(in->data, ctx->par_in->extradata, ctx->par_in->extradata_size))) { - if (in->size >= INT_MAX - ctx->par_in->extradata_size) { + (in->size < par->extradata_size || + memcmp(in->data, par->extradata, par->extradata_size))) { + if (in->size >= INT_MAX - par->extradata_size) { ret = AVERROR(ERANGE); goto fail; } - ret = av_new_packet(out, in->size + ctx->par_in->extradata_size); + ret = av_new_packet(out, in->size + par->extradata_size); if (ret < 0) goto fail; @@ -67,8 +68,8 @@ static int dump_extradata(AVBSFContext *ctx, AVPacket *out) goto fail; } - memcpy(out->data, ctx->par_in->extradata, ctx->par_in->extradata_size); - memcpy(out->data + ctx->par_in->extradata_size, in->data, in->size); + memcpy(out->data, par->extradata, par->extradata_size); + memcpy(out->data + par->extradata_size, in->data, in->size); } else { av_packet_move_ref(out, in); }