From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7B9EA4928D for ; Tue, 6 Feb 2024 22:57:44 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7674868D12E; Wed, 7 Feb 2024 00:57:42 +0200 (EET) 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-Google-Smtp-Source: AGHT+IF1T/SIZNFOPke4Iaa7YvsTLqBDjieKA5XxtfEsUW9KuUjCUipUBlYjIk/icJCMJmOHVqeR6A== 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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)); -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".