From patchwork Thu Aug 27 22:37:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 21955 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 9742E449188 for ; Fri, 28 Aug 2020 02:03:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7908E68ABC4; Fri, 28 Aug 2020 02:03:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D3E46880AC for ; Fri, 28 Aug 2020 02:03:38 +0300 (EEST) Received: by mail-ed1-f65.google.com with SMTP id ba12so5305446edb.2 for ; Thu, 27 Aug 2020 16:03: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=i0R8a6/UFGuiyJdyqxQ5gsc2jajNo2RXDOkhx/cCWT4=; b=ldCtvNH+5H7Z4sSCTMydQsjCNAhBObBG3oSS3daYoKa0wiVAuzn47c6GUKfKYVqXsk Uf6pg9nnnUO9dG9k7m1xaWBc74LvhShplu5ez+cBs4wKlVfcJuWFU74dSUP1Mzw/J6IJ EXHij8TA0gAshcdOmy1KzPCozkrNdWsfHRjlD50nf1naND1AZsiezgZd36lC2G0ov4HG zKNiY2SE+qbU+xOOCzHnv3rWJwS3020fm06SBA5m3yBw08LCVeXL/G/GouJ8krtVcJau 4p66oOMexQIuCIDMMQ4EJY/5buv/A+qp2d0lRfCU90bSshiAp/wpTbypEGV610JzOyTn Yzyg== 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=i0R8a6/UFGuiyJdyqxQ5gsc2jajNo2RXDOkhx/cCWT4=; b=T6ZRD0ytPK9fMMtulv1MLnG5UTEyyXVS29/uIlxAJADQrdVxvQhM7SPCSEsddM1uyb btzPzJnErcpc1wgSBzpJYZBx4klrodIw4uHZpq9OvNp+4JdoRyI7cIlnj+bmqUUyygQI U/8sAMB28+Q04zSh5H3icWyaQiFIEc4k4mZZjKO2PLVDKY+h4tOu4Rq4cky19dt9KRo/ apFkXTFFGetH8v3GOAnCd+cJYH44k20P7NHHvVKk8dB+wzou+yLGYy8s/tDeZF/cRG/v GbStlEehQlRZKifRKFLLSRMBIgJ/tjdQis+vDqUyxWtQC9kd42rfF5tfrblhLTcR93dZ G36g== X-Gm-Message-State: AOAM533zmA4C42tbWNqfo6jZKK6htwvfLN2/QyvAxd1MQK2/qrzUZvAo tJRRww7soNO6kWH452HLUqo1QEkmEZKHDA== X-Google-Smtp-Source: ABdhPJwhPdlFxiZLmzZ0K5OUkkHMF1jHPtgSOrtyAdoOMHC/2m1YmrzCv3SpEUgbXk3VCSTtOxwHQQ== X-Received: by 2002:a17:906:a253:: with SMTP id bi19mr22621936ejb.338.1598567868496; Thu, 27 Aug 2020 15:37:48 -0700 (PDT) Received: from localhost.localdomain ([94.250.163.64]) by smtp.gmail.com with ESMTPSA id r3sm2825782ejy.95.2020.08.27.15.37.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Aug 2020 15:37:48 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Aug 2020 00:37:38 +0200 Message-Id: <20200827223738.2615-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] avformat/wavdec: add support for demuxing Broadcast Wave 64Bit 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavformat/wavdec.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index c35966f970..a2d563ba68 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -6,6 +6,8 @@ * RF64 demuxer * Copyright (c) 2009 Daniel Verkamp * + * BW64 demuxer + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -140,7 +142,8 @@ static int wav_probe(const AVProbeData *p) * its own, the returned score is decreased to avoid a probe * conflict between ACT and WAV. */ return AVPROBE_SCORE_MAX - 1; - else if (!memcmp(p->buf, "RF64", 4) && + else if ((!memcmp(p->buf, "RF64", 4) || + !memcmp(p->buf, "BW64", 4)) && !memcmp(p->buf + 12, "ds64", 4)) return AVPROBE_SCORE_MAX; } @@ -330,7 +333,7 @@ static int wav_read_header(AVFormatContext *s) { int64_t size, av_uninit(data_size); int64_t sample_count = 0; - int rf64 = 0; + int rf64 = 0, bw64 = 1; uint32_t tag; AVIOContext *pb = s->pb; AVStream *st = NULL; @@ -353,6 +356,9 @@ static int wav_read_header(AVFormatContext *s) case MKTAG('R', 'F', '6', '4'): rf64 = 1; break; + case MKTAG('B', 'W', '6', '4'): + bw64 = 1; + break; default: av_log(s, AV_LOG_ERROR, "invalid start code %s in RIFF header\n", av_fourcc2str(tag)); @@ -368,7 +374,7 @@ static int wav_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } - if (rf64) { + if (rf64 || bw64) { if (avio_rl32(pb) != MKTAG('d', 's', '6', '4')) return AVERROR_INVALIDDATA; size = avio_rl32(pb); @@ -423,7 +429,7 @@ static int wav_read_header(AVFormatContext *s) return AVERROR_INVALIDDATA; } - if (rf64) { + if (rf64 || bw64) { next_tag_ofs = wav->data_end = avio_tell(pb) + data_size; } else if (size != 0xFFFFFFFF) { data_size = size; @@ -440,7 +446,7 @@ static int wav_read_header(AVFormatContext *s) /* don't look for footer metadata if we can't seek or if we don't * know where the data tag ends */ - if (!(pb->seekable & AVIO_SEEKABLE_NORMAL) || (!rf64 && !size)) + if (!(pb->seekable & AVIO_SEEKABLE_NORMAL) || (!(rf64 && !bw64) && !size)) goto break_loop; break; case MKTAG('f', 'a', 'c', 't'):