From patchwork Tue Feb 6 22:57:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46087 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a38a:b0:19e:8a94:b663 with SMTP id w10csp172624pzk; Tue, 6 Feb 2024 14:57:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IFHJiMkLRPfVMWQmulupQNVfdZIvaLTwKI0dv1wBlh3BEGGBGQLe/Y9UrJIcymP3Z+iG5kH X-Received: by 2002:a17:906:a450:b0:a37:1263:811 with SMTP id cb16-20020a170906a45000b00a3712630811mr2583553ejb.1.1707260266255; Tue, 06 Feb 2024 14:57:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707260266; cv=none; d=google.com; s=arc-20160816; b=o3mIudpO5yE9m9Wu4SSZVCidhl0Xv6EjOdhcz7hPhDqu2LKEWf4b+1VtOvtkah9rAd 6bRd+Z7Zocb4Zj1ohk7UVgVxIwAKzSWnyjK93ZBvDsGfSuYpcePD0bZBXNr3V/8xUPiL C1aL4m/x86eon4t+fFlHmGoxa0FVuFWZY+DyY2eLjOQ+IjKD/DPCAUA1i1bxOtOl7Wt+ sveWm9sljtOnX8mC+nuCIgzeZRtQJzp/QySK39gmrTHrUUBAg4Dr9hQ8Yt3Uw/0Aqcep R8S+1m9bcKcMQPkiUh7CGsG1LQ9O3UUF2QziNi+F4mbU4S3iCOfXCC/e93X5oEzlT9tf Y8qQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=yJeaxOrYCRkxF64pJgHi+bpBVpjsxhDcWu1lgHjY3YA=; fh=4G6qoHQPJtiv4rRUcFkvMbDmmDZv1YAy2IBxqi1bQK8=; b=sf0Fu/wG7CGH1RZiXDojX7PgqVPShxMjKyDqBPtY/+q91g2dYM9kuhDZ/ZSvG8WndQ JYlFxJKbcPdWTNxwKEIOJ0xcwYasUxsU170ueJG8KtY5hAnEvpiQYF/R1oqRTx9MIvBn XzybvLL78ZzGF5jjBhV6XX73Oc42YEEWDTRoryij498jQXz8qbYsW5ONORt/unqt/C+x umPKbJRh39UC+IygNiFgHb0Ev4UtyeANiyBokgpLKOHbeysIlxyv8+mJASagEk4Ocix+ WcQeo6bopiNmmFW05Ul6HLKuUeZrKmE1MnMGlCM00vaqtzWbS6tc8/SGo7WYE75OPGLe HUVg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=hi5fXvGp; 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 X-Forwarded-Encrypted: i=1; AJvYcCVslHLpmsl2CEVaP9+6qg+G3A/wnzruhG8xdrB9Dp8BJwmbQqa7/NdOLCXsQlUlbmswdl3BfPYuxYuAiGjBvN1is2waiuAZ3gzUDF9ULSZqezPFALhyyt+PEqANQX1rZA9rgKtSF1DwRT5zoAoas7d7t7EIdpxfZfS9pHlPpr+ZKIW7m/iNrAs0n4UFc4pT1t+fMwDsFCHLkuGDnqK6iuqTfbu1dzYw5FYvuWbpjTS+FUkRA5EYyKGSfpLwovAw4wrNiAaafLDiEnQOyJCNSvWvQzNAsavtglIuSY09cSv6zePG4O98fNCwIAkhETEpR8WR9gy/xKI+nl6plGbAqo391eOYGfdzfoviQdGoWc4RIKhM5mnJPu590KcM2HQRZkBrFntz86f/kNbbmIu2GKgmh6J1rHiFJK6IVe4lq7FyDghkJrudMyqDOMcHzRzwybvKRcwnoa4QCzveKrjL5A1bzpz3ksnL5G9RVKmWBQOpI8wRTF1hlZuY94nRzZEFaZW8l3gVVQUTrOQoVE6MlyAUESSfMqpSLftJF0T2Eu/x/4NwoixxmwavoxqKhPAjqu61f6p38SEppX6yKMqz2JclXVb+OsYJuM0aU9nq0bTXx6zREAns/bvReHEqWX9Def725pHkREqbUbbVumRonqUop9X2uRKgCT3K/wzrKscZGqkL5uwMl5J8/Dna7J/vbwp7mKFQ9X0GjXySwijtwTaQgq2V2NHBJruvrTNoZty0aLAxr9/FRgs660ms2ljAfzpEeBlLukuqOUM4nPXtZwsUq/v1OLVP5pjbPMv9lJ8lCq9n1sf+oquByGi6poMD7ja69AtTBg2H1pjY5molvJz1MzuOYWWH9QSue0xdWSsfK9UL3XigXwLNsvvdVidoefPMb699oHbSGtrlQ1YMhcis+/ogkYsjATNYfTwDF8iypM1sHr2muC/w2GT5ZWmAYaFR1W qHzKDA07ZcAZ0Ew+YxPF2/c5u+G5U81SYT/KmjFbHc2vkm6pGe7MDpbwNFIsCDgY4kYjxZAwg0P0yPjUxxFLN0EVr3h9g0/GwQvPA4J8WKI5WqqlnNlflxi2rz4HHn3PBdU7tH9WZnH26aNA1N77JWFYsYD0ydDEmuV4eowdjx6i+fhcuMTUFYK2ZIku54pzA+u7JFo0j34jCEce7KRHBk3AVTkssnJ+SyWE5DkkyIC9miijFJCiKlhs3RppwCcFdtCR0csDEwJG+HdE0gtozqbhAgNLVJSwb7XN1CO+sXCWAUR3Swb8HqS50u3qXnKxpRwyUgDxSSWjitxWIBN4KPapUS7x32tAFQMFbDJ27pxlO6XMJWo13Yh6dxyGv+cicMf2MsfXIliPSOkq1hSRQ9DZWz0syuLWcbaP+V714HZgwhPRDVRdQRuKbPoGQyQMwct6ty8rzy40U0rRJbOV+Ky4Ou3k12WOmJ6khEkR/fxtvs6estILrtmK1O7V9VTWJKkxzWIC+SyC0v7Jc7Tot065EWD9YJZj4pXfYsz5ibgzIDBnWsbbQoov/2ptb+VYtRIC6adrpvC9CP8Nuy/LlM2B2jgQ== Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d8-20020a170906544800b00a382f95e8cdsi51540ejp.616.2024.02.06.14.57.45; Tue, 06 Feb 2024 14:57:46 -0800 (PST) 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=20230601 header.b=hi5fXvGp; 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 AACC668D13C; Wed, 7 Feb 2024 00:57:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C350468C8CA for ; Wed, 7 Feb 2024 00:57:36 +0200 (EET) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1d944e8f367so587675ad.0 for ; Tue, 06 Feb 2024 14:57:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707260254; x=1707865054; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YRsgfbm4Rps6GAeN4ZErxdZad81vXmNh9w9AWrT9F1M=; b=hi5fXvGpUcKEAQyHAFFEjaMpGhHRXdUwhfiTvuO8gJ3g5/ASvMlK3M6AtoBlBY+psu qeYBmQoHZJeZ3EelmF/DOu5EIR6fmvpc8aZceO70P9qmUBDGMdD8dgEVi4adv6zFbhro gnd+QVbfQqSpPZwte4TrUiLwgY2gqEa+MyBnlhRqJkxdGjgCa/mcNTgL7u+uzScKGtxA 8dV2yTXY4Qj87zY7189dkhJvCepIPNG6t9H7EUlJ5HXIBII4eWt8k/rYMT4o1ZnWeKCJ wicBLTvdqR7cS9bmqcUCtow20MDQWvlyC/CqAln7n14luAWVnOPyoHyp+pDMPzZA+r/v awbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707260254; x=1707865054; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YRsgfbm4Rps6GAeN4ZErxdZad81vXmNh9w9AWrT9F1M=; b=ZeK2FnqH7LLdTshkniqWFEjWY/uzpLPjHsZ9k9A5qwd/jf6G3BAA9471nmybuE2t7x uBB3v/CwiCHs6CQSj+RgFFtY74cfodipEUV1XM2Cd1zG2pZ1XjacLlpWu47F5QqSkt6H fC2QTDoWUZFol2adC0XGEaiyAcAyQZcPCCV9MYqtTi68BMf/z3s3nBDPnghXLOaUFw8T uqi/9PdzWZ/KhZf4TjSmnlT2pYp+8FQKPVv5d6WEzoVQqzpNOLZOGQU/ZAfCq58vyEWo c+Ms05NpBfzbEUB89zFqNamszMWAyj7ZPPxQLZ5qSu+WmLaeZsoDMjz01ndy/8g4PCPq 5s2w== X-Gm-Message-State: AOJu0YwXfZ+iDFLAgy3OFSEpHKCSgNz7SQh9Q58fimH0oHM6zf3sXzDX i6AkDdMcbWqqAZMcQDbFQxYe87O1g3cRBR8FzjsrSY0rYmndr7Si+wOv6xIA X-Received: by 2002:a17:902:d2c9:b0:1d9:a131:2a29 with SMTP id n9-20020a170902d2c900b001d9a1312a29mr3618493plc.45.1707260253675; Tue, 06 Feb 2024 14:57:33 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id mp7-20020a170902fd0700b001d94c709738sm45982plb.217.2024.02.06.14.57.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 14:57:33 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Feb 2024 19:57:35 -0300 Message-ID: <20240206225735.12251-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/nvdec: don't free NVDECContext->bitstream X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8/r7Smqub4iN Ensure all hwaccels that allocate a buffer use NVDECContext->bitstream_internal. Signed-off-by: James Almer --- libavcodec/nvdec.c | 2 +- libavcodec/nvdec_h264.c | 4 ++-- libavcodec/nvdec_hevc.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/nvdec.c b/libavcodec/nvdec.c index 27be644356..d13b790632 100644 --- a/libavcodec/nvdec.c +++ b/libavcodec/nvdec.c @@ -259,8 +259,8 @@ int ff_nvdec_decode_uninit(AVCodecContext *avctx) { NVDECContext *ctx = avctx->internal->hwaccel_priv_data; - av_freep(&ctx->bitstream); av_freep(&ctx->bitstream_internal); + ctx->bitstream = NULL; ctx->bitstream_len = 0; ctx->bitstream_allocated = 0; diff --git a/libavcodec/nvdec_h264.c b/libavcodec/nvdec_h264.c index f022619b64..8c72d5f4f7 100644 --- a/libavcodec/nvdec_h264.c +++ b/libavcodec/nvdec_h264.c @@ -138,11 +138,11 @@ static int nvdec_h264_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, const H264SliceContext *sl = &h->slice_ctx[0]; void *tmp; - tmp = av_fast_realloc(ctx->bitstream, &ctx->bitstream_allocated, + tmp = av_fast_realloc(ctx->bitstream_internal, &ctx->bitstream_allocated, ctx->bitstream_len + size + 3); if (!tmp) return AVERROR(ENOMEM); - ctx->bitstream = tmp; + ctx->bitstream = ctx->bitstream_internal = tmp; tmp = av_fast_realloc(ctx->slice_offsets, &ctx->slice_offsets_allocated, (ctx->nb_slices + 1) * sizeof(*ctx->slice_offsets)); diff --git a/libavcodec/nvdec_hevc.c b/libavcodec/nvdec_hevc.c index b83d5edcf9..25319a1328 100644 --- a/libavcodec/nvdec_hevc.c +++ b/libavcodec/nvdec_hevc.c @@ -274,11 +274,11 @@ static int nvdec_hevc_decode_slice(AVCodecContext *avctx, const uint8_t *buffer, NVDECContext *ctx = avctx->internal->hwaccel_priv_data; void *tmp; - tmp = av_fast_realloc(ctx->bitstream, &ctx->bitstream_allocated, + tmp = av_fast_realloc(ctx->bitstream_internal, &ctx->bitstream_allocated, ctx->bitstream_len + size + 3); if (!tmp) return AVERROR(ENOMEM); - ctx->bitstream = tmp; + ctx->bitstream = ctx->bitstream_internal = tmp; tmp = av_fast_realloc(ctx->slice_offsets, &ctx->slice_offsets_allocated, (ctx->nb_slices + 1) * sizeof(*ctx->slice_offsets));