From patchwork Sun Feb 20 22:02:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 34419 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:d078:0:0:0:0 with SMTP id x24csp2852459nkx; Sun, 20 Feb 2022 14:01:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJwYjMMPy8w7R5TafhtFH9eo7wca+5A726I8shn7Ed8Zbmk8OeCIpTgoU4tuBZF1KJjnAnFG X-Received: by 2002:a05:6402:d0e:b0:412:b108:d839 with SMTP id eb14-20020a0564020d0e00b00412b108d839mr17153427edb.88.1645394497994; Sun, 20 Feb 2022 14:01:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645394497; cv=none; d=google.com; s=arc-20160816; b=l6Hc7yr1XoagBSulZA4k/a6YR4gHh1TuNGQWCamQBAMzQunCcpo9OGW8QnCT4ubLvC cOPkFUPFLuC5sB6S6R6TPvZtpgFInawDPfi7OC/7SHtWvR05OAbynntWFyAHxmUQZ9ll 8yMsAARH+xtLgbMa00YBuNvR8S+JX84bKgLHpX+yIdIMQ9BdWpzzUKFU4TNCfvkdSWXy 1s0sZ0SRnCxCb4vFk+olyTTVB8rs+FQaCDusKdwx/+f1Fo6SpqXNY0OE9Uid2zMhh3KT rXPtegXKl5fA32yy7A19Gb4hzjp8eJzn7ko8pPxGrdhVq+2ZxLouj/OkQcdia2g4CCCY b9yg== 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=z0dPxmxZS8vOKpmQxjIYbciLDe1s/VFtPs09hhBaweY=; b=kDaOTk/3KWwp178bLj2Bw4d2etblx/aVzG8qpJffvRDvwTZ3qVsiafk0B7Lq0jJcav eY6KKDjqtFaeavfltvULtVu/bx5CTwoszRCqZfGinezFaNkI9bkqPHryhsRB0rKWn9nv 033TDMfSF7+tafnpiiII0FVKpgYwCUMTiPII+k+Q0USnyfGuOaytxsCTEIryyuGS6Pxo WwqvhHnUTHk3M7tF215dlF4vc7hB5h1AO5nfDwZg8FXWsUz1/xACBNNu1QST1/70sYUj TD2QDkQqLgtiEhZSlH5zafQGLFOQ/AyktXslNUjOY5E3s6HST5Yqv5wr1byrKEvuP/IX K/cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=dHwJBUDp; 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 qw13si9449052ejc.764.2022.02.20.14.01.37; Sun, 20 Feb 2022 14:01:37 -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=20210112 header.b=dHwJBUDp; 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 6832B68A618; Mon, 21 Feb 2022 00:01:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f45.google.com (mail-ej1-f45.google.com [209.85.218.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8B0AD68AF97 for ; Mon, 21 Feb 2022 00:01:16 +0200 (EET) Received: by mail-ej1-f45.google.com with SMTP id hw13so28125018ejc.9 for ; Sun, 20 Feb 2022 14:01:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7oHBwCANcmUbMTwpaW6ehw9pqanKFfdeMhJEanFkY0A=; b=dHwJBUDp1+jUiAHg71Dd+7covufnOC7U4STdNdlOxvtyfIYEY+hAI+sMeG3vzil8jf 8aiJbut0tPd4XvgIOm1JBKRfqrf+ZY/kJFzilB9SpujuLujogtD3evE0/405LoWURSIU 6iUri0cMAdKOu8K2g/iys5sIbC30aNYf6BksUbwWz2J8nkIubAwz9285pDn6t2gheLZf EZXrIH0zcVRSE1gB80E7kX5TwClWh3Fq+7EsvEfoIrhZyNJ4ePYxqdoxWe2Ecmvf+Jj1 fQbcjCb7iJdr3VO3aikcfHgsS0CXjlm07RxDCnfikEI+vmxwpEHd74o/paHEKFi5MW9J TPXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7oHBwCANcmUbMTwpaW6ehw9pqanKFfdeMhJEanFkY0A=; b=0lj0yFsFlNSdQLy+gy+b7QVInicv6QRDIej2l3XRxm8D/Tr+BTIOVhi+/FPVP9Q5q6 IE5ps0rvAh1p/XuRRt1DqiMQuzE9PscH8Hk24xh3KGulwiWOpda9xnd1SaYcslTjWgRQ OuQ0nN9CRgUojkku5RG5qeru4UaUb7/f6nVoME4YOMf9B2MtASK85TIKP0je/gTAy8AE vKzIHBVjnJsyBlUl/3CqVmt5o1XlEElh251aqIkLCJ6Wz+MqhY+6Oyjl6ahqwxVbOAc3 UQ42SoDk1A7fPuF2rR2O7w1XOJhE9wGXzWhQLWwYR7VyDyXBq4mBXiXZFF9djeQWMRIN ygMQ== X-Gm-Message-State: AOAM5330Lj+TmZnObZm0fRIatR7L+RFKLOb4uMd12BCNVAgIcs4nXgbu 2YStKndzQnsRFuzKWh62gY/JmGSN94vWdQ== X-Received: by 2002:a17:906:4b52:b0:6cd:3863:b35e with SMTP id j18-20020a1709064b5200b006cd3863b35emr13539944ejv.415.1645394475972; Sun, 20 Feb 2022 14:01:15 -0800 (PST) Received: from localhost.localdomain ([95.168.118.32]) by smtp.gmail.com with ESMTPSA id d18sm4491639ejd.95.2022.02.20.14.01.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Feb 2022 14:01:15 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 20 Feb 2022 23:02:42 +0100 Message-Id: <20220220220242.401901-2-onemda@gmail.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20220220220242.401901-1-onemda@gmail.com> References: <20220220220242.401901-1-onemda@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/wvdec: parse last chunk that may store MD5 checksum 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: Kv5PjuI7/Nw2 Signed-off-by: Paul B Mahol --- libavformat/wvdec.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/libavformat/wvdec.c b/libavformat/wvdec.c index 0d5a86953d..ffefda1cce 100644 --- a/libavformat/wvdec.c +++ b/libavformat/wvdec.c @@ -108,7 +108,7 @@ static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb) /* Blocks with zero samples don't contain actual audio information * and should be ignored */ if (!wc->header.samples) - return 0; + wc->block_parsed = 0; // parse flags flags = wc->header.flags; rate_x = (flags & WV_DSD) ? 4 : 1; @@ -121,7 +121,7 @@ static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb) chan = wc->chan; chmask = wc->chmask; } - if ((rate == -1 || !chan || flags & WV_DSD) && !wc->block_parsed) { + if ((rate == -1 || !chan || flags & WV_DSD || !wc->header.samples) && !wc->block_parsed) { int64_t block_end = avio_tell(pb) + wc->header.blocksize; if (!(pb->seekable & AVIO_SEEKABLE_NORMAL)) { av_log(ctx, AV_LOG_ERROR, @@ -187,6 +187,17 @@ static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb) case 0x27: rate = avio_rl24(pb); break; + case 0x26: + if (size == 16) { + uint8_t md5[16]; + char md5_hex[2 * sizeof(md5) + 1]; + + if (avio_read(pb, md5, 16) == 16) { + ff_data_to_hex(md5_hex, md5, sizeof(md5), 1); + av_log(ctx, AV_LOG_VERBOSE, "MD5=%s\n", md5_hex); + } + break; + } default: avio_skip(pb, size); } @@ -200,6 +211,8 @@ static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb) } avio_seek(pb, block_end - wc->header.blocksize, SEEK_SET); } + if (!wc->header.samples) + return 0; if (!wc->bpp) wc->bpp = bpp; if (!wc->chan)