From patchwork Tue Jun 9 00:19:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 20232 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a25:bac9:0:0:0:0:0 with SMTP id a9csp112413ybk; Mon, 8 Jun 2020 17:20:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyiyl3lF0v8szvpc3EZx2baQKkTvgBppJebf3zv/9S21SW90WLz1V48kS95K6XWduSrJ2UA X-Received: by 2002:a5d:68c2:: with SMTP id p2mr1329263wrw.253.1591662041969; Mon, 08 Jun 2020 17:20:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591662041; cv=none; d=google.com; s=arc-20160816; b=l7G2W0wm9P2+1wYQG6XkUlv2a++G9S5NlBvdmPij+N3VYMwYGdcP2d+o6DIrxMgfyu IInvOewnhakrKMMSw6e/cE/d4Mg1Aj4dZnKQS3qYFojK5/1yxG3U9wgsgPpQqA+8PXN2 9zUm7pUXNrV+FoZqSJxrxQY0pJ+tp+8mPRfMJfLCGqRdlTtxReoY3FCyqHTcGz8cNad8 4fhcwGVtYIbmTnwnaqJJvc2fTNVjkqrW3ylzaK5l1kC92bnV0ro7ASak/i80MGzcImmM kvQdOEw0LThxy8FNnjWMfXlEWe+8PIUrDNO2q/FYm2smcz4bu6vMBDWJY8ggP2iF+8fi Rzxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:from:to :dkim-signature:date:delivered-to; bh=UshiBjF1qbjdVx8sRggMQcaqsDI2/wp8EgMHIgejR54=; b=VFkx/LQL8CumRExpKjnhb2h78B2aDg0w8MSb1P6xrVld1uXYJYOyUFPJL+hwjXQ1tG OdGuT9jurzKiHqiplCUnM/jZnDQYydu5wmWqqkqZrYxQfxW2T0aKuPFZuS8/G90cuBus L8fCACKu9vxkwx7odAobwKMTwhM1gw2Ywj9HpxKigBf36s0u+zckAlYqUp7OGsnx7DQN NEx92rTbgoA77uU0ePy+iQFrjfpK3ZQL8I8sGmO4AogTkuKIbGYWwv2NvhXOnO3zo/FQ +jydTOKNVg5eqic+TuY3TqH2AsibJWuzJD0CdkC3P0BsSXBz+he8elknSv2N+FEgSq6M Y8wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=protonmail header.b=cYlG+EGm; 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=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2si1381518wrd.270.2020.06.08.17.20.40; Mon, 08 Jun 2020 17:20:41 -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=@zanevaniperen.com header.s=protonmail header.b=cYlG+EGm; 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=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8515E68B3E4; Tue, 9 Jun 2020 03:20:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-40134.protonmail.ch (mail-40134.protonmail.ch [185.70.40.134]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EBD8768B3CB for ; Tue, 9 Jun 2020 03:20:03 +0300 (EEST) Date: Tue, 09 Jun 2020 00:19:55 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=protonmail; t=1591662003; bh=77D7wJO/WpvMigkeOR9bgWpqa+nQGxWcFrtuZM04bOQ=; h=Date:To:From:Cc:Reply-To:Subject:From; b=cYlG+EGmjh6au6i+tR5yKwHhggNig9sz0V71HK4+SsAO25Wfv2tHY9AxrodUiSCfN brpI/j5UHWendTLZOr47wLHHLSfjgm58TxmkjA0UXRDw/Dt5NZfpWC3Q1uFzXhEmZM sbw3i4NCODrE6XhkTMvyiC7iyhZaU0iCFWU5QrZc= To: ffmpeg-devel@ffmpeg.org From: Zane van Iperen Message-ID: <20200609001730.961175-7-zane@zanevaniperen.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.2 required=7.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=disabled version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on mail.protonmail.ch Subject: [FFmpeg-devel] [PATCH 6/7] avformat/apm: name and probe fix 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: Zane van Iperen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: b4iQW8Z7ek8Z Content-Length: 2533 Signed-off-by: Zane van Iperen --- libavformat/apm.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libavformat/apm.c b/libavformat/apm.c index 46a0c67b79..8ece104ae7 100644 --- a/libavformat/apm.c +++ b/libavformat/apm.c @@ -31,8 +31,8 @@ #define APM_EXTRADATA_SIZE 28 #define APM_MAX_READ_SIZE 4096 -#define APM_CODEC_TAG 0x2000 +#define APM_TAG_CODEC 0x2000 #define APM_TAG_VS12 MKTAG('v', 's', '1', '2') #define APM_TAG_DATA MKTAG('D', 'A', 'T', 'A') @@ -82,6 +82,9 @@ static void apm_parse_extradata(APMExtraData *ed, const uint8_t *buf) static int apm_probe(const AVProbeData *p) { + if (AV_RL16(p->buf) != APM_TAG_CODEC) + return 0; + if (p->buf_size < 100) return 0; @@ -109,7 +112,7 @@ static int apm_read_header(AVFormatContext *s) * This is 98% a WAVEFORMATEX, but there's something screwy with the extradata * that ff_get_wav_header() can't (and shouldn't) handle properly. */ - if (avio_rl16(s->pb) != APM_CODEC_TAG) + if (avio_rl16(s->pb) != APM_TAG_CODEC) return AVERROR_INVALIDDATA; par = st->codecpar; @@ -248,7 +251,7 @@ static int apm_write_header(AVFormatContext *s) * Bodge a WAVEFORMATEX manually, ff_put_wav_header() can't * be used because of the extra 2 bytes. */ - avio_wl16(s->pb, APM_CODEC_TAG); + avio_wl16(s->pb, APM_TAG_CODEC); avio_wl16(s->pb, par->channels); avio_wl32(s->pb, par->sample_rate); avio_wl32(s->pb, par->sample_rate * par->channels * 2);