From patchwork Sun Mar 15 10:37:47 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: 18200 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 AAABD44B0ED for ; Sun, 15 Mar 2020 12:38:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 96ABB68B386; Sun, 15 Mar 2020 12:38:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0849768B372 for ; Sun, 15 Mar 2020 12:38:04 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id 6so17559324wre.4 for ; Sun, 15 Mar 2020 03:38:04 -0700 (PDT) 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=cHzYVhSdRTq6LAlaTwonRvIMmt+UVxKfD/USh/QS9W8=; b=e1h+HgXLsfwqwuoAjVaA9tPMkzAnXm5A13M+/VqJCu8719obAc47sDwxsoW55y2GTv JRtGsljUa+RIfuNaPqxjfb69557oqulzgfkX9HvSNQ3Juxsl99+ZzsxafGc5HiyDpmw4 fKOSX/ZJmpco1FFwI7nVzN9UVmv9d5DI4dYXRNz76nuIYoJloQ0M82wpsbnhlCeEDFBZ z9HCuW85WNQ/vtoCXW0oLbDApL+lQDUsZ+cdIm1uFXNmp806Q3+5sZdvL7aiB1Ou1+r9 RBZ3cGiIcDJYfK/ZNtt7dmV8J9W8Kk3Z4Mwx6vBvaa1oII26MAWUMAAx6DW8DWUif+ra wHOw== 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=cHzYVhSdRTq6LAlaTwonRvIMmt+UVxKfD/USh/QS9W8=; b=PxZ3Dg+N/nQS4C/9seOc/3vfYqPiVLoDjSwAI0CBC+JBjhVSJwypkEOlXIg69pNjEb E2uJqMWBuEADEQG9726JGknAuNbZPtibxEzx7HDv00ve/cFTzW79I3Wu6+E4crtYB5UF 4AJqAtHmYNtwkf4wdKHcOStPC8kP9CYvLC+K2iPtSyPaUo8OSBgOfjOndvYH1VJOrULP TC9m+4xjhTewohy6r1VjbD7du4kic2J8Eknuqsxb7EEis+uKU9fkmwIIfHfdjql5bawo xv7iU1TVSHWxDenI+g0NpcXU4e9xkDV3RcR8G63eHstXfgdtFc9snpnykQ65U+2AMZ2T ERdw== X-Gm-Message-State: ANhLgQ0om6nbhUC3+1a3qQ7H1insU48sS/IEW3oe980xTXY1At7gsdVQ pG0aUbFurlIKRconbvj/V816gsq+ X-Google-Smtp-Source: ADFU+vtfOrwl8kZPBIhcq9Zv06MQ3s1IyIUJF2dE1clwGi0V+qWsmqJ04qsdGgRl2KEByxKS4f8nyg== X-Received: by 2002:adf:9307:: with SMTP id 7mr29068218wro.171.1584268683097; Sun, 15 Mar 2020 03:38:03 -0700 (PDT) Received: from localhost.localdomain ([37.244.240.19]) by smtp.gmail.com with ESMTPSA id x17sm24456209wmi.28.2020.03.15.03.38.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 15 Mar 2020 03:38:02 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 15 Mar 2020 11:37:47 +0100 Message-Id: <20200315103748.2849-4-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200315103748.2849-1-onemda@gmail.com> References: <20200315103748.2849-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/5] avformat: add derf 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/derf.c | 79 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 libavformat/derf.c diff --git a/libavformat/Makefile b/libavformat/Makefile index cd3e9163f5..27615cd746 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -151,6 +151,7 @@ OBJS-$(CONFIG_DASH_DEMUXER) += dash.o dashdec.o OBJS-$(CONFIG_DAUD_DEMUXER) += dauddec.o OBJS-$(CONFIG_DAUD_MUXER) += daudenc.o OBJS-$(CONFIG_DCSTR_DEMUXER) += dcstr.o +OBJS-$(CONFIG_DERF_DEMUXER) += derf.o OBJS-$(CONFIG_DFA_DEMUXER) += dfa.o OBJS-$(CONFIG_DHAV_DEMUXER) += dhav.o OBJS-$(CONFIG_DIRAC_DEMUXER) += diracdec.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index d275c1017b..af10def88b 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -113,6 +113,7 @@ extern AVOutputFormat ff_data_muxer; extern AVInputFormat ff_daud_demuxer; extern AVOutputFormat ff_daud_muxer; extern AVInputFormat ff_dcstr_demuxer; +extern AVInputFormat ff_derf_demuxer; extern AVInputFormat ff_dfa_demuxer; extern AVInputFormat ff_dhav_demuxer; extern AVInputFormat ff_dirac_demuxer; diff --git a/libavformat/derf.c b/libavformat/derf.c new file mode 100644 index 0000000000..58bbf5b791 --- /dev/null +++ b/libavformat/derf.c @@ -0,0 +1,79 @@ +/* + * DERF demuxer + * Copyright (c) 2020 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" +#include "pcm.h" + +static int derf_probe(const AVProbeData *p) +{ + if (AV_RL32(p->buf) != MKTAG('D','E','R','F')) + return 0; + if (AV_RL32(p->buf+4) != 1 && AV_RL32(p->buf+4) != 2) + return 0; + + return AVPROBE_SCORE_MAX / 3 * 2; +} + +static int derf_read_header(AVFormatContext *s) +{ + unsigned data_size; + AVIOContext *pb = s->pb; + AVCodecParameters *par; + AVStream *st; + + avio_skip(pb, 4); + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + par = st->codecpar; + par->codec_type = AVMEDIA_TYPE_AUDIO; + par->codec_id = AV_CODEC_ID_DERF_DPCM; + par->format = AV_SAMPLE_FMT_S16; + par->channels = avio_rl32(pb); + if (par->channels != 1 && par->channels != 2) + return AVERROR_INVALIDDATA; + if (par->channels == 1) + par->channel_layout = AV_CH_LAYOUT_MONO; + else if (par->channels == 2) + par->channel_layout = AV_CH_LAYOUT_STEREO; + data_size = avio_rl32(pb); + st->duration = data_size / par->channels; + par->sample_rate = 22050; + par->block_align = 1; + + avpriv_set_pts_info(st, 64, 1, par->sample_rate); + + return 0; +} + +AVInputFormat ff_derf_demuxer = { + .name = "derf", + .long_name = NULL_IF_CONFIG_SMALL("Xilam DERF"), + .read_probe = derf_probe, + .read_header = derf_read_header, + .read_packet = ff_pcm_read_packet, + .read_seek = ff_pcm_read_seek, + .extensions = "adp", +};