From patchwork Sat Aug 28 00:02:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 29836 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1921704iov; Fri, 27 Aug 2021 17:03:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJweE2fPKIak8UHl5UzNNZ/IZUVPCCMwxyxY3xTQE1EkjtPqpH8mDquDWgE20XWlFvAfuzN5 X-Received: by 2002:a17:906:b183:: with SMTP id w3mr12286002ejy.394.1630108980288; Fri, 27 Aug 2021 17:03:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630108980; cv=none; d=google.com; s=arc-20160816; b=oslSJXn9r1a76Hsq9yjl+OVGWHTvMpiRlUVGt520+/cG9mxMAZw0cdoNEkA5jQ0ZTx Sqk3zM82sXue2Bfo43iiTJfIukPSqNG3HXZyGP510nGnk7mVZcN8huGCuFxY2jdUn4pY TJGDm9KiFKJaKh9cCunfSSJg7r9dO0S4LZL4deJWzphyawfv2eI9XExV5x46Qaeh7FUG CZLvpDdnALBgYC+7pI+IdRYfWsdfA6awUG3evGMQ2UyWODepNH6mjjO/8rx2flIpV22M YoSPc2oQUG9L+955P+k09/D6gW7DLOgxBMKu4Q18pR4+KjMkH/xbum42eq4Oxx3Cr7JV Oa8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=CK13OfrrfzP29r3onGqact6xvPA7pCVh21es/rlFuMs=; b=unpKQeIWVM4V71IlUFGiEqHOm/RruhUVy6sPQDIF0ht80xzwbbIGtBayCNIUz0QHXk 0058Cc2YAAaX+JY7zqyTWF/5a7zvFb70Ud2Z/e10XgiPI/c/fP/I2IuCzZRaLxwXv46s 8USHmukr0wFXcitpKv3ErZovTTW+Mah8BFFvR2ZpIMK2OoO2BHqzqwk/GbOA4xJUvpjQ H3ABYpFOkhcENP50vDdHCJcYdx4lh4xMJFqs5hh9SA7WP3BRykeinkCawHWA+niFolf6 xkgNQuYBo1xoFTSnyv8I9E9L3aIyQC05WVm/ldoemFofs3VzYLRUkZyeJy7UnD9jBO8c HtaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=StfiGPVN; 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 s19si6877812ejy.541.2021.08.27.17.03.00; Fri, 27 Aug 2021 17:03:00 -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=20161025 header.b=StfiGPVN; 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 3BAEE689963; Sat, 28 Aug 2021 03:02:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BD10688095 for ; Sat, 28 Aug 2021 03:02:38 +0300 (EEST) Received: by mail-ej1-f52.google.com with SMTP id x11so17424895ejv.0 for ; Fri, 27 Aug 2021 17:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=UvY6ZDzT0inZs/ioRfNZsL6r7Bgwe0ZYE40fZ/q3OGQ=; b=StfiGPVNDgc7Js+3fYey5ivuSLo5yTjDe3oHj76oWNISHeMUE0JhDBCiJDjXocpLDA CbDOQozRixDYfIzuaPevDOSmPPflFIJEMsuacTJjdCcPYWkfl2xQyUjNDM08mhL80QEn P54MNonffK6p/iyPXNYv7A7nnOF9Kmrb2xSX4yailsOOm61br9heZpy4n8y3KwMuespB Ebad73+NbaNXfU3z+NYFuW6tfuIQDa5P27eHT2rzFfxydMtliJ68OZt/NCWuN4Qyn8aM Y+jMw3O1189GrnsoiBMqxDEe0Upwae1t8vAJ3I4O+N6k0vtrOxNAPzS1MNVI5DFbJd3u 9ptg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=UvY6ZDzT0inZs/ioRfNZsL6r7Bgwe0ZYE40fZ/q3OGQ=; b=bcbCZBNcy5KDviN/u9wf405lX+atC5bEpHMoJ1zQCpkrBnE/9EvjDkwrzeaRnJyqG4 JwQsKzsKnSY2ekRKfJ1RAR2PyxlrEfts6snvG7sGce4dJgtbztEwsyEJRWtEaeIaab88 2YcHdnCOdAyIsee4NFMTgTYh4o05WpWDxNsx4dlYmfDw0PwtN4fsWpDtsw7UvR25sEVw IasoPyn2hyWuOroRR1ENrFvxKCNyt96oVOCU+N4mfAQfo0T3t2C2yACuZtghFITKRyqb mmJGiBlS/GoFlOeVcH5c2wEfv24xByIMrTnHPAlsE3jUABl+837jQhA9uQnv1tjLInIG KORw== X-Gm-Message-State: AOAM532M7mRLGlgSjg2If1W3AnRitpTB4+dqNcnnYsJrWbdB5Zfcfhbd cE+zA2AmhXg7HMerp/UIFgftRZTPd8E= X-Received: by 2002:a17:906:2bc2:: with SMTP id n2mr12481560ejg.455.1630108956697; Fri, 27 Aug 2021 17:02:36 -0700 (PDT) Received: from localhost.localdomain ([95.168.120.34]) by smtp.gmail.com with ESMTPSA id z15sm4048270edr.80.2021.08.27.17.02.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Aug 2021 17:02:36 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Aug 2021 02:02:25 +0200 Message-Id: <20210828000226.8290-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/mlpdec: reset lossless crc checking when stream ends 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SbfgNKf3Abta Fixes invalid reports of bad lossless crc. Signed-off-by: Paul B Mahol --- libavcodec/mlpdec.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index e4992550ee..f0012cbb05 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -1142,6 +1142,7 @@ static int read_access_unit(AVCodecContext *avctx, void* data, unsigned int substream_start; unsigned int header_size = 4; unsigned int substr_header_size = 0; + unsigned int end_of_stream = 0; uint8_t substream_parity_present[MAX_SUBSTREAMS]; uint16_t substream_data_len[MAX_SUBSTREAMS]; uint8_t parity_bits; @@ -1286,8 +1287,10 @@ static int read_access_unit(AVCodecContext *avctx, void* data, else if (m->avctx->codec_id == AV_CODEC_ID_MLP && shorten_by != 0xD234) return AVERROR_INVALIDDATA; - if (substr == m->max_decoded_substream) + if (substr == m->max_decoded_substream) { av_log(m->avctx, AV_LOG_INFO, "End of stream indicated.\n"); + end_of_stream = 1; + } } if (substream_parity_present[substr]) { @@ -1319,6 +1322,9 @@ next_substr: if ((ret = output_data(m, m->max_decoded_substream, data, got_frame_ptr)) < 0) return ret; + if (end_of_stream) + m->substream[m->max_decoded_substream].lossless_check_data = 0xffffffff; + return length; substream_length_mismatch: From patchwork Sat Aug 28 00:02:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 29837 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1921586iov; Fri, 27 Aug 2021 17:02:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwQpC9na7VyYfMKSp/+5lSyHcE466n6D3+wfCCJ7fRgKIUw7SpC0JFLraO92cFszFV96hEw X-Received: by 2002:a17:906:c055:: with SMTP id bm21mr12880732ejb.350.1630108970210; Fri, 27 Aug 2021 17:02:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630108970; cv=none; d=google.com; s=arc-20160816; b=KPHUgtbd6PAgFqkA5r6AB2VVQQaSH8uGEVFD/+JGxBQxSG4MekiPzvWjj/92J6DR/b kmpJ7zv7padg7GEWkVQob89uS7EL8SU2+blgNIJPzP2OgkXSyLEExfYcmq8100jKk2he 8DQSBwa4M2bwsMhvzXxAmY2mAgtP2DsV1waCdMAu1S0jIvhNUXLAsb9npFmZR6Btk5+V DmwnhniQzhVhrtGm7fV1qVRM+3p+KHPiZD4w+sImPrTxTn+6E+/JL+NP5MwK/GFkgyw8 iFyHIC0e+U7eoJxYTrzoEHh6/d0eXbjJ983tAnJpKYQM2zbeSXmBL8gK3LSFbtcF/Qyv W5hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=Wy/84+tfEld5qCnB77qZWJngRd/BnwKdonuGY4FWZFc=; b=j6mG05uX9yFNMirnym0UnBSnaa2YYY5ZL/UNw/RIVE/AmpGjiE2MIO8ldQI42D8aWy psCph35dFKF+na4iMXYJlNYqk/pjWxzYEkRQQu4LY6JxMv3AppHVD5joFpaXRBVOsJ/2 Ysqc88pgWmqN/X3WYrBhVp5CErp/geQRSwZyNykp+ML1fhXTHu3dy4LJqmqRd4vBCU2P vQkmMasD55c5kcTFLlPPf5nEdTGDBtZU/KgmpQmSdY3tOfYtqK9hUSrFnvakzySpvjzz U1NfSOxLBsWx/If7WetSFtPz9jeMBu3g7Vg0Tm+VdvcrNbQEJA9AD9JNTZpQM6RQ0mCN EPkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=E4xpvapg; 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 k3si7256103edx.605.2021.08.27.17.02.49; Fri, 27 Aug 2021 17:02:50 -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=20161025 header.b=E4xpvapg; 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 017656883BF; Sat, 28 Aug 2021 03:02:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 291DA6808FC for ; Sat, 28 Aug 2021 03:02:38 +0300 (EEST) Received: by mail-ej1-f53.google.com with SMTP id u14so17186002ejf.13 for ; Fri, 27 Aug 2021 17:02:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=kHWZeyleTOQQcnsbyZNcYLZh3KN6eBkWQQah95rnK94=; b=E4xpvapgHhY0JEGjc7FIMnBc+iZoxDpPqSNaekBpcc/WUSILqPBctUeZ/007B4q9rR juuVXRziK/aNHuY5BBsXiXrKf8e3Dp1JYRMe+uVowwOSSQarzjdO8zbCbzVXn1Zp/wRY puv19NTzTK8H4lfRPGASxOFyabN5euepvZp1P6sofQMAyuoQraGXFpFAnlrTagwF2t0U pgDRGaN3qGH3ThTu/Fqu7yotp7KooiNBHKp8VlUIc0XR7PWNU7mY7NQZcdGNiAasserq 2j+Xo2pHiuyHYT0qYcJSlKnuOB+vgt/wURsx7ngJS5SwbsgrdTaPrUyAAu6HOvWArCiw YmpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=kHWZeyleTOQQcnsbyZNcYLZh3KN6eBkWQQah95rnK94=; b=oNn6UcIiLKs04iizDTWhgRoqlXePQCmpRxqg8UJHBiPJWk8+XtdNhzRVW48oELTtvL Grvmn9PnRYqTmUgrfEj5lZNoohCpPebWhbHff5TxZPTP5sAgElEy44pqkWvEhzvaOIz9 4LusJKo0jMbR/i5os98PChfer7Jy9EAW0bXEf6jBkj2VC+E4guMGPOr1pBtHr53Dk4qz 0UmY85XoKJfjQU9JqyHCFVRNwiIoOVQnHzqa3l6aD2lh5d/wmPyN4/OX+ZTcVE+KblWy Y+sEePx76G1yWbSun+D+GGR8iS1EtBz7d5e5qbZk9eZ38GKmMn6ia2R4HOwanNqIpL5z GPPQ== X-Gm-Message-State: AOAM532OkJYnfPw43t2PPlNENNxMWM05ZwqgPUzE56Bz0jR5hKfbNG5u fTMFuh6b57A54sp3UjsqGUTEadsfQ98= X-Received: by 2002:a17:906:a991:: with SMTP id jr17mr1818135ejb.511.1630108957476; Fri, 27 Aug 2021 17:02:37 -0700 (PDT) Received: from localhost.localdomain ([95.168.120.34]) by smtp.gmail.com with ESMTPSA id z15sm4048270edr.80.2021.08.27.17.02.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Aug 2021 17:02:37 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 28 Aug 2021 02:02:26 +0200 Message-Id: <20210828000226.8290-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210828000226.8290-1-onemda@gmail.com> References: <20210828000226.8290-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/mlpdec: make end of stream message into debug level 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FF9iftckVGwu Not really important to user. Signed-off-by: Paul B Mahol --- libavcodec/mlpdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index f0012cbb05..d8b347ce1e 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -1288,7 +1288,7 @@ static int read_access_unit(AVCodecContext *avctx, void* data, return AVERROR_INVALIDDATA; if (substr == m->max_decoded_substream) { - av_log(m->avctx, AV_LOG_INFO, "End of stream indicated.\n"); + av_log(m->avctx, AV_LOG_DEBUG, "End of stream indicated.\n"); end_of_stream = 1; } }