From patchwork Sat May 30 16:05:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20003 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 96B3C44A6AD for ; Sat, 30 May 2020 19:06:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7F4F368B096; Sat, 30 May 2020 19:06:41 +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 7C84F68B00A for ; Sat, 30 May 2020 19:06:31 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id f5so7144995wmh.2 for ; Sat, 30 May 2020 09:06:31 -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=hDWtWs85vmKn1IdaWKQsZwGW7f+TreR5LAvhAFCPorw=; b=c6Gjy/6YoYXYS6cZ1G2C5j+ZFNedfNcNCQ346IivruYaWQwmUd82aAe3hVBPl9PxhK 6wmfOSIjuvWC7ScjhPJSz0sxqcYNnHjTilWCqLmR0lmfpuB9OE8WDXT9MiNJgeTbr3r8 vlGgmq7mn6ijbqBLHdj7NI5rblgViT8j9oyeUL098FaH3uKc4SCnCZ2JaZRCUC5Gsf5H ERzNfhYyK0P3JnwTVhiFrJ//Nf4A6XpFqpcgI71PQBaGH7iMYSMK/dQP1Bbxuob1f+RW 9h2+FTC8Y+GDfA325MGEtCEXdwWkFjjp2ym6GgIfr0uxkRYyacbyzZrN+zZlRfpiciVk PeCw== 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=hDWtWs85vmKn1IdaWKQsZwGW7f+TreR5LAvhAFCPorw=; b=nFDGkm9e921127Yycd97BT09RnSI5Wr0+OgZyk2qP8fwKty7lHCwGosGkFxb1NDopC p43HQ7Y/gdwtS6iFIq3qlSF9dBVZFEgeZEPLiiHiFvTqrNXEQ6V+lAWlhyxXeHkynUKv z/IlKhxhUezQu6FPjOk5lJfHjvxpbub+pBvygAny9Hh3gqKtT+w6qSGB7CE9H6mRACLE CjPb1331m2fgY9LnCY0Pqj1hx0fyY6zggNyKHwNCP9SKt3zs6WTTtTlYsQP6jk4wFlWx RKNO5nmfKYU1YRRxxrFhzw1b2GKV2HndH2plukKhJwHuxJ6Mn9Cyl+Zsb1rcmKHcIgbw WOWw== X-Gm-Message-State: AOAM532ePH7WggklXg3SdDUrRjehBC6nGY2wLtu7x6IlbbYzgsEVhqfO fiZHyiwO35+XC27W/aLrGKNCJfaV X-Google-Smtp-Source: ABdhPJycLnuE3r2QbnpQZOLpqHXS4teBFCSlyWldpls6UrRMc5+r0oi27gCEMPRAX4pF4OgP+2ojIw== X-Received: by 2002:a7b:c5cc:: with SMTP id n12mr13633106wmk.69.1590854790467; Sat, 30 May 2020 09:06:30 -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.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:29 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:21 +0200 Message-Id: <20200530160541.29517-16-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 16/36] avcodec/mjpega_dump_header_bsf: Only allocate when necessary 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" This avoids having to free a buffer that hasn't been used at all. Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpega_dump_header_bsf.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libavcodec/mjpega_dump_header_bsf.c b/libavcodec/mjpega_dump_header_bsf.c index 1cd2b48719..4608fe550b 100644 --- a/libavcodec/mjpega_dump_header_bsf.c +++ b/libavcodec/mjpega_dump_header_bsf.c @@ -42,6 +42,13 @@ static int mjpega_dump_header(AVBSFContext *ctx, AVPacket *out) if (ret < 0) return ret; + for (i = 0; i < in->size - 3; i++) { + if (in->data[i] == 0xff) { + switch (in->data[i + 1]) { + case DQT: dqt = i + 46U; break; + case DHT: dht = i + 46U; break; + case SOF0: sof0 = i + 46U; break; + case SOS: ret = av_new_packet(out, in->size + 44U); if (ret < 0) goto fail; @@ -61,14 +68,6 @@ static int mjpega_dump_header(AVBSFContext *ctx, AVPacket *out) bytestream_put_be32(&out_buf, in->size + 44U); /* field size */ bytestream_put_be32(&out_buf, in->size + 44U); /* pad field size */ bytestream_put_be32(&out_buf, 0); /* next ptr */ - - for (i = 0; i < in->size - 3; i++) { - if (in->data[i] == 0xff) { - switch (in->data[i + 1]) { - case DQT: dqt = i + 46U; break; - case DHT: dht = i + 46U; break; - case SOF0: sof0 = i + 46U; break; - case SOS: bytestream_put_be32(&out_buf, dqt); /* quant off */ bytestream_put_be32(&out_buf, dht); /* huff off */ bytestream_put_be32(&out_buf, sof0); /* image off */ @@ -82,7 +81,6 @@ static int mjpega_dump_header(AVBSFContext *ctx, AVPacket *out) case APP1: if (i + 12U <= in->size && AV_RL32(in->data + i + 8) == AV_RL32("mjpg")) { av_log(ctx, AV_LOG_ERROR, "bitstream already formatted\n"); - av_packet_unref(out); av_packet_move_ref(out, in); av_packet_free(&in); return 0;