From patchwork Thu Mar 26 04:05:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18407 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 2313C449F3A for ; Thu, 26 Mar 2020 06:06:14 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E67768B0F2; Thu, 26 Mar 2020 06:06:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CCA7968B0D8 for ; Thu, 26 Mar 2020 06:06:07 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id 31so6108749wrs.3 for ; Wed, 25 Mar 2020 21:06:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Rsuk5VjxKZt7Opg783i1/eSstlyd5leDmPhiUtSpyqA=; b=DuI6JUVoY/2gquFyKfK7UtMb/LkSRBSUAphyWmV1Eu10xf+1AeyDKBiMInv/KTBUlU e/wKDffSK/kRj7Y8uvNl34M7zezINfm8hISN5eZAqBbuJ30WOEcX/UGP0QWh3qfy/QLT XVv5tN4meFvTusrTHoScfh5Aglr7FFhnmKBHd29XdPFdhMRQUBTMfVq8Q5sTShRvU5sa SwQidP4NrA/6eoyTdmRpLOQtkg3QexdC9U0xrxIOLv+rESXOI9xkhcJAnFDP0h0dIaav G3O5dGkKR6IqgErjP/NserP+0yrHgt8yxWq2wTLUUmkQBDLVpv5bVwsE1r3gtMnzQJpY nHQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Rsuk5VjxKZt7Opg783i1/eSstlyd5leDmPhiUtSpyqA=; b=s0zWsxTi2av+ipitPjyQ+v37VH7GeP1uG/o20spLm03MQSYSlU984Cfg+wJjc4E+/T IKUkHV+FvhdViic096V9tBMqw7M/RiB5QCCMEiDTEQ0CU1UmG2OJH0QdWbu8v0HwmUnL i3VWyCKjc1v3fUGtp/bfbR1rPGxqoQnVyv9aq5fe8qs5mebJVMxfm2x+sAQPKD8fxG4i 2d1Uwf8GSmsCwkcHJOKe9NcsV28Gwtl13LloIW9Rimk8ktIn1et7R3lu12BidtQr14Z5 5PPEfzhlGBOlrsw6GK7O2clf5/x69JHr0DwDtBzTaXCqVDuZo5o4XOPbcGbOPcLvOLNF vnxQ== X-Gm-Message-State: ANhLgQ1PQCm9c0/pl1GkoO74E52CPflQkTjD5Fe+B07X2h9rzUXYjQe4 UDFwDvd7IRNwbfL2mCyEXVlYeOPF X-Google-Smtp-Source: ADFU+vvAGWVqR9HAc24GaVqlHBRKPD5BnW63IJo1djF2oWWvqIHnOPVNj3YJOS6ulJuKMTAqj9cTqQ== X-Received: by 2002:a5d:4bc1:: with SMTP id l1mr7347952wrt.103.1585195566926; Wed, 25 Mar 2020 21:06:06 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id u13sm1620547wru.88.2020.03.25.21.06.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 21:06:06 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 26 Mar 2020 05:05:38 +0100 Message-Id: <20200326040539.24719-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200326040539.24719-1-andreas.rheinhardt@gmail.com> References: <20200326040539.24719-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/wvdec: Export version as extradata 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It might be used by the Matroska muxer. This is also the reason why the FATE-tests for muxing WavPack into Matroska needed to be updated: They now write the correct version 4.07 and not 4.03 as before. Signed-off-by: Andreas Rheinhardt --- libavformat/wvdec.c | 3 +++ tests/fate/wavpack.mak | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavformat/wvdec.c b/libavformat/wvdec.c index e56a6932ad..b9fc6a59f9 100644 --- a/libavformat/wvdec.c +++ b/libavformat/wvdec.c @@ -250,6 +250,9 @@ static int wv_read_header(AVFormatContext *s) st = avformat_new_stream(s, NULL); if (!st) return AVERROR(ENOMEM); + if ((ret = ff_alloc_extradata(st->codecpar, 2)) < 0) + return ret; + AV_WL16(st->codecpar->extradata, wc->header.version); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_WAVPACK; st->codecpar->channels = wc->chan; diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak index a89cc1293d..bc7a5cc92f 100644 --- a/tests/fate/wavpack.mak +++ b/tests/fate/wavpack.mak @@ -91,12 +91,12 @@ fate-wavpack-matroskamode: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/matros FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-mono fate-wavpack-matroska_mux-mono: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -fflags +bitexact -f matroska fate-wavpack-matroska_mux-mono: CMP = oneline -fate-wavpack-matroska_mux-mono: REF = 0a1a7c6d3b413925f8261c92d1d53363 +fate-wavpack-matroska_mux-mono: REF = a9da0444604848080b08e32de19f42d9 FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-61 fate-wavpack-matroska_mux-61: CMD = md5pipe -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -c copy -fflags +bitexact -f matroska fate-wavpack-matroska_mux-61: CMP = oneline -fate-wavpack-matroska_mux-61: REF = 1f012f7c237f46f2f63089ba84c589c5 +fate-wavpack-matroska_mux-61: REF = 60812e377937456863a3c899ee068060 FATE_SAMPLES_AVCONV += $(FATE_WAVPACK-yes) fate-wavpack: $(FATE_WAVPACK-yes)