From patchwork Fri Dec 1 16:26:43 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: 6491 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1357042jah; Fri, 1 Dec 2017 08:27:34 -0800 (PST) X-Google-Smtp-Source: AGs4zMZmHUguQoJUH/uQNXz95ma0UIhJy97fQYIjko4FmXw09aw36FMOdxWtsjebiQu+9Eewty3T X-Received: by 10.223.188.141 with SMTP id g13mr6011713wrh.169.1512145654878; Fri, 01 Dec 2017 08:27:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512145654; cv=none; d=google.com; s=arc-20160816; b=XLFAvuDH8V8Odu5k4fuynZrZPWYggZ86S4sFD46J0cufYjiKe9yLJs/7f2In4bi2DA vgeTWfobJgjWRQt2qfbrfIdh3eLorLgm9GZV5ZHMr65pA4R5Ykhw6L37HpWyqp6aierM rucDmJ79r/0+WjFOXZFHtdwZttyQZq9tHUG2+yDZh2JmZ9oest6ajsr+OoopDeB8bRW5 BqkuNouwG9j3G4ZyM/apF0AdwqtLIC8CvRXD7RRP1DdJmjBeY8xn9s6JfCLbTmboXtII 8eb18mOSOHdW9HfsKnPqdfWBObedLVg3bncYgRoIMw8dSnXuwIOLJa3doZ6ORb1vShtd 90JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=JKAl4NkBFL2UlPNQIkn3NHGicRJAUaeFPSTZqXj6htE=; b=vS2WJT3F+DTOj6wTBsi+qyri7871UpIvOLJ1dRdqgpFng7RQrvBnpdzZm52wlAr5Zp kxwzNyK6QDuFZNN6hVdtgzQu2BVGIWh4P6VglnT2YN0PLd39x6vacsttviKNMZLULZe1 G7oNaqwtZ6G1aZlsP+qUPJBEJ9hiToj30Q6rDTNe5+rGZnGXROjft+Mr23n3PK7yweLC 1/ADLbEN3G7VozU+Wjy5Cg2s7VBhPNkIqm95G9EzjHGtQhqzbprbb0My1s0g12hp8OyC +qIrDGntechaWyetx7ZX8WwlT/1k4euClXtRVbFMLi95nvmfL/yvlfOkl2NP29+Gsk9c iTtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lxP8C3nb; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u9si958009wmb.20.2017.12.01.08.27.34; Fri, 01 Dec 2017 08:27:34 -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=20161025 header.b=lxP8C3nb; 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 986AC68A490; Fri, 1 Dec 2017 18:27:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D8C1A68A197 for ; Fri, 1 Dec 2017 18:27:22 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id y82so6209373wmg.1 for ; Fri, 01 Dec 2017 08:27:26 -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=E36mEV3U0Bl2VV+CT0VLZggAfqxjpx19hZKq6WBCw9s=; b=lxP8C3nb+Sq5u4fA5HWxAeXOKRhQbOPmgtZ0NSXSq3DYZ7/b4zK2wGkKQGKmPMpGhy mE9KfSWeu0Mzd0d/phdX4QS4R7EMJTxHskU6+l8Dh3y4GTMofE/5V9/X2nLAalcOadid RD9pWGpnMuOI1BVdh397d4empjgxtimdG7ETaGi/szslSy/u/I5x3vTb0Nx1S7ubyUhp tvBbzHXApynKjXia0/2EHOPEijQrKOUZ4RO3t2Rmh7+2MN2kPbyihqfeokkKIZGi3WIr 228arQC/4y1uv+pZPHMF56MIFJNlC9yUKn/ezbi2zYbCSadBlsSGACr1vj6eifDr+qjM b80A== 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=E36mEV3U0Bl2VV+CT0VLZggAfqxjpx19hZKq6WBCw9s=; b=LOicDzy5DWha74aU+WZpAOzRC1AeUG71QJMxGHkQACQNrj5RnAe6HDDgG9p57LgxxP ZnjJ07XxN/k36Fda3w5SV8LBL3k97z8iazxxUBakaaD5i0Rgs11z+3FmRXW0Nw+9vhhr htVf9SnJwh6Yp0LV1I0k529T+ZGq3sfcfjeOQ3thFg9JpOx9yTvBC8vTY+mz5SE6IsX+ Z5WEgOVm99sCtKhVlTiSQnQ0Jbp6hb51DFAhwQKBHC2ejKfjvmeLQg9kg3McAG/s2cq1 XKrM6rwmgh8oPEgvXuqK74kQzrIyPkF2Ubv9JfFE6dSMRMIYWwbWe1hL95IIU2ffHXRe zAhw== X-Gm-Message-State: AJaThX7LhZYfYvnu7gHUFZjwb429+SabfpEiEUR9zCuXfiyO47rW2HN4 33hFikYef0MigrkH9gm4IOQr4w== X-Received: by 10.28.199.133 with SMTP id x127mr1601886wmf.156.1512145645828; Fri, 01 Dec 2017 08:27:25 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id l140sm1653747wma.5.2017.12.01.08.27.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Dec 2017 08:27:25 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Dec 2017 17:26:43 +0100 Message-Id: <20171201162643.11222-1-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] avformat: add NSP 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/nspdec.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+) create mode 100644 libavformat/nspdec.c diff --git a/libavformat/Makefile b/libavformat/Makefile index 4bffdf2205..734b703862 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -331,6 +331,7 @@ OBJS-$(CONFIG_MXF_MUXER) += mxfenc.o mxf.o audiointerleave.o OBJS-$(CONFIG_MXG_DEMUXER) += mxg.o OBJS-$(CONFIG_NC_DEMUXER) += ncdec.o OBJS-$(CONFIG_NISTSPHERE_DEMUXER) += nistspheredec.o pcm.o +OBJS-$(CONFIG_NSP_DEMUXER) += nspdec.o OBJS-$(CONFIG_NSV_DEMUXER) += nsvdec.o OBJS-$(CONFIG_NULL_MUXER) += nullenc.o OBJS-$(CONFIG_NUT_DEMUXER) += nutdec.o nut.o isom.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 9213af9301..6a9b9883c9 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -224,6 +224,7 @@ static void register_all(void) REGISTER_DEMUXER (MXG, mxg); REGISTER_DEMUXER (NC, nc); REGISTER_DEMUXER (NISTSPHERE, nistsphere); + REGISTER_DEMUXER (NSP, nsp); REGISTER_DEMUXER (NSV, nsv); REGISTER_MUXER (NULL, null); REGISTER_MUXDEMUX(NUT, nut); diff --git a/libavformat/nspdec.c b/libavformat/nspdec.c new file mode 100644 index 0000000000..d2ff779732 --- /dev/null +++ b/libavformat/nspdec.c @@ -0,0 +1,101 @@ +/* + * NSP 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 nsp_probe(AVProbeData *p) +{ + if (AV_RB32(p->buf) == AV_RB32("FORM") && + AV_RB32(p->buf + 4) == AV_RB32("DS16")) + return AVPROBE_SCORE_MAX; + return 0; +} + +static int nsp_read_header(AVFormatContext *s) +{ + int rate = 0, channels = 0; + uint32_t chunk, size; + AVStream *st; + int64_t pos; + + avio_skip(s->pb, 12); + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + + while (!avio_feof(s->pb)) { + chunk = avio_rb32(s->pb); + size = avio_rl32(s->pb); + pos = avio_tell(s->pb); + + if (chunk == MKBETAG('H', 'D', 'R', '8') || + chunk == MKBETAG('H', 'E', 'D', 'R')) { + if (size < 32) + return AVERROR_INVALIDDATA; + avio_skip(s->pb, 20); + rate = avio_rl32(s->pb); + avio_skip(s->pb, size - (avio_tell(s->pb) - pos)); + } else if (chunk == MKBETAG('N', 'O', 'T', 'E')) { + char value[1024]; + + avio_get_str(s->pb, size, value, sizeof(value)); + av_dict_set(&s->metadata, "Note", value, 0); + avio_skip(s->pb, 1); + } else if (chunk == MKBETAG('S', 'D', 'A', 'B')) { + channels = 2; + break; + } else if (chunk == MKBETAG('S', 'D', 'A', '_') || + chunk == MKBETAG('S', 'D', '_', 'A') || + chunk == MKBETAG('S', 'D', '_', '2') || + chunk == MKBETAG('S', 'D', '_', '3') || + chunk == MKBETAG('S', 'D', '_', '4') || + chunk == MKBETAG('S', 'D', '_', '5') || + chunk == MKBETAG('S', 'D', '_', '6') || + chunk == MKBETAG('S', 'D', '_', '7') || + chunk == MKBETAG('S', 'D', '_', '8')) { + channels = 1; + break; + } + } + + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->channels = channels; + st->codecpar->sample_rate = rate; + st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; + st->codecpar->block_align = 2 * channels; + + return 0; +} + +AVInputFormat ff_nsp_demuxer = { + .name = "nsp", + .long_name = NULL_IF_CONFIG_SMALL("Computerized Speech Lab NSP"), + .read_probe = nsp_probe, + .read_header = nsp_read_header, + .read_packet = ff_pcm_read_packet, + .read_seek = ff_pcm_read_seek, + .extensions = "nsp", + .flags = AVFMT_GENERIC_INDEX, +};