From patchwork Sat May 30 16:05:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19998 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 7DE4244A6AD for ; Sat, 30 May 2020 19:06:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6222A68B01A; Sat, 30 May 2020 19:06:32 +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 0F78668AF9D for ; Sat, 30 May 2020 19:06:21 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id c71so6672796wmd.5 for ; Sat, 30 May 2020 09:06:21 -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=MGbXr8ScFT/REdSDUQ/AV+dATEHB4DGXbln6RvcDHg0=; b=L1gAEEKELoeQyqCMxj5s5MIm86witebyioAFRbg0i7GpS/zSkpIDLU9jyUhWSe9XFL tyb8+4xOhDm0JCZzmNC7RoJoDxHRZbWnqBw/6EgAEwMpvF8qdy34t7H4e99AZbnSKQv3 Jk2Lv4foftMX1Zh+EtwJvA/Nq5gdR0d3jlR3vAiKOq24Fk19i53T32VDzrXVWHOi4fAL 7tX9BSS9uulfnxMx1hR6OrlUPBdLzegb88pPIZoVqfFdOLMQIqysBdVVIA1ANRi60yen oPlHg9KfXTLRo3/9FEpZ9Q+XFfv5VKU333YG+GLIRog3ncurU9zzsEPD0XhhRfxBafEs 7tPg== 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=MGbXr8ScFT/REdSDUQ/AV+dATEHB4DGXbln6RvcDHg0=; b=TySWrXW+YsY9ByxIDi50mX1k8+5NUMy0h18I9OcO7qDTJHmzZipRduClHXcTI6chQs w7HC1+fvA609ANFuC4JlzMgc797apYl2a4iYbIg4PpP7J2LIrhN1swt5iXu8/2uj9i2G TuwcSSVk5nK8TbBpUw19m7zVMK1v/X89eR9tP8RiCnxWY+F5FOjWjFPPXHLc1mOkMjaF 5Yj50j3aCg+RTOUQRV46sivNEqRUzH3+CpDZXBfczGgzMx67FjOB4QBZCton5zn9+EPe Bp3Zll5VfYs/5jNUyPNb/1tkJCtBHZ+ILLUSv57wBHCt8YtUqfbaLs+97E6CLBmjtKV8 FCDg== X-Gm-Message-State: AOAM531lHuqjFKXHvNXLB9oaPEDsOaSkoJKm1EylN9na1dysrrouB0bx GGQsMOnsKAXWp65EoupiGhVt12/8 X-Google-Smtp-Source: ABdhPJw06HP4h5kbmNx33cY8Rqv1KVBT6KxH3EAeBmyHOt2RQtXW0C9M7vd9yMXHYrWMrhIvC8GLeQ== X-Received: by 2002:a05:600c:34e:: with SMTP id u14mr13836355wmd.16.1590854780174; Sat, 30 May 2020 09:06:20 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:19 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:14 +0200 Message-Id: <20200530160541.29517-9-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 09/36] avcodec/vp9_superframe_split_bsf: Don't restrict frame_size to INT_MAX/8 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" By using a GetBitContext with a packet's data as buffer, one restricts said packet to a size of about INT_MAX/8. This restriction is not onerous, but unnecessary: The bitreader is only used to read the first byte of data. So change it. Furthermore, given that it has already been checked that the packet's size is > 0, one can omit the check for whether init_get_bits() succeeds and stop unreferencing the packet destined for output on failure as it now never contains any data upon failure. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9_superframe_split_bsf.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/vp9_superframe_split_bsf.c b/libavcodec/vp9_superframe_split_bsf.c index df5b964414..48c3723206 100644 --- a/libavcodec/vp9_superframe_split_bsf.c +++ b/libavcodec/vp9_superframe_split_bsf.c @@ -108,9 +108,7 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out) if (s->next_frame >= s->nb_frames) av_packet_unref(s->buffer_pkt); - ret = init_get_bits8(&gb, out->data, out->size); - if (ret < 0) - goto fail; + init_get_bits(&gb, out->data, 8); get_bits(&gb, 2); // frame_marker profile = get_bits1(&gb); @@ -131,8 +129,6 @@ static int vp9_superframe_split_filter(AVBSFContext *ctx, AVPacket *out) return 0; fail: - if (ret < 0) - av_packet_unref(out); av_packet_unref(s->buffer_pkt); return ret; }