From patchwork Wed Oct 3 20:32:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bananaman255@gmail.com X-Patchwork-Id: 10596 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp52870uaq; Wed, 3 Oct 2018 13:32:45 -0700 (PDT) X-Google-Smtp-Source: ACcGV60ifThOmKFep/dns97tU8x1gW2nd73DR3FxFWH4u6F1ZxtAA7croXDhn5yhvqhTD5KFtixu X-Received: by 2002:a5d:548e:: with SMTP id h14-v6mr2520392wrv.316.1538598765425; Wed, 03 Oct 2018 13:32:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538598765; cv=none; d=google.com; s=arc-20160816; b=U2fCZBF1rATpwiN9wTb2Zlz8dXVwfPkIO5Gf36PhhDE5uPSLYlw+qFNIpA8CTL8TsE MfE0rndGyxGI5jamAUBNyFwIAd7nHBD0uN6XPf92n9Uuuk9rocrNuDInE2uOE3mP7IfL NrlzllqLl6UrCbv/evZMmqBduYkS4xJCb2PEsafkVyuT6w0n72umbQEbfsJKqsXMH+8r YsvvjIXpMglh/n4DC7JbzjgTdmIMyvxHpdDP4Ck92H3XOdXfxVAZFAWMRrwVSyyB06Cd lLOyTTjNp3LQTAPz2tXpJMD0Y3ayvwKCqS7ZSQKiRAAPshBzdCv5fuPZNlRSbgp5TJDj mMEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=tf6/e8gpW+4zczK0MBW2fsPHW+U21AW6tG5nVtufgpM=; b=KwuDvCXJVm6zEUcTV8Ov57QooPQ9PilGbbHQXOCn2ZBTNFmFKK6SdQ+kSzYxhZ5bSh cuZJnN2I1A1RqZV5FEvD7tkUozsB6KgyApEnpXXghoraIhp1RygiQlVWwACTvxhEtMWY aXmvex5uvCSU4Cv8mrpSVuC8geYhgEcBxWdBE4RLNtmRlXgtBbrLekui4f9dkqtm8GS6 c8NY8RA5pMagm3u9UvFUhJXOpv7ya912txHmWs1VimLwZXq8KMitQnsKPA46Xgg4Z4gI tvwdphm1X+oT+P7nKshoHT+WQeLw192efpPjmhSX9ok2ns1SaHzZ6DDJl7BGbydGY+us yYcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=t84jXNwL; 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 h4-v6si2113772wmh.91.2018.10.03.13.32.44; Wed, 03 Oct 2018 13:32:45 -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=@gmail.com header.s=20161025 header.b=t84jXNwL; 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 6C87B68A3B8; Wed, 3 Oct 2018 23:32:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87AA6689950 for ; Wed, 3 Oct 2018 23:32:17 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id a8-v6so2879806wmf.1 for ; Wed, 03 Oct 2018 13:32:37 -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; bh=l3KZNq8nxsuR19g51B+Xm9YgsHtfqEI3ajuhEz2rpwA=; b=t84jXNwLoevM8kFE3i/C+9c9yl6YILcFjauxYyujOQpzgB6irsQCKk9k19zwcn5Qps tsd7mQUXTuUvj5cMMudViFNZnPh+7zQlr2UZUWG/Du0mHST5Q+Yg0QpHB/xY/6vzca22 /e9xk9qiMdsVpW5u37AmTylPdHNlnw0d3ylyHt0CvEZGiIsWK5xKs3fPtZpvrMu9AgTw DLN4o8aLBCv4G02aHQqJ7l2cwpAi6bwwDahUqtP1IJEGRQOu7VCgi9WHx1gEPkJmIlJt xnsxqMDoIm90YhYc9GOgglOGdrUdAk6bdC8/QsWYWm1rDVL9rQOccmhBehfPasJltW8r VQ1w== 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; bh=l3KZNq8nxsuR19g51B+Xm9YgsHtfqEI3ajuhEz2rpwA=; b=Ny26qX59c/J6x0M/UOYqdnA6IyOCJ1OcBSX42VQLAhibfoLmCvwfHWnbGHL6uYqrfl e9CM1ygUSuKPQORmREQZ9i9YezVzHtHxfegalCtgyc9PLdTPGKZt09uKFX71rotLWcRM KW5PxA+ZGH9GMTOJZACghpMTv98Qp1kxxHfBL6Bv86AV7AsGeKDKhOb6dnKWZ3gIqU6o /bdLsBtkOSMidH1GONhZyOU4va4MBisx5wFqjEmSX6L4fCfmtPTH5C7qwBEplK2v3UM4 P9QqM6FU9VpBZ3lRz/PhbsJ2VSl6WIqyiqI3YNDEoISjiFrGvHEiZSoUlCY17Sdcv9cL ZrkQ== X-Gm-Message-State: ABuFfoiWJHrpnLa+m6qPyhx3m6kMIRe/X7G7tOhoVMo1pcVbIZ8YJ6hv e/EmiVKHZVxnsguYTGG2Ux/BO3sW X-Received: by 2002:a1c:84cd:: with SMTP id g196-v6mr2602023wmd.38.1538598756363; Wed, 03 Oct 2018 13:32:36 -0700 (PDT) Received: from localhost.localdomain (117.98.132.37.dynamic.jazztel.es. [37.132.98.117]) by smtp.googlemail.com with ESMTPSA id u76-v6sm4408526wmd.10.2018.10.03.13.32.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Oct 2018 13:32:35 -0700 (PDT) From: bananaman255@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Oct 2018 22:32:04 +0200 Message-Id: <20181003203204.2704-1-bananaman255@gmail.com> X-Mailer: git-send-email 2.11.0.windows.3 Subject: [FFmpeg-devel] [PATCH] avformat/xwma: fix WMAv2 with incorrect bit rate 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: bnnm MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: bnnm Fixes trac issue #7215 Output for files created by xWMAEncode and various videogames is correct now. 1ch 32000hz files are still broken, would need fixes in WMA decoder. Signed-off-by: bnnm --- libavformat/xwma.c | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/libavformat/xwma.c b/libavformat/xwma.c index 1c18772928..f357c3e881 100644 --- a/libavformat/xwma.c +++ b/libavformat/xwma.c @@ -80,19 +80,43 @@ static int xwma_read_header(AVFormatContext *s) return ret; st->need_parsing = AVSTREAM_PARSE_NONE; - /* All xWMA files I have seen contained WMAv2 data. If there are files - * using WMA Pro or some other codec, then we need to figure out the right - * extradata for that. Thus, ask the user for feedback, but try to go on - * anyway. - */ + /* XWMA encoder only allows a few channel/sample rate/bitrate combinations, + * but some create identical files with fake bitrate (1ch 22050hz at + * 20/48/192kbps are all 20kbps, with the exact same codec data). + * Decoder needs correct bitrate to work, so it's normalized here. */ + if (st->codecpar->codec_id == AV_CODEC_ID_WMAV2) { + int ch = st->codecpar->channels; + int sr = st->codecpar->sample_rate; + int br = st->codecpar->bit_rate; + + if (ch == 1) { + if (sr == 22050 && (br==48000 || br==192000)) + br = 20000; + else if (sr == 32000 && (br==48000 || br==192000)) + br = 20000; + else if (sr == 44100 && (br==96000 || br==192000)) + br = 48000; + } + else if (ch == 2) { + if (sr == 22050 && (br==48000 || br==192000)) + br = 32000; + else if (sr == 32000 && (br==192000)) + br = 48000; + } + + st->codecpar->bit_rate = br; + } + + /* Normally xWMA can only contain WMAv2 with 1/2 channels, + * and WMAPRO with 6 channels. */ if (st->codecpar->codec_id != AV_CODEC_ID_WMAV2 && st->codecpar->codec_id != AV_CODEC_ID_WMAPRO) { avpriv_request_sample(s, "Unexpected codec (tag %s; id %d)", av_fourcc2str(st->codecpar->codec_tag), st->codecpar->codec_id); } else { - /* In all xWMA files I have seen, there is no extradata. But the WMA - * codecs require extradata, so we provide our own fake extradata. + /* xWMA shouldn't have extradata. But the WMA codecs require it, + * so we provide our own fake extradata. * * First, check that there really was no extradata in the header. If * there was, then try to use it, after asking the user to provide a