From patchwork Fri Jan 27 16:49:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 40147 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp1502336pzj; Fri, 27 Jan 2023 08:49:52 -0800 (PST) X-Google-Smtp-Source: AMrXdXsCsixosUIJO7/gDDTuRcys/wuTeGgoXR9IKLwGsIjJ+ZC6ooi42o/19O/2RanDpwIcSxG2 X-Received: by 2002:a05:6402:413:b0:498:b9ea:1894 with SMTP id q19-20020a056402041300b00498b9ea1894mr37862677edv.15.1674838192341; Fri, 27 Jan 2023 08:49:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674838192; cv=none; d=google.com; s=arc-20160816; b=T3mrFg90GxeqyZSNgrfStzjsZVaqAedrl9HxRD/b7V0lGB5qknam7TnKvJoBML0pcx uJiapXHkcfr15aLhSDzEO79Y6/Miapr8plvlEkHn4k4dKXmBckerly/1zh7rQlj63pqI i+HQqb/sOGre01IotPYHbRQDvIfd3V5j/OpJGCQ4HPKLiDqpZ/I22S5jCgTycJngjKbt JFMZqjAELN5rAucFcgCYdhz/xk3qUepRXxAf/gLs9HAJKVfZVlN1BucGZVUUk4KTtwqB wfwD6f0qdKSoOKAhqHkwOhDbWYMJImpKxUR0dBBu/FzqEHje0GXm2eDVQUTpbNqwNx4z Izqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=yN8ygxcXCSge+HGF//bfByX61ijFPUfjZzK9pmlwQzs=; b=tm84+Bm6gvXgPBVQDnOl64AHMlCgBdiCge/H1yhlw5P5JlgjSmfPr2Zkhhgiq+MBC+ Pe1cRBK6pSmzlPMUdMUnjDLxw1ZniMrfidKwuQliQ84lR6EU5p4ZeynlxRZb+W+3HAij /EkcyJgLfL7EMrpUHLGODq+nXHj/Eud2mTQJ/uzqfpALkCTCkFAAkdDi4xD4dcMKDK3B 8bBchamMVahiOBnm3F7buc2/VkBOsHbWhaTr2pOr87H6oz2LIPB2TjJM2TvVhO79Zi1M TXNmilB6g96u3rVv5xECURo34jee9ZNd7LwQUO/1K89ixom3EO7shqYYGw0n0vFpceA9 sVQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HoY4p36h; 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 x16-20020a50d610000000b004a21a666f8fsi522893edi.189.2023.01.27.08.49.52; Fri, 27 Jan 2023 08:49:52 -0800 (PST) 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=20210112 header.b=HoY4p36h; 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 ECC8968BE46; Fri, 27 Jan 2023 18:49:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f49.google.com (mail-vs1-f49.google.com [209.85.217.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B77C468BDB8 for ; Fri, 27 Jan 2023 18:49:43 +0200 (EET) Received: by mail-vs1-f49.google.com with SMTP id k6so5953213vsk.1 for ; Fri, 27 Jan 2023 08:49:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=tef4O//KcvzaNBZxuHqaV3iPax6EwhTMlSA8YE2Ra5w=; b=HoY4p36hhqp5dmDbnTTmeLML7PDrUs7mUhQEDbp5rtJxfcl87TuSO1qa9ALqY/xrbW T4HnInGv6s5uS4gvjo6cx1y1x4Ad7SZK54TiwP7LfQnoBn1NdxB/RDstxevS5wzE+pNR M6JO8o59xbYJci6rd2TS9BaS8Ne9Wgz1dT1ska4sGR/6VjH/W/V9ljUEAlauL1lcfNJi tHlDy+Pmi02MlMG8eeHrKWsjCiuBUd9Zi9l8CXVqoOo0aNz67WVQPNh0dwPQhNGd82C1 cK/f+gOdCDHfOhZn+fizKCSQHyLDEEtDEQ/DzxEq1H5fUXMpP+Ri9FZS6wAGmLF0yQYK ISFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=tef4O//KcvzaNBZxuHqaV3iPax6EwhTMlSA8YE2Ra5w=; b=3ufmt60SFDZJqJ3cdX3QR6yVuq2VnsFks/tfPrdKGEeSOwd67cnhp/HvN3cE1RknYs bXL+6eFJ2xj1zS3wCLwL8TIHc4EM0SLv3hAVRYF3GMBX8btLpeK9aTNOC5o5VC45HBGL ZHgvALNifvm4VwyMY1lv/hOBJzr39RkR0hA9969eAYD6rt6BCIhWdMdZzYSg1dDN/1PB RiMFxpsItrc/xO+ZLfRNGdlEDiHYrAgMl4I/0ICzelA9sOWSacvDhTIoQzmbBh0y1sgu N6GxrnbQxpcywJfOz2HMPHWXl0TUn0zA+b1LGq0rfjjhDovTUbZxNJB45F8JWjM1Dtev TWAA== X-Gm-Message-State: AFqh2kq6oWqSa0B4hHJGh0/Fkx/bzq+ONVZ5zAMGKmYvfRTeUBdJURYt 7Zag5Qz1McS/TvBffkzzC6L3PQj1XgY6JhisH99IGkZw X-Received: by 2002:a05:6102:1510:b0:3d3:e5dc:e359 with SMTP id f16-20020a056102151000b003d3e5dce359mr5528617vsv.61.1674838181989; Fri, 27 Jan 2023 08:49:41 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a05:612c:2428:b0:32a:5eaa:92e4 with HTTP; Fri, 27 Jan 2023 08:49:40 -0800 (PST) From: Paul B Mahol Date: Fri, 27 Jan 2023 17:49:40 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avformat: add SDNS demuxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: JcySO+UP3eKM Patch attached. From f98e8a2931327c0b45aa7183d4ae3bd780382806 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 Signed-off-by: Paul B Mahol --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/sdns.c | 96 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 98 insertions(+) create mode 100644 libavformat/sdns.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 89dbde9454..b5bf549eb7 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 b5a3d909bd..9ca8d2692f 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -404,6 +404,7 @@ extern const AVInputFormat ff_sbg_demuxer; extern const AVInputFormat ff_scc_demuxer; extern const AVOutputFormat 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", +}; -- 2.39.1