From 385ec464245e0d0754e897256cf4535143de8463 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 27 Jan 2023 17:00:36 +0100 Subject: [PATCH] avformat: add SDNS demuxer --- Changelog | 1 + doc/general_contents.texi | 1 + libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/sdns.c | 96 +++++++++++++++++++++++++++++++++++++++ libavformat/version.h | 2 +- 6 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 libavformat/sdns.c diff --git a/Changelog b/Changelog index 11dfd7ef73..543eaf7fb7 100644 --- a/Changelog +++ b/Changelog @@ -40,6 +40,7 @@ version : - ffmpeg CLI new option: -fix_sub_duration_heartbeat - WavArc decoder and demuxer - CrystalHD decoders deprecated +- SDNS demuxer version 5.1: diff --git a/doc/general_contents.texi b/doc/general_contents.texi index 33f3c18c7a..f39628de9a 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -665,6 +665,7 @@ library: @item Sample Dump eXchange @tab @tab X @item SAP @tab X @tab X @item SBG @tab @tab X +@item SDNS @tab @tab X @item SDP @tab @tab X @item SER @tab @tab X @item Digital Pictures SGA @tab @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index 5d219afc06..471e014b22 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -523,6 +523,7 @@ OBJS-$(CONFIG_SBG_DEMUXER) += sbgdec.o OBJS-$(CONFIG_SCC_DEMUXER) += sccdec.o subtitles.o OBJS-$(CONFIG_SCC_MUXER) += sccenc.o OBJS-$(CONFIG_SCD_DEMUXER) += scd.o +OBJS-$(CONFIG_SDNS_DEMUXER) += sdns.o OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o OBJS-$(CONFIG_SDR2_DEMUXER) += sdr2.o OBJS-$(CONFIG_SDS_DEMUXER) += sdsdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 365d7f3428..8393dd34c7 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -405,6 +405,7 @@ extern const AVInputFormat ff_sbg_demuxer; extern const AVInputFormat ff_scc_demuxer; extern const FFOutputFormat ff_scc_muxer; extern const AVInputFormat ff_scd_demuxer; +extern const AVInputFormat ff_sdns_demuxer; extern const AVInputFormat ff_sdp_demuxer; extern const AVInputFormat ff_sdr2_demuxer; extern const AVInputFormat ff_sds_demuxer; diff --git a/libavformat/sdns.c b/libavformat/sdns.c new file mode 100644 index 0000000000..f00c6bcc49 --- /dev/null +++ b/libavformat/sdns.c @@ -0,0 +1,96 @@ +/* + * SDNS demuxer + * Copyright (c) 2023 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/channel_layout.h" +#include "libavutil/intreadwrite.h" +#include "avformat.h" +#include "demux.h" +#include "internal.h" + +static int sdns_probe(const AVProbeData *p) +{ + if (AV_RL32(p->buf) != MKTAG('S','D','N','S')) + return 0; + if (AV_RB32(p->buf + 8) <= 0) + return 0; + if (AV_RB32(p->buf + 12) <= 0 || + AV_RB32(p->buf + 12) > 128) + return 0; + return AVPROBE_SCORE_MAX / 3; +} + +static int sdns_read_header(AVFormatContext *s) +{ + AVIOContext *pb = s->pb; + AVCodecParameters *par; + int channels, ret; + AVStream *st; + + avio_skip(pb, 8); + + 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_XMA1; + par->sample_rate = avio_rb32(pb); + channels = avio_rb32(pb); + if (channels <= 0 || channels > 128) + return AVERROR_INVALIDDATA; + av_channel_layout_default(&par->ch_layout, channels); + if (par->sample_rate <= 0) + return AVERROR_INVALIDDATA; + par->block_align = 2048; + if ((ret = ff_alloc_extradata(par, 8 + 20 * ((channels + 1) / 2))) < 0) + return ret; + memset(par->extradata, 0, 28); + par->extradata[4] = (channels + 1) / 2; + for (int i = 0; i < par->extradata[4]; i++) + par->extradata[8 + 20 * i + 17] = FFMIN(2, channels - i * 2); + avpriv_set_pts_info(st, 64, 1, par->sample_rate); + avio_seek(pb, 0x1000, SEEK_SET); + + return 0; +} + +static int sdns_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + int ret; + + if (avio_feof(s->pb)) + return AVERROR_EOF; + ret = av_get_packet(s->pb, pkt, 2048); + pkt->stream_index = 0; + + return ret; +} + +const AVInputFormat ff_sdns_demuxer = { + .name = "sdns", + .long_name = NULL_IF_CONFIG_SMALL("Xbox SDNS"), + .read_probe = sdns_probe, + .read_header = sdns_read_header, + .read_packet = sdns_read_packet, + .flags = AVFMT_GENERIC_INDEX, + .extensions = "sdns", +}; diff --git a/libavformat/version.h b/libavformat/version.h index 752aac16f7..a7c80dc564 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFORMAT_VERSION_MINOR 0 +#define LIBAVFORMAT_VERSION_MINOR 1 #define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \