From patchwork Mon Jun 19 21:11:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42231 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp947856pzb; Mon, 19 Jun 2023 14:12:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6zOBAeDZEh9poFkxcxrqkQs1rbTdr+2S/jpawoe/rW5EUHAwFPvIsJnzPunZ5B0zqRwgne X-Received: by 2002:a17:907:7293:b0:988:d841:7f8d with SMTP id dt19-20020a170907729300b00988d8417f8dmr1989366ejc.71.1687209155411; Mon, 19 Jun 2023 14:12:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687209155; cv=none; d=google.com; s=arc-20160816; b=NuYi4WQhTcitFlgqNd+RzFm+wNsSS+JKljoUir0yP86e7xZiYrxSNR5tgUxgJBuebh 7TmeYYiBQeObOx7Qi7IMIHuI3EXCX69FQzE2PICiiOd79y3GmDwea7+3vSwetnineIqT fb9SfHoarUy1qPdexOzaiclne/7C2u9Sx4ipIbQEi+EmVu1E5bmrgClFZ/vrEWhLheWK MrldOMGBBxpSro+R+ne+nak1Sg/tB0gCr2tQ70dpj9DV8r9IEnQRzlXkVj9RCWfqWGDe oyy0YOPUdHExynWiufQ7S1Z5249m/a+wxQsLrejzqf6VjgJ0PnDR8Ms+qz8rVKvBRWXb 3Kdw== 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=W4DmURxjXWii//XA8u1UvL3SdPvYwnwxA9aa5LAtEJE=; b=hByID+h+3MbZMLwHzWzwiLFl/mWuyF110PxQD+pMAk49tnBJUa4W//RPFwBRgiXlFv EsHMMMD4TDRiP/9WTbzVW2G218ktf1oTTXzLbjd63RTVYTGx7QWb1dm78SR8UrfXB7Q3 7n5Y5JGw2OgBnAFOeYB02CRf+PJbp0PTK5WFx3oI4DzJZZE3ASY3FUJIoAtyvUOrla/J hQTiNY/1g2SDNqTHbCPuwkdTPtNnZqn73g20m6LQWtua2HEfRLSE/hL164ZYB+9KAaOa 79n2bfQyQyDMDcRSjZlwW+2KONUAIGYiF7TqWSIW4ZMToqTavL0UnGV0AcZqoUpFNl7G HXMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=iaDZ3thp; 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 x10-20020a1709064bca00b009886fc16118si178072ejv.353.2023.06.19.14.12.11; Mon, 19 Jun 2023 14:12:35 -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=iaDZ3thp; 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 41AC168C026; Tue, 20 Jun 2023 00:12:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 20226687FAE for ; Tue, 20 Jun 2023 00:12:01 +0300 (EEST) Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-1aa34b210c9so1013192fac.0 for ; Mon, 19 Jun 2023 14:12:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687209119; x=1689801119; 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=Hr6ErQn+3Xy7xALPwLL8NBkfhwKS1vaDKgX6CVI6WWo=; b=iaDZ3thpCWMofE1/HkkXIKe5SbVQBPqmlgPmDoqgdUQ0mYCE2UyhLTauUWsvFMgYVG v+zcjq6H4EuZe3kkhn50sgqxgfdqc9l1pAzG5HQBJtBWEJWAFh7H8OgWVlbq+sVeOLWM IBLrXNeqZpZ8Ei5XNFh4epz1UiF7kpljnDREbM/ppnCtVlxiBaYPyIPrc9R3bkVR9eyh wYSSNqwlRYXmLD3KpYbgQqJw7APb1EpS0UEYqJAYwKJZx5lFgceiRJnID2Xo92soF2+O OxNhTg1/TzjYhebiUaLnSjAiWkXvTsF73a7PlWv0Nh++XmGTUZ3wBBNmAEBxDMZ11VFc IPzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687209119; x=1689801119; 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=Hr6ErQn+3Xy7xALPwLL8NBkfhwKS1vaDKgX6CVI6WWo=; b=cJ8140wGCeipuaqQ/vFU8zTC30Cd3j/q+iUwFXhfWx0jgdfgLudhal3l84BITP/Kds 1FPBMhFyuhfxZxanSifDZ3cSY7RU9dMEgqlz7lN3y2VqsZ7PtHGDkCvhrR7+gmsnxHNH oRNRu12Ea/6fwUpT/saoM2Dl1o/afPhz3nIbicXOyR7cDKYpQ6NZVk/9HHfrCSp3DOmN iw/nSjqOiY2h1zIY1ly91GFulFaaylpe1QcBIzaIpEjHDXXHpNAwtxoyZTQ6qFxChwoW AA1j6WKZ3nS19wyR15+jHTdrw7dUo1DeKL88M2YMspv6SKbxL6MwHaodARL+Slv1Bpw4 icJQ== X-Gm-Message-State: AC+VfDzV/dZoDYHUZ/UnfhFO6b/kBdddRKNxavhl0K7CkX0FUWWIb3dW jRD4ZFZqmAc6fa0bztBYHBXwd8Z+Z2U= X-Received: by 2002:a05:6870:1609:b0:1a6:a28b:6e4 with SMTP id b9-20020a056870160900b001a6a28b06e4mr11694889oae.37.1687209119244; Mon, 19 Jun 2023 14:11:59 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id p1-20020a4ab381000000b005586008cd5dsm370886ooo.6.2023.06.19.14.11.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jun 2023 14:11:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 19 Jun 2023 18:11:34 -0300 Message-ID: <20230619211134.20857-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230618234332.1370-1-jamrial@gmail.com> References: <20230618234332.1370-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/17 v2] 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: wejHjhlb7r8W Signed-off-by: James Almer --- libavcodec/evc_parse.h | 6 ++++-- libavformat/evc.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/evc_parse.h b/libavcodec/evc_parse.h index a1fbbc643d..6fc19d0868 100644 --- a/libavcodec/evc_parse.h +++ b/libavcodec/evc_parse.h @@ -89,7 +89,8 @@ static inline int evc_get_nalu_type(const uint8_t *bits, int bits_size, void *lo unsigned char *p = (unsigned char *)bits; // forbidden_zero_bit if ((p[0] & 0x80) != 0) { - av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit header\n"); + if (logctx) // Don't log without a context + av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit header\n"); return -1; } @@ -105,7 +106,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 421ff84cb7..caead88bba 100644 --- a/libavformat/evc.c +++ b/libavformat/evc.c @@ -361,7 +361,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; @@ -369,7 +369,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); if (nalu_type < EVC_NOIDR_NUT || nalu_type > EVC_UNSPEC_NUT62) { ret = AVERROR_INVALIDDATA; goto end;