From patchwork Sat Feb 17 22:02:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46318 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp494172pzb; Sat, 17 Feb 2024 14:04:31 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV8+eBdGiYjcWYmDDgjEllxFc4YjcVrIS8OpC4YrxR4rNFD5uXpRNOPIm0lxAKXctJd2HId/SKv9eboirBrPMi/1Ort6hnroiiCmg== X-Google-Smtp-Source: AGHT+IE2SL5zjYBBznykgNvlC6M37Np+ggcRW/LF6AnE37HBnJT/lUnwp1fF8dqhHfkBMxpaGFB7 X-Received: by 2002:a17:906:491:b0:a3d:4819:b9a9 with SMTP id f17-20020a170906049100b00a3d4819b9a9mr5996655eja.52.1708207471019; Sat, 17 Feb 2024 14:04:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708207471; cv=none; d=google.com; s=arc-20160816; b=t0AXKvGBQLXor5ZCrZ4u/uCLDZmPKO0uQ4/IoWxVKNAHwC69XyFKtGE3kEEIQWWHZ8 suhYAM/0k8P51ocpS7uXzIjmFugSTjGG/ISOwswIK2Y7ogEg3I1VzC+mPGox0bBsxS7t ZgdC0EIj2C3fATRg8GvSwYnpJKx3mRVbyNTFaeYDDYfUV57c8dAyz7EMHihz92U9S1oP e+hLgRw9axQrGf45LUEPbu6GHgmxQU+enA+yk3q9eZIMaScHSovJY6A6YoQ3V/NdgdJn 3zQqw/kyoSRWXNWWWWTojbYiBm6fBtBv97fujT6M1uPca3MtP47flwx1gOCq0hNqWNMX FVCw== 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=lAjD7hfNvn9cTwUyFpARHsu9zT0RQIa5sTjPnGbPEHo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=JWnaNtfmIM7fqAJ5RWZngqgcynvWB9XrzS/EIxo9VUH9c/276Jbc/jtU1EnWIg2mGS ZlHizTp0sc0oGqUDxRNqf+JrPfjDTGW0WYfIqmmdajRs7i4z5zIBpydZI3rOjwVAeP7F I+ubQT1cWCV/YJuTZ6MYWvCTozF/wCI40S1GO3ymkLmN2gpZLrjRjrrwSisMOWaEg+Jk cnrUWyFMTWgZcpk823CQcEi4pWlUqaY4FbQ+5ANVoyKzeDzkznnlspgeP7hfqAR4Ch3N EwctgChgb0KZSjolRFgPiGfjLiygvStxK9UG4swcuho0ooKMqYnHHaTP6I8iK4hUpJPp KFMg==; 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=YMC0nl+u; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id mj21-20020a170906af9500b00a3db100cdb7si1152028ejb.143.2024.02.17.14.04.30; Sat, 17 Feb 2024 14:04:31 -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=YMC0nl+u; 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 F0A8C68D309; Sun, 18 Feb 2024 00:03:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A49F68CF80 for ; Sun, 18 Feb 2024 00:03:41 +0200 (EET) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-5d8b519e438so2967831a12.1 for ; Sat, 17 Feb 2024 14:03:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708207419; x=1708812219; 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=X8PT7E1/b09Ng5aXU70n8IJ+x2Fw7IJkJtQiwez3r+U=; b=YMC0nl+uDBEYR0a+RPlXCo8QkpN/GHR0uGpKYSvoQR1mZLINfqaAgQL0rWUvNMFUsy LzvxBRFRRA8VxVqdRN61Qhum0MV1gaCD48SGbJswqnmg03GR9M4h1otYCEgfT5W99D6T fqHUsqrGU4MaL0Y8H0kBWEYY8ZfcjalE2v7D3+so0uc6UsI0Yd7YOv30+qoziR+Z0fLR MQ1X23sUDKhLDqQUFqApCI5ing4c1ZFmmuUx+6TQyN17IGGKZwb8g3VNWmSQE0LyAqJw Gfx7fOV/JPelDLcHPLeNjIucOCMwjZ6N8mhkZVIgXqYkklL3+m5Z84RmK8Tqzb/eGiOw N12g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708207419; x=1708812219; 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=X8PT7E1/b09Ng5aXU70n8IJ+x2Fw7IJkJtQiwez3r+U=; b=Jn9Y9XSYpWdbFbF4GSII5gH2l9ddlJcpds0T+jZeSK/guDHeCPLCYfIWk2vN5zLw/u g/plVQu6SUtCueWxpY4tWK2gi0h10mLd3i+xchGDADlfgPrNjEjjm5E9yXq6auGZb70v aou4be4xC8VZ2I7HhIbbxE/d6DiPxPtzIcb8uUP30RSP7mcKmZLStqJY2Ei5UWNXru0m dpI6s3E3LOUZeCWb0wpvpNjNqE4vEvImKIZ9DR8cQdTAdRML4W9CVPc59umi/u9dasQk XqAcR82PGr/KidJoWZqG07ca0lH4NdmJy8h/8zfbb85KVaalbNWd6jM/htdrSZjrhsm8 q0IQ== X-Gm-Message-State: AOJu0YyroExZSWBgjciBUkLD7MfAuI5OnTzWBbvrdk+tkyMKGKQGi4lJ Mdr52DqVdi2pB0h8XMN7XuyRahV0TRxChbpCohglGOCx4bfSZ4xVRFYRispW X-Received: by 2002:a17:902:d548:b0:1db:4419:e933 with SMTP id z8-20020a170902d54800b001db4419e933mr10032481plf.17.1708207418756; Sat, 17 Feb 2024 14:03:38 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id e6-20020a17090301c600b001d77a0e1374sm1850326plh.151.2024.02.17.14.03.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Feb 2024 14:03:38 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Feb 2024 19:02:38 -0300 Message-ID: <20240217220242.62035-4-jamrial@gmail.com> X-Mailer: git-send-email 2.43.1 In-Reply-To: <20240217220242.62035-1-jamrial@gmail.com> References: <20240217220242.62035-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/8] avformat/mov: make MOVStreamContext refcounted 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: 3zY7XzfkKC3V This will be useful in the next commit. Signed-off-by: James Almer --- libavformat/isom.h | 1 + libavformat/mov.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libavformat/isom.h b/libavformat/isom.h index a4cca4c798..eee94d0449 100644 --- a/libavformat/isom.h +++ b/libavformat/isom.h @@ -166,6 +166,7 @@ typedef struct MOVIndexRange { typedef struct MOVStreamContext { AVIOContext *pb; + int refcount; int pb_is_copied; int ffindex; ///< AVStream index int next_chunk; diff --git a/libavformat/mov.c b/libavformat/mov.c index e548f93f17..66b36eaa4a 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -212,6 +212,7 @@ static int mov_read_covr(MOVContext *c, AVIOContext *pb, int type, int len) } st = c->fc->streams[c->fc->nb_streams - 1]; st->priv_data = sc; + sc->refcount = 1; if (st->attached_pic.size >= 8 && id != AV_CODEC_ID_BMP) { if (AV_RB64(st->attached_pic.data) == 0x89504e470d0a1a0a) { @@ -4672,6 +4673,7 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom) st->codecpar->codec_type = AVMEDIA_TYPE_DATA; sc->ffindex = st->index; c->trak_index = st->index; + sc->refcount = 1; if ((ret = mov_read_default(c, pb, atom)) < 0) return ret; @@ -4959,6 +4961,7 @@ static int heif_add_stream(MOVContext *c, HEIFItem *item) sc = st->priv_data; sc->pb = c->fc->pb; sc->pb_is_copied = 1; + sc->refcount = 1; // Populate the necessary fields used by mov_build_index. sc->stsc_count = 1; @@ -8660,8 +8663,10 @@ static void mov_free_stream_context(AVFormatContext *s, AVStream *st) { MOVStreamContext *sc = st->priv_data; - if (!sc) + if (!sc || --sc->refcount) { + st->priv_data = NULL; return; + } av_freep(&sc->ctts_data); for (int i = 0; i < sc->drefs_count; i++) {