From patchwork Sun Jun 18 23:43:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42214 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp349036pzb; Sun, 18 Jun 2023 16:43:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ44v5RADnLtv/3KJMkOGtE5G2VMymOiNFbvRNCYOB2V5KV9GJEVgYGaHmirHoKwOiu6stHJ X-Received: by 2002:a05:6402:5186:b0:51a:5ad9:5851 with SMTP id q6-20020a056402518600b0051a5ad95851mr1030862edd.3.1687131837740; Sun, 18 Jun 2023 16:43:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687131837; cv=none; d=google.com; s=arc-20160816; b=x9pJnWTmzyO4ccCAeeydr+zY6f808Tev0Y68j82GC9vToCOvJ/fTvB10TVWSv2IXdh wfxeEAVUIVRLOkUQWcgZHtAGNxhGdZLdaU1KkjXvG84aveuUPzZoBOcCfT/Ku+VwS838 f/2jjp4aQMqXJXW+RFWORMLvhla4XHEF33Df/JV5Au5aTR8tnIQoX0VzldBgrNLNfX7H QqRBZ9U1qh6wqHeHQiTWm1f4uIo7scPFPNFu7zuNrSDSPODIbwpqQHlbe4Pfmshvpbge s0QE3tGuEc2BxihFgUpowUkpmhM0moUX7zbdEoZIg+YX1spZ3F7xr5bsKXo8ZhwO4iYj CaZg== 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=c+2ATPWdwtxzMHDKdtN3X8TKO7C35jKkoT5FY2bVyFE=; b=h99EdgcGI2wG7xJXy7HgVuiyZkboTVlk9nVFkLa3JyNvNkroA2nNIM4fFomJVo+R0O zS/rap+0TmYsOn7e8HbuwZKrFYC83x/aiyStv7tCHDdRS7RFEy7Xvr6Ujg7nXZQJsmgV UU1le0zrn/1OHVNwbuE8s5XGjKiyWXacr8TB7DLGW/zupgn16tKp+01XDndjydCo9IuU 8MF3bVrlMXI/DKoMucPYRhsUeSa+8dUPvv4scpoeA/a3363Alu7uYdZbWWO8KFGGW3xL 4zUns3UrJzjT1guDf1l+IK7p1ezCsmcdi3OdH9LzHs5j3fjyAeVOCZCGdRqfEH5PghUB 7W2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=hK501n7w; 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 y9-20020aa7c249000000b00514a0879266si13810669edo.207.2023.06.18.16.43.57; Sun, 18 Jun 2023 16:43:57 -0700 (PDT) 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=20221208 header.b=hK501n7w; 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 66EAF689E65; Mon, 19 Jun 2023 02:43:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f181.google.com (mail-oi1-f181.google.com [209.85.167.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CFF5968B22C for ; Mon, 19 Jun 2023 02:43:46 +0300 (EEST) Received: by mail-oi1-f181.google.com with SMTP id 5614622812f47-39e86b3da59so2446425b6e.3 for ; Sun, 18 Jun 2023 16:43:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687131825; x=1689723825; 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=zL4qUVcG8B4rHh/h+6juTgb5MfiUJ0HgoSyfL3e6A4Y=; b=hK501n7wjNMZjVrcjhZCoq1fYS2JMhfOrOIH9mphB0JrP0OCuF6WHYS5OiWcmOaL6V QglkDYRHV50bLGfKnLbdi30f6AOgOqFV8i1LNvdvve+FwfHy2W5u5KVdydsFP5ppllap yVHCCeHaIL4do+/lX2wa7ltkY6KVe6AwEJ2zqiUPKT6ojMio7kvA9D4YdjS8Glq4VpmL vXFkXCsV1eoEhiMY5UJqo6IURxwOwo3dJB9oPgZ5xOJUS5/OYZobcDHLFKutoeLVtLc+ d56hcRK/oBsvw+YhzjkoInpgsi67Sp4uWDBE+I71vLYfbdsuZYnGzckIgOslvqUkSiJB BHSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687131825; x=1689723825; 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=zL4qUVcG8B4rHh/h+6juTgb5MfiUJ0HgoSyfL3e6A4Y=; b=PgIEK4A0IgpPJ1d8aUESUuiyFDZMpgxfYdmJ327Ha13YB5CZ/ee8wPO7DSAMVoGWk1 mroBug/RKaDDarPZNuZFdQCZ1I9PET4goKW2V2+FIkE4MlQM16GGsMU+3uully83XzAT LAi0Dt/ytaQtNH2eHlP4FbaDgt+61eeryT2BZXPqArWxjguIqd//Wu86H3wKS55SQVh8 yzZ4H5z6fnjAB2ftjUnI3+Dn1agW8ZSWP9wOlcmye8JNlJ2H3Eh5pt2TTYpCjSknxhNG stDb7ma/gL4rFR7svjbYyUTw8BUUVUi88mI+FsBQ4JJt1rF5pDPKH567f8bhyUkT3m93 0rdQ== X-Gm-Message-State: AC+VfDwx9PeOXvVmyu2TPvIEBLHhNdpp27n37PMR0TtnkUmDcMtbphIV yXDROkXHPKDcD9YprQ7PKZu1spcPf88= X-Received: by 2002:a05:6808:693:b0:396:40c4:a2ef with SMTP id k19-20020a056808069300b0039640c4a2efmr9105755oig.11.1687131824780; Sun, 18 Jun 2023 16:43:44 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id bk36-20020a0568081a2400b0039eb5f4543csm2069664oib.34.2023.06.18.16.43.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jun 2023 16:43:44 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jun 2023 20:43:26 -0300 Message-ID: <20230618234332.1370-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230617151848.1378-1-jamrial@gmail.com> References: <20230617151848.1378-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/17] avformat/evc: don't use an AVIOContext as log context 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: a/Wc6jBjn5O0 Signed-off-by: James Almer --- libavcodec/evc_parse.h | 3 ++- libavformat/evc.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/evc_parse.h b/libavcodec/evc_parse.h index a1fbbc643d..677e01a64a 100644 --- a/libavcodec/evc_parse.h +++ b/libavcodec/evc_parse.h @@ -105,7 +105,8 @@ static inline uint32_t evc_read_nal_unit_length(const uint8_t *bits, int bits_si uint32_t nalu_len = 0; if (bits_size < EVC_NALU_LENGTH_PREFIX_SIZE) { - av_log(logctx, AV_LOG_ERROR, "Can't read NAL unit length\n"); + if (logctx) // Don't log without a context + av_log(logctx, AV_LOG_ERROR, "Can't read NAL unit length\n"); return 0; } diff --git a/libavformat/evc.c b/libavformat/evc.c index dc75ccb56d..a7cc6167e8 100644 --- a/libavformat/evc.c +++ b/libavformat/evc.c @@ -359,7 +359,7 @@ int ff_isom_write_evcc(AVIOContext *pb, const uint8_t *data, evcc_init(&evcc); while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { - nalu_size = evc_read_nal_unit_length(data, EVC_NALU_LENGTH_PREFIX_SIZE, pb); + nalu_size = evc_read_nal_unit_length(data, EVC_NALU_LENGTH_PREFIX_SIZE, NULL); if (nalu_size == 0) break; data += EVC_NALU_LENGTH_PREFIX_SIZE; @@ -367,7 +367,7 @@ int ff_isom_write_evcc(AVIOContext *pb, const uint8_t *data, if (bytes_to_read < nalu_size) break; - nalu_type = evc_get_nalu_type(data, bytes_to_read, pb); + nalu_type = evc_get_nalu_type(data, bytes_to_read, NULL); // @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 // NAL_unit_type indicates the type of the NAL units in the following array (which shall be all of that type);