From patchwork Mon Sep 7 13:17:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22158 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 122A844AF76 for ; Mon, 7 Sep 2020 16:24:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E0DF268AA42; Mon, 7 Sep 2020 16:24:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1A7E36881FC for ; Mon, 7 Sep 2020 16:24:41 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id s13so14352633wmh.4 for ; Mon, 07 Sep 2020 06:24:41 -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:mime-version :content-transfer-encoding; bh=rt5NCvz1pOj8BmjUvj6qQz6xdS46qw7LVST49QmaCX8=; b=ESdFDvygSTttp7G6MImuyakYC0Ll+nprRwJ49wEct8vuopQR6/w+uDHoFoLPxAPmF7 HTzGn2vfPWVtdEKF2biEyv9yBSu4Y++WNcQIGsitaaN4ChhmLRlLU7lyrInYVZu0v+Mv Ab6Jgr3DHxLjDAzfPqpdw5ksE6prJSFOCBi4yuxIfvNZe2WWwYGT+CW3oNr0ZB5+259r 9XLf3JIGsth1XcfkOt8Wx8x4eNQJ50ZcUbKJh7NmyxE4+87R5FveWRd8TykSxnnJSDIh T6vAJe+lFsB9qBVBFvJKlOriP8Rp5fNfJPXEDI4B0QBCKUJ2CAuPucHO7qAWg3kHmcSy 75JA== 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:mime-version :content-transfer-encoding; bh=rt5NCvz1pOj8BmjUvj6qQz6xdS46qw7LVST49QmaCX8=; b=QyJbnPr8PbXWgYtpGUTUaR6a8vo+vspW6otT8kZkeNQA/Qj8zB20sycbR2eshtfpCY JNLuAWSmXvBwholSwI/gnBNq1C2ny4hJY3QmLh8gW1x6zm70GgfubCv6Q15cOXjcqVdS FryjJRyBVIKuhLAGEZqaWGv9rud/MNW33zLRCkSHtao4p8Y1n4rzGQWf8KjFITVeoNL2 2X8499XIesCwBf10nJ879xZQp+i6JAHHFRJ90sYThflTdW1cW5Rivh1dHLm8mGKg5mhn ES+NEA1xKPvYr9cF3hx7TOWIGQccEwvU9RXbfQsJjfHn0/FzlO9QutShEEsfkjrSZhbE ZPBw== X-Gm-Message-State: AOAM53255ca/cPP05eY2HkYosKrk1nkNgSdK+r25bLiWC4jbJ9hIwbB2 JSPioUgsDlldvjC8yC9+2Ex2pQocLXg= X-Google-Smtp-Source: ABdhPJxnGAKyL+Ia5hA10oXoS/jXzD+4oCE3eNQAQtK6/0nODP2eQeENaFIBdiDy+lh16Zp4W2Jw3Q== X-Received: by 2002:a7b:c111:: with SMTP id w17mr20001617wmi.109.1599484632825; Mon, 07 Sep 2020 06:17:12 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z9sm27542416wmg.46.2020.09.07.06.17.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2020 06:17:12 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Sep 2020 15:17:04 +0200 Message-Id: <20200907131706.29060-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/extract_extradata: Consolidate zeroing extradata padding 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/extract_extradata_bsf.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index 1fead74b57..6e80076522 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -103,7 +103,6 @@ static int extract_extradata_av1(AVBSFContext *ctx, AVPacket *pkt, av_buffer_unref(&filtered_buf); return AVERROR(ENOMEM); } - memset(extradata + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); *data = extradata; *size = extradata_size; @@ -198,7 +197,6 @@ static int extract_extradata_h2645(AVBSFContext *ctx, AVPacket *pkt, av_buffer_unref(&filtered_buf); return AVERROR(ENOMEM); } - memset(extradata + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); *data = extradata; *size = extradata_size; @@ -254,7 +252,6 @@ static int extract_extradata_vc1(AVBSFContext *ctx, AVPacket *pkt, return AVERROR(ENOMEM); memcpy(*data, pkt->data, extradata_size); - memset(*data + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); *size = extradata_size; if (s->remove) { @@ -285,7 +282,6 @@ static int extract_extradata_mpeg12(AVBSFContext *ctx, AVPacket *pkt, return AVERROR(ENOMEM); memcpy(*data, pkt->data, *size); - memset(*data + *size, 0, AV_INPUT_BUFFER_PADDING_SIZE); if (s->remove) { pkt->data += *size; @@ -315,7 +311,6 @@ static int extract_extradata_mpeg4(AVBSFContext *ctx, AVPacket *pkt, return AVERROR(ENOMEM); memcpy(*data, pkt->data, *size); - memset(*data + *size, 0, AV_INPUT_BUFFER_PADDING_SIZE); if (s->remove) { pkt->data += *size; @@ -377,6 +372,7 @@ static int extract_extradata_filter(AVBSFContext *ctx, AVPacket *pkt) goto fail; if (extradata) { + memset(extradata + extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); ret = av_packet_add_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, extradata, extradata_size); if (ret < 0) { From patchwork Mon Sep 7 13:17:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22156 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 DCBED44A1D2 for ; Mon, 7 Sep 2020 16:22:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C11C368AB1D; Mon, 7 Sep 2020 16:22:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EF3D6880BE for ; Mon, 7 Sep 2020 16:22:48 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id y15so1589876wmi.0 for ; Mon, 07 Sep 2020 06:22:48 -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=hSLTQQvcDNJG71BffYeeWnVfc+D5UAtUXSz/t/6RQeg=; b=aP0XmrsNx96mQ0jk9VK/T2HD0Vbe/Cgt0OfxK62sqXsMlJCTlrze9PdODBmdF516KZ 1MifyQ5ANoj3ePK4I+9KXvi9BDR2XsbdgLnIkRN1tizI3GBQDsoUPtmVZY2lsznyDANz DtYGK0GI5wyXFwlZTLw9BKDdN4GMyPCqYgxhigDGRl/xOkHCEIGBIJyc8lMnVqzUlIdK 8LB2rBbqPXveeY30YbusTvjJXaRWEWglVUXftZy/8zjAQMQ8+guZzdlZfZBuZhNb8Xon YdokaSre2IIe6zOoq9fxAfGTSX8PU80w0/z1R9naAWcoZz/uwudlb5i1VuGXNm1ztMim svyw== 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=hSLTQQvcDNJG71BffYeeWnVfc+D5UAtUXSz/t/6RQeg=; b=TBmI4/KWO65eyE55sN9YPKYm6200G7sq3XcZdXI03QOTmKxGxvc/6Wn8WidU5qJ6n5 StGlBlJcNqfctzcc8RA1kPYp5pJInZzCLLjNAf8t0GJUZNMYXwdH6A8f35WFwnkh4Drf 81db2GZwFchruEIuP+wXAmyP8/3T3Kl3Y6bpsGm30RzgpYxuKcvs7TMp+fFhEr8h1bhr iDDuC+wMW2KZywxebKEB6zL690I6aSCgSObL0KNXNW9JAIxoNBrhrXdChdVaNRCngEfX eLp8u61EF3xqb81UXGYpDaimlfLIIRg+/eDcjpYV5spXP79SpIITCfIrcOYdJh1PaiPm vykQ== X-Gm-Message-State: AOAM533PxEt22s1aekOPc8oP9h/MPi8qfndEMW0a5ZpGIIizZpgb/jda iaBatnaUPlg6vnyTbj8qMyZNf+fh6kA= X-Google-Smtp-Source: ABdhPJxBQ58rIudjVH3zP0K+SsLWtv3ZexjGxd2e6ldPCXgMZnTJWeF3qfW30a3U1Jg5pI665r+ZxA== X-Received: by 2002:a1c:b407:: with SMTP id d7mr22026170wmf.59.1599484967700; Mon, 07 Sep 2020 06:22:47 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z9sm27542416wmg.46.2020.09.07.06.22.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2020 06:22:47 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Sep 2020 15:17:05 +0200 Message-Id: <20200907131706.29060-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200907131706.29060-1-andreas.rheinhardt@gmail.com> References: <20200907131706.29060-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/extract_extradata: Remove always-true check 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" If a sequence header has already been found, it is certain that the next startcode (being disjoint from the sequence header startcode) can begin at index four at the earliest. Signed-off-by: Andreas Rheinhardt --- libavcodec/extract_extradata_bsf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index 6e80076522..38517bdcf3 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -275,7 +275,6 @@ static int extract_extradata_mpeg12(AVBSFContext *ctx, AVPacket *pkt, if (state == 0x1B3) found = 1; else if (found && state != 0x1B5 && state < 0x200 && state >= 0x100) { - if (i > 3) { *size = i - 3; *data = av_malloc(*size + AV_INPUT_BUFFER_PADDING_SIZE); if (!*data) @@ -287,7 +286,6 @@ static int extract_extradata_mpeg12(AVBSFContext *ctx, AVPacket *pkt, pkt->data += *size; pkt->size -= *size; } - } break; } } From patchwork Mon Sep 7 13:17:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 22157 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 02DA544A1D2 for ; Mon, 7 Sep 2020 16:22:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D7DBF68A3FE; Mon, 7 Sep 2020 16:22:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7AD826880BE for ; Mon, 7 Sep 2020 16:22:49 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id a9so14221295wmm.2 for ; Mon, 07 Sep 2020 06:22:49 -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=rP7neMcZ9J58tx/4OXnmACMIa0lv+GY42bpNnE9cif4=; b=b0Im6zSnqhHNGLeVScDvqAk1TNTVtEH3EY31Gd99+YK1nVDDNA561ofkYkhfk1PWM/ XPIqeV+DiW1LA/1XRF17d7ipo/UqCKTfCy+zQd2z8ndwE5db+n/KKt3WRIZWIdTO7BPC Wa7VX/O8iP5Bfjd4HDfxmiRRjzhVeQNwGn7gz+nKZppx4YM2d+3Cs9Wd2LYsG7b5k3DV Ozn64pJ82uhsksG7POjr4DbZxr7j2AV7FRAz7Aslk+Mj4gr/xg2E+469vigu+C591x4C M//8IehU+YMB6/nac+yuF/7zMit7JWdIhEEvE2ahNcKq4jKHGKTVk/tsgqAd1leR79WQ J4GA== 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=rP7neMcZ9J58tx/4OXnmACMIa0lv+GY42bpNnE9cif4=; b=hlz43gAdMOFCywyefBLWZjGQX+Q4WeKDqvZTWRrj2gwYlI1KxHuhQ0hPhuE0sYVpBC 47smWb/zr/wXHYc9bwLYJWm8xtcBCX6H/3N6vH49gDfT5FycQAzuE1EUY8HpQgbOh5ic gEp7KMwj8GA+yThQX1i0KBhMT/CJQ9eOCsglCxiRx5b19/QPQBiXbK6o+xe3qPFDptgC 1UmsfyCidqtrGX0ANOPg3acZkbqrreDqvW5HTRAhCuYX883vzqtG5H6TlilfIeaRPKd7 wtfTMBQ1qyhmtfGBO5JJnksNExGMx2vWfgeL/Uq2j7YuYzhZZnjRfcbajUodeIuDSXuH b8EQ== X-Gm-Message-State: AOAM531JxkNaUTK62arF1HmhHln5dVZ6h10bS0SRtZR2Qep0CXI4aoNX jVpf8T2CGq1zUD2gcpEBc84zipf/Ipg= X-Google-Smtp-Source: ABdhPJwFvJ7cn01bBygS5e6Ea6E+/jwPxrA38tZH9IWfG5OyaeTyFKOsmklI0ITScYtHt4TnlDZBMg== X-Received: by 2002:a7b:c095:: with SMTP id r21mr21945926wmh.133.1599484968772; Mon, 07 Sep 2020 06:22:48 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1fb0f.dynamic.kabel-deutschland.de. [188.193.251.15]) by smtp.gmail.com with ESMTPSA id z9sm27542416wmg.46.2020.09.07.06.22.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2020 06:22:48 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Sep 2020 15:17:06 +0200 Message-Id: <20200907131706.29060-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200907131706.29060-1-andreas.rheinhardt@gmail.com> References: <20200907131706.29060-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/extract_extradata: Reindent after the last commit 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/extract_extradata_bsf.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index 38517bdcf3..32c732f52b 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -275,17 +275,17 @@ static int extract_extradata_mpeg12(AVBSFContext *ctx, AVPacket *pkt, if (state == 0x1B3) found = 1; else if (found && state != 0x1B5 && state < 0x200 && state >= 0x100) { - *size = i - 3; - *data = av_malloc(*size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!*data) - return AVERROR(ENOMEM); + *size = i - 3; + *data = av_malloc(*size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!*data) + return AVERROR(ENOMEM); - memcpy(*data, pkt->data, *size); + memcpy(*data, pkt->data, *size); - if (s->remove) { - pkt->data += *size; - pkt->size -= *size; - } + if (s->remove) { + pkt->data += *size; + pkt->size -= *size; + } break; } }