From patchwork Wed Nov 21 05:23:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Bryant X-Patchwork-Id: 11102 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C98FD44C5B4 for ; Wed, 21 Nov 2018 07:23:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 22175688242; Wed, 21 Nov 2018 07:23:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from zoserelay02.impulse.net (zoserelay02.impulse.net [207.154.70.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AEC92680870 for ; Wed, 21 Nov 2018 07:23:04 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by zoserelay02.impulse.net (Postfix) with ESMTP id 27FFE171794 for ; Tue, 20 Nov 2018 21:19:49 -0800 (PST) Received: from zoserelay02.impulse.net ([127.0.0.1]) by localhost (zoserelay02.impulse.net [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id 214KlxmuZS2y for ; Tue, 20 Nov 2018 21:19:48 -0800 (PST) Received: from localhost (localhost [127.0.0.1]) by zoserelay02.impulse.net (Postfix) with ESMTP id AA2DD171786 for ; Tue, 20 Nov 2018 21:19:48 -0800 (PST) X-Virus-Scanned: amavisd-new at zoserelay02.impulse.net Received: from zoserelay02.impulse.net ([127.0.0.1]) by localhost (zoserelay02.impulse.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id zQuiIigdfilf for ; Tue, 20 Nov 2018 21:19:48 -0800 (PST) Received: from [192.168.1.74] (unknown [108.208.199.113]) by zoserelay02.impulse.net (Postfix) with ESMTPA id 44327171785 for ; Tue, 20 Nov 2018 21:19:48 -0800 (PST) To: ffmpeg-devel@ffmpeg.org From: David Bryant Message-ID: <23717d64-cffd-23ab-dbde-28b08dba7c68@wavpack.com> Date: Tue, 20 Nov 2018 21:23:03 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] patch for failing on WavPack DSD files X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Hi, Was made aware of this problem on Kodi: https://github.com/xbmc/xbmc/issues/14771 I'm going to try to add full WavPack DSD support, but thought in the meantime it would be a good idea to detect and error out early. Thanks! David From c86aacdf98c3d34a3f8d63233e01c4a3ab55577e Mon Sep 17 00:00:00 2001 From: David Bryant Date: Tue, 20 Nov 2018 21:00:47 -0800 Subject: [PATCH] detect and error out on WavPack DSD files (which are not currently supported) --- libavformat/wvdec.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/wvdec.c b/libavformat/wvdec.c index 8252656..2060523 100644 --- a/libavformat/wvdec.c +++ b/libavformat/wvdec.c @@ -40,6 +40,7 @@ enum WV_FLAGS { WV_HBAL = 0x0400, WV_MCINIT = 0x0800, WV_MCEND = 0x1000, + WV_DSD = 0x80000000, }; static const int wv_rates[16] = { @@ -97,6 +98,11 @@ static int wv_read_block_header(AVFormatContext *ctx, AVIOContext *pb) return ret; } + if (wc->header.flags & WV_DSD) { + avpriv_report_missing_feature(ctx, "WV DSD"); + return AVERROR_PATCHWELCOME; + } + if (wc->header.version < 0x402 || wc->header.version > 0x410) { avpriv_report_missing_feature(ctx, "WV version 0x%03X", wc->header.version); -- 1.9.1