From patchwork Wed Feb 3 09:57:34 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: 25363 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 238BE44B486 for ; Wed, 3 Feb 2021 11:57:52 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F13FA68A558; Wed, 3 Feb 2021 11:57:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A804A68A477 for ; Wed, 3 Feb 2021 11:57:44 +0200 (EET) Received: by mail-ed1-f53.google.com with SMTP id s11so26102856edd.5 for ; Wed, 03 Feb 2021 01:57:44 -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=Cvx6hHalUhRhMxZKSi9JUzqxx6NULhFOIb1SlY8fLvs=; b=Hw2jFqTkABhDhU1Kc0DEsm1hr2QlQ/1VaelncCbgrtsLjYviJjU64k40cZMjsDczfZ 3MkdFKBHQ030IskjMbDjXxm00EuXLlvARF/dVG0LhAoVfKo0kmLAtvHOGZTkstG7Ny3e wTZbMVkO0MAMZlHBtWQONFsIYMG0vULg9hQXNrE92Mbs1sX9P5oChRBsSa8UtE5H+DQN JpYiGFnI3CsNzuPtN3Lkpp4bsBJs5Id/7Y2//7iTDjlLGOJDD1BSbDtfDXKKnD868Iyv C/j7GHBXDrUGopyMnwwzmWJ4e+vQDX6wnBkRpzXWn3a4B7drBAkL8NNXjhXAqtuQsfmc RHJg== 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=Cvx6hHalUhRhMxZKSi9JUzqxx6NULhFOIb1SlY8fLvs=; b=qlAtX4e3PvXsL+cGHg7xGgXmfxOU8ytV1TfMmCHx+PbltACQcMaXTxjkrskvbO51ZW wbnkgszkmWIuvutrITsHZ15q2Bu7RQMnRKxUdj3SAM1OUikduNz4/qMKEajDCYlh8/EN v8ohcv80VhLHU3uu6ClpkjBvyyt4H5QlgAmx1NrdMhc0q0gHwFW4LrhZwu649eJ0YXnQ niheSOarW+A4/K42LTM6qoQJtHL+vLnH+18nMBoBWp9+IdX81iQdClFu/dj18A8X1ahE f30SuJPV6Q/uUeDQKlMrce0DW2jJvZerUMmY7AX6V7tQ8zHO3VNI8g2AXNEwAehJHeP0 8Ksw== X-Gm-Message-State: AOAM531dTB2lIR/2pxAr6r/nswYf3POquL1TVBYfin52b0BCUc4PBind KH8xCrXOhi+lY8fyGwLWDsaMbgluOsplcg== X-Google-Smtp-Source: ABdhPJz/JzMOvkIj3YMxRYt72CXWPleqDiAwBpfqZXJxRdPctI/FMTOl/0FAX8SuGe42kqW2VaKQcg== X-Received: by 2002:a50:9fae:: with SMTP id c43mr2121820edf.269.1612346264014; Wed, 03 Feb 2021 01:57:44 -0800 (PST) Received: from localhost.localdomain ([31.45.254.141]) by smtp.gmail.com with ESMTPSA id u5sm638836edc.29.2021.02.03.01.57.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Feb 2021 01:57:43 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 3 Feb 2021 10:57:34 +0100 Message-Id: <20210203095735.23205-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 | 103 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 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..b8e09b9c10 --- /dev/null +++ b/libavformat/binka.c @@ -0,0 +1,103 @@ +/* + * 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') && + (p->buf[4] == 1 || p->buf[4] == 2)) + return AVPROBE_SCORE_MAX; + return 0; +} + +static int binka_read_header(AVFormatContext *s) +{ + AVIOContext *pb = s->pb; + AVStream *st; + int entries; + int64_t offset; + + 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, 8); + entries = avio_rl16(pb); + avio_skip(pb, 2); + + offset = entries * 2; + avio_skip(pb, offset); + + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); + + return 0; +} + +static int binka_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + AVIOContext *pb = s->pb; + AVStream *st = s->streams[0]; + 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->duration = av_get_audio_frame_duration2(st->codecpar, 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", +};