From patchwork Wed Feb 3 00:40:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 25361 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 2BD6544A0C7 for ; Wed, 3 Feb 2021 02:48:23 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F0FE1689C71; Wed, 3 Feb 2021 02:48:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41704689AA2 for ; Wed, 3 Feb 2021 02:48:16 +0200 (EET) Received: by mail-ed1-f46.google.com with SMTP id y18so7688053edw.13 for ; Tue, 02 Feb 2021 16:48:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=2ArQRHVXAX8Vud3MHUOJ+7oz6xFijH9wDrLGOf47U9Y=; b=Pf3/sqrbX0kxH4y9z/dxlDhfW0yUQdBhEy4p4e3LURjCJJLWW+XzzNMYCCJK0eSe8V kRhuVwsti+B6pPAKhWTPNeZHueHm125yB4jiB8Ce9K9vgtfDax3wgNEsSYyIF6N7vhIn L6w+d/zvmozP3mcKUzmHmG7N3FcDEpyUfcrcwM+ipwywGDryVTvaHTBwCFYcGqKy68fa cfKxmPcnYHOqq16uVS6u22YhpcgYTyYPjNz5VOK3W0QY+s+OKwV8daBsODlkMF/+0wth sGg6FTsdkRvIg+sPhcTUZ5pKqtK6vZqABd6PJ408R2QG4+bJkCemxjPrmlCdOge3D0o0 JrQA== 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=2ArQRHVXAX8Vud3MHUOJ+7oz6xFijH9wDrLGOf47U9Y=; b=TVhv80BE1VEztsb47kA9S31tWNf/nbQj+J3CdAv/vc5AvVPXtwBw0fO9/pDVjEvvk0 B+ZfOE/ehS805QXWh07yHsN/0w6+eAyS7LtXEGaNU8rTW1T9Oux79AtZg5cTKAC11WLF 04tm4GFZeQeJj3hf5uVnwB5nSChfJvdbXXN7Kv2DA8vREvOFFmbspZkURGnYPwaeA2C7 YFvl1ELujJh8jRinBLXxIdbY06/3MkJG4D4tlGG3ZqlhcQ2e762IgYMkc1pXI95J73O4 90HelawZLnr2hzC8rqm9YX7SBLEBZ2WZjo+OZkbG8uccc+0jeJLsfXGPbH19pP/bDg7g 2fAw== X-Gm-Message-State: AOAM531aRWCJkzL6bS72lYz4GqtEquBFh1bgkrpPbczDkSnjVC0r0rJy 8RrHYmk10cFBIHX+g+UWYUD3Bj42XE/P8g== X-Google-Smtp-Source: ABdhPJyR+cEup2BI3xECJyzDbYsVkXnUQI6h3f3ETxWlBu0WVBfMt62OfPjKbhmUZKnl3YEOo3PPOQ== X-Received: by 2002:a17:906:2747:: with SMTP id a7mr629835ejd.250.1612312836797; Tue, 02 Feb 2021 16:40:36 -0800 (PST) Received: from localhost.localdomain ([31.45.254.141]) by smtp.gmail.com with ESMTPSA id b6sm61066ejb.8.2021.02.02.16.40.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 16:40:36 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Feb 2021 01:40:26 +0100 Message-Id: <20210203004027.10772-1-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] avformat: add binka demuxer 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/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/binka.c | 107 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+) create mode 100644 libavformat/binka.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 85f432c8d9..b977fa0b1e 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -131,6 +131,7 @@ OBJS-$(CONFIG_AVS3_DEMUXER) += avs3dec.o rawdec.o OBJS-$(CONFIG_BETHSOFTVID_DEMUXER) += bethsoftvid.o OBJS-$(CONFIG_BFI_DEMUXER) += bfi.o OBJS-$(CONFIG_BINK_DEMUXER) += bink.o +OBJS-$(CONFIG_BINKA_DEMUXER) += binka.o OBJS-$(CONFIG_BINTEXT_DEMUXER) += bintext.o sauce.o OBJS-$(CONFIG_BIT_DEMUXER) += bit.o OBJS-$(CONFIG_BIT_MUXER) += bit.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 6990af55f4..9628c726a7 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -94,6 +94,7 @@ extern AVInputFormat ff_bethsoftvid_demuxer; extern AVInputFormat ff_bfi_demuxer; extern AVInputFormat ff_bintext_demuxer; extern AVInputFormat ff_bink_demuxer; +extern AVInputFormat ff_binka_demuxer; extern AVInputFormat ff_bit_demuxer; extern AVOutputFormat ff_bit_muxer; extern AVInputFormat ff_bmv_demuxer; diff --git a/libavformat/binka.c b/libavformat/binka.c new file mode 100644 index 0000000000..5ed0f17968 --- /dev/null +++ b/libavformat/binka.c @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2021 Paul B Mahol + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/intreadwrite.h" +#include "avformat.h" +#include "internal.h" + +static int binka_probe(const AVProbeData *p) +{ + if (AV_RB32(p->buf) == MKBETAG('1', 'F', 'C', 'B')) + return AVPROBE_SCORE_MAX; + return 0; +} + +static int binka_read_header(AVFormatContext *s) +{ + AVIOContext *pb = s->pb; + AVStream *st; + uint32_t samples; + int entries; + int64_t offset; + int ret; + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + avio_skip(pb, 5); + + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = AV_CODEC_ID_BINKAUDIO_DCT; + st->codecpar->channels = avio_r8(pb); + st->codecpar->sample_rate = avio_rl16(pb); + st->duration = avio_rl32(pb); + + avio_skip(pb, 4); + samples = avio_rl32(pb); + entries = avio_rl16(pb); + + if ((ret = ff_get_extradata(s, st->codecpar, pb, 2)) < 0) + return ret; + + offset = entries * 2; + avio_skip(pb, offset); + + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); + + s->internal->data_offset = avio_tell(pb); + + return 0; +} + +static int binka_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + AVIOContext *pb = s->pb; + int64_t pos; + int pkt_size; + int ret; + + if (avio_feof(pb)) + return AVERROR_EOF; + + pos = avio_tell(pb); + avio_skip(pb, 2); + pkt_size = avio_rl16(pb) + 4; + if (pkt_size <= 4) + return AVERROR(EIO); + ret = av_new_packet(pkt, pkt_size); + if (ret < 0) + return ret; + + avio_read(pb, pkt->data + 4, pkt_size - 4); + AV_WL32(pkt->data, pkt_size); + + pkt->pos = pos; + pkt->stream_index = 0; + pkt->flags |= AV_PKT_FLAG_KEY; + + return 0; +} + +AVInputFormat ff_binka_demuxer = { + .name = "binka", + .long_name = NULL_IF_CONFIG_SMALL("Bink Audio"), + .read_probe = binka_probe, + .read_header = binka_read_header, + .read_packet = binka_read_packet, + .flags = AVFMT_GENERIC_INDEX, + .extensions = "binka", +}; From patchwork Wed Feb 3 00:40:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 25360 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 4378A449090 for ; Wed, 3 Feb 2021 02:40:44 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12C2E6897BF; Wed, 3 Feb 2021 02:40:44 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f49.google.com (mail-ed1-f49.google.com [209.85.208.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2ECB1680812 for ; Wed, 3 Feb 2021 02:40:38 +0200 (EET) Received: by mail-ed1-f49.google.com with SMTP id y18so7675598edw.13 for ; Tue, 02 Feb 2021 16:40:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=K5O5bttOKXTchxFtyR00hbJ2qsAP+IQ5+jgLXbAwxEw=; b=qtQjts4rdNv6sr0mA8D09KJXV0i36uIDOKaPGbJLbMna48190UHb2sD870myGkvYyH laviL7u4jLFrgVm6RO6oe8CczHM+MNBIEZrpMRIUpGJtb9U5+wGjFV8SexOMhjA4hVRx z3LtZsN3wUba1gFR/Ib7tRuCZBI4IPKL8QPVh/1ceGZreWUcCLrSA9AtqWbg0drwjcTE sbPihCOwUqEjrACGf3xqhIgtxeqRFsYG6bcjlP1GTohoRH/0Rw5WEAnqCE5Y5tqWB880 IG/Ub+ooq4MPqDybw4hm0bTUv1MpQ8jTqaVTeeg5KviBPJwOI8FD3DU7pQH2NMw6UpDO jE8g== 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:in-reply-to :references; bh=K5O5bttOKXTchxFtyR00hbJ2qsAP+IQ5+jgLXbAwxEw=; b=jmI1AkhY/8/TB5tv4y11MKiHnBtU0+bUS+B2d5QovTlzaPJ4GnTOq8TrF06UhsPgn/ W5R0zTpzUufr/ZDiHcav2cYfPiUbaSYxHGNFxiwuRyGpRor+UNVONr3mXEfFAzKh5nac dZSXSllMgZo8zheOIY5CB3ndaNfkWz6W0TLPHQE+NodZEnrLYc8Ea9cBbXiKcn+71+sV rw2OboVPy59Lmyuvmv66464Epx6bLKNWiTZsEhX45O7lzLutDcPTjvf3l5e2rDOBzhHF TCC+4KEkQtfIUz//QdO6djjo1Bi9IVWQEB6VKS8GPCb9KilxHyyRaGN5wyb9+sO4lUvX DkGg== X-Gm-Message-State: AOAM532pfR3D5t7PR7pcFNzl+l+E0JvfLaiyrQAhEefG/umnbiXn8XRm YD8SlSZvsNP4C95qKxeThe9wX3oQyOxDFA== X-Google-Smtp-Source: ABdhPJxeDmyTwLDgQtEuYJXR2Igq/7TXcAgdjzIKsVThzhRafNsZmSCDhQ+QeWfGjDZy/BwaYsimxQ== X-Received: by 2002:aa7:c504:: with SMTP id o4mr665287edq.86.1612312837778; Tue, 02 Feb 2021 16:40:37 -0800 (PST) Received: from localhost.localdomain ([31.45.254.141]) by smtp.gmail.com with ESMTPSA id b6sm61066ejb.8.2021.02.02.16.40.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Feb 2021 16:40:37 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Feb 2021 01:40:27 +0100 Message-Id: <20210203004027.10772-2-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210203004027.10772-1-onemda@gmail.com> References: <20210203004027.10772-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/utils: unbreak BINKAUDIO_DCT duration calculation 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 --- libavcodec/utils.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a1ae9cab18..4d1909b581 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1668,14 +1668,10 @@ static int get_audio_frame_duration(enum AVCodecID id, int sr, int ch, int ba, return 256 * sr / 245; else if (id == AV_CODEC_ID_DST) return 588 * sr / 44100; - - if (ch > 0) { - /* calc from sample rate and channels */ - if (id == AV_CODEC_ID_BINKAUDIO_DCT) { - if (sr / 22050 > 22) - return 0; - return (480 << (sr / 22050)) / ch; - } + else if (id == AV_CODEC_ID_BINKAUDIO_DCT) { + if (sr / 22050 > 22) + return 0; + return (480 << (sr / 22050)); } if (id == AV_CODEC_ID_MP3)