From patchwork Sat Jan 21 18:30:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 2281 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.89.21 with SMTP id n21csp593869vsb; Sat, 21 Jan 2017 10:30:59 -0800 (PST) X-Received: by 10.223.178.146 with SMTP id g18mr17250410wrd.124.1485023459598; Sat, 21 Jan 2017 10:30:59 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t15si12424193wra.71.2017.01.21.10.30.59; Sat, 21 Jan 2017 10:30:59 -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; 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=NONE 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 CF07968A86E; Sat, 21 Jan 2017 20:30:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4ACB68A828 for ; Sat, 21 Jan 2017 20:30:39 +0200 (EET) Received: by mail-wm0-f67.google.com with SMTP id r126so15103158wmr.3 for ; Sat, 21 Jan 2017 10:30:51 -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=LnLblqHfVvGxUDBIC7vL+c1GO/06q7jBfDRupr0/dhM=; b=kGeRO+izB4zV1d1kGV3Fo0ewK/St8gbf7hb1zitD4TGhSfgeUjCj7yRbLF2kJAPITu +76GTrw8Aj6l4GWy0MFvMiO2Yxg59nxpWLv28e9prwva/MjpquB6R/FKleu2sI8TZl6K E9ibhL8Zl/z3YnFHqVar0JgwqCXMI+4mpY+GgcVfA2zCIRLk7GkrRV8yS8B+UDoN9Ekf RJEtyeCg+ajQAF/F/DnGaVXvVv7AsV72dSW6P4621xl0nJf/+8/jl4FCJygKAgHvCnuV KJcOHl+2ZdV0oCADq0sncdpZHqErkxx6SkPF/Zs5Svwb5VDxNJqMm35+m3Tk1fw8R7xs 80gg== 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=LnLblqHfVvGxUDBIC7vL+c1GO/06q7jBfDRupr0/dhM=; b=eSlbHUH7kt3colp0NeS20HGQka3CoRzm++oplaJvo65Rb63VF/Qk7syFiMDZJ16WlI SCkh/j8CXcWKHJW32CXBxvERjLCTLNymW8cnNuUzWPewK3Q0h0XQN2mWCV9aiRXb+Aws 7JccHjIwkhv6tzWwk12X6AhUfF9lpJjktwDRkAuNVw0JKirf+IN79uuh2PCMKIgQsPvm 3zGG32gvQ1+BvhoUu6vQqjZkLkshBJwGOL0ZCymncgbsU37BEU9x/An87qRRdhTGsCI0 34SgStITZyy1w7mfFrWnxB2U5f29T98B+CmrkyAJEQVb/BZYqPNUbHSG8jCrLuKxVSDt U4rA== X-Gm-Message-State: AIkVDXLdZj4dSI0OFJt4P+Z0akMpu2xsBFeybMb/6sSeCWroxS24ZCNP1iF3BqxvC4HTcw== X-Received: by 10.28.163.3 with SMTP id m3mr8578645wme.85.1485023450890; Sat, 21 Jan 2017 10:30:50 -0800 (PST) Received: from localhost.localdomain ([37.244.225.202]) by smtp.gmail.com with ESMTPSA id r6sm12058416wmd.4.2017.01.21.10.30.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Jan 2017 10:30:49 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Jan 2017 19:30:34 +0100 Message-Id: <20170121183034.1801-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avformat: add Sample Dump eXchange 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/sdxdec.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 92 insertions(+) create mode 100644 libavformat/sdxdec.c diff --git a/libavformat/Makefile b/libavformat/Makefile index f30bc94..036e7a9 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -437,6 +437,7 @@ OBJS-$(CONFIG_SBG_DEMUXER) += sbgdec.o OBJS-$(CONFIG_SDP_DEMUXER) += rtsp.o OBJS-$(CONFIG_SDR2_DEMUXER) += sdr2.o OBJS-$(CONFIG_SDS_DEMUXER) += sdsdec.o +OBJS-$(CONFIG_SDX_DEMUXER) += sdxdec.o OBJS-$(CONFIG_SEGAFILM_DEMUXER) += segafilm.o OBJS-$(CONFIG_SEGMENT_MUXER) += segment.o OBJS-$(CONFIG_SHORTEN_DEMUXER) += shortendec.o rawdec.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index e30305b..b8590ce 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -276,6 +276,7 @@ void av_register_all(void) REGISTER_DEMUXER (SDP, sdp); REGISTER_DEMUXER (SDR2, sdr2); REGISTER_DEMUXER (SDS, sds); + REGISTER_DEMUXER (SDX, sdx); #if CONFIG_RTPDEC ff_register_rtp_dynamic_payload_handlers(); ff_register_rdt_dynamic_payload_handlers(); diff --git a/libavformat/sdxdec.c b/libavformat/sdxdec.c new file mode 100644 index 0000000..e8e7a4f --- /dev/null +++ b/libavformat/sdxdec.c @@ -0,0 +1,90 @@ +/* + * SDX demuxer + * Copyright (c) 2017 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/avstring.h" +#include "libavutil/intreadwrite.h" +#include "avformat.h" +#include "internal.h" +#include "pcm.h" + +static int sdx_probe(AVProbeData *p) +{ + if (AV_RB32(p->buf) == AV_RB32("SDX:")) + return AVPROBE_SCORE_EXTENSION; + return 0; +} + +static int sdx_read_header(AVFormatContext *s) +{ + AVStream *st; + int depth, length; + + avio_skip(s->pb, 4); + while (!avio_feof(s->pb)) { + if (avio_r8(s->pb) == 0x1a) + break; + } + if (avio_r8(s->pb) != 1) + return AVERROR_INVALIDDATA; + length = avio_r8(s->pb); + avio_skip(s->pb, length); + avio_skip(s->pb, 4); + depth = avio_r8(s->pb); + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->channels = 1; + st->codecpar->sample_rate = avio_rl32(s->pb); + switch (depth) { + case 8: + st->codecpar->codec_id = AV_CODEC_ID_PCM_U8; + break; + case 16: + st->codecpar->codec_id = AV_CODEC_ID_PCM_U16LE; + break; + case 24: + st->codecpar->codec_id = AV_CODEC_ID_PCM_U24LE; + break; + case 32: + st->codecpar->codec_id = AV_CODEC_ID_PCM_U32LE; + break; + default: + return AVERROR_INVALIDDATA; + } + avio_skip(s->pb, 16); + st->codecpar->block_align = depth / 8; + + return 0; +} + +AVInputFormat ff_sdx_demuxer = { + .name = "sdx", + .long_name = NULL_IF_CONFIG_SMALL("Sample Dump eXchange"), + .read_probe = sdx_probe, + .read_header = sdx_read_header, + .read_packet = ff_pcm_read_packet, + .read_seek = ff_pcm_read_seek, + .extensions = "sdx", + .flags = AVFMT_GENERIC_INDEX, +};