From patchwork Tue Mar 8 03:29:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Bruienne X-Patchwork-Id: 34640 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:4285:0:0:0:0 with SMTP id wq5csp160233nkb; Mon, 7 Mar 2022 19:30:16 -0800 (PST) X-Google-Smtp-Source: ABdhPJz8W7p6qmrxJYsjD1FHLRix/JRK+yeacSswck/v5eRMA5x9QMspFnN58YjyUvkLFqZOFzxr X-Received: by 2002:a17:907:608f:b0:6da:8eec:ab87 with SMTP id ht15-20020a170907608f00b006da8eecab87mr11082422ejc.485.1646710215772; Mon, 07 Mar 2022 19:30:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646710215; cv=none; d=google.com; s=arc-20160816; b=xbkEXNyxRu9GwKRnpgj3aaEgVqTU4LfxBehQUCemPc6qfWXnbiiH9SFYzK1O9x+Qw/ z590Kup1pZwMwXQNsjcmhwX21XEQlvkSanoXny1wHlUnw/LZBn5323dEx23c87LoFb6b T9ugVw8K2HH9uQCKqxDZ5udsbLvD8zogiZV0vtAwrRJ8ggCuJqLgXmGL+CwNdyiakomU 7MSxACiYeHBSHfwf5rrOIPeGNfDfAPE8pqb09MKnRexi2zPmXfLP2KQuF7e4DQrv4MrD QcFYGU1nhuG6+8OOSXp6mjU3R2HK1GzhbfW5+JycBEW/c5XZF7wdU0FSPoIfmVT0nakc 72iA== 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 :content-language:to:from:user-agent:mime-version:date:message-id :dkim-signature:delivered-to; bh=vNvxvhHHI9Tt1r6gyBR/pj26kS/WhARQE5+A+j+3ejY=; b=yYlayV3ewLEUB+u/eAx4/9lItb/s0L5repeSJaEY+aYEPyrzMA7lKVu+dfr4NIa5tz qXOyVcPuR/VSualgUM+FdD6920AQDee+Hr7tnm4YvVMwqjwfqQRgeN8EThhZ7ZYp6z3F e9M+6QsOFri9qRsT/J/1dLjH6AtXHtjqQUhdYed0XkAM3PfpARyhNsCaogPiuGoVVRAR 6mm1Xw5ZbCNI15T1enAwA+BhshsW3Ejgu0zbwWo8mGDyPaRbYvPf33MtAfBZ5UdVcI+z xSmMtDxt3D6T6W5SI8gnlBwLUaMnDiy8ouLoL0R3ON+rFI3mTe/u1+ppwEqjhClitJ8Q Bdlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=epcxiSpc; 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 f2-20020a1709067f8200b006d0edf83954si8687711ejr.666.2022.03.07.19.30.15; Mon, 07 Mar 2022 19:30:15 -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=epcxiSpc; 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 90A5668B1E6; Tue, 8 Mar 2022 05:30:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f53.google.com (mail-io1-f53.google.com [209.85.166.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D11C668A958 for ; Tue, 8 Mar 2022 05:30:00 +0200 (EET) Received: by mail-io1-f53.google.com with SMTP id b16so5183987ioz.3 for ; Mon, 07 Mar 2022 19:30:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:from:subject:to :content-language; bh=hNWchkwgfMGBNrQfJ7bPpcJx3W/oCYmsOwP09LmPMKQ=; b=epcxiSpc6X9mU9rm//wnNYQi9z6tHVgD2GJKMpOvwR2EX/JYM9a8sq4+2Hx5Fq3lPr gE68M7tva/i9WoTCubeChVPriYPH9p77Dw6rWQgkBT+yKDc5/NPVe0DBWMmLaD5yj94n +OXKKj0jdVBJeZMnIYprR5DjYGC5CykQvan4Toxzq9XCAlKK9rxusXo45Gy9VVVQ3edI hFLbIsDhuQiT9Gm63Z+eJ/VsBmbCFEJbbqHNbyjcWJpJxDrCA0vgirFHvVgHwMlhy6A1 f8x+US0IU3I2aKlByIet9He9ZF6DYGeRjYn5q/CSU2TgrX6a0h3uKjryijifHxdL6cN8 JsDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:from :subject:to:content-language; bh=hNWchkwgfMGBNrQfJ7bPpcJx3W/oCYmsOwP09LmPMKQ=; b=3PKFAxs6IxtjjJCf+TB5peVXxizxFn2lCGoZ1nhCrfTHQ+ZGfB0RT/fCbnBp7U6/qr fvXON0rzMBote3Tr4SZXWFJ5DSPL+VpRv48Db5xR/YOzHerOu8vaJnFZIICf1DlpZwGg Hy8ueD6sjebVp/+CM6UGna5AsZbobVTqmkkOE16kBBdE6WJhVTd7+2pSVE2BGlGKfzI2 v8t9qloyo87OiYryTe+nNzSVaigXl6Vw+UpRmWffSzIe+upQ/G6FGtq9j4zFHu6QSH/T pHkKmJggjpVtU90Qa04Y7qY+kcm9eP4a+6d5fIB8z3P3nmoO2BrP0fqY00pLnUMgAGcT Mp0w== X-Gm-Message-State: AOAM531t8kNCe8b1cid8qkCs0C+2NPdNkNsC9BIgZSpGUBgEeod5TEPS 1djJye2jNbzwiOOBPV5FCc7Efxbg//NEBA== X-Received: by 2002:a05:6638:22c3:b0:30a:2226:e601 with SMTP id j3-20020a05663822c300b0030a2226e601mr13679984jat.237.1646710199171; Mon, 07 Mar 2022 19:29:59 -0800 (PST) Received: from [192.168.7.86] (c-68-40-205-18.hsd1.mi.comcast.net. [68.40.205.18]) by smtp.gmail.com with ESMTPSA id s13-20020a6bdc0d000000b006408888551dsm9584585ioc.8.2022.03.07.19.29.58 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 07 Mar 2022 19:29:58 -0800 (PST) Message-ID: <08b63a0d-bb01-cabf-62d4-ddb561b5c1ce@gmail.com> Date: Mon, 7 Mar 2022 22:29:57 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 From: Jack Bruienne To: ffmpeg-devel@ffmpeg.org Content-Language: en-US Subject: [FFmpeg-devel] [PATCH v7 2/3] libavformat: Add DFPWM raw format 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: 2mKgriY6pwlE This patch builds on my previous DFPWM codec patch, adding a raw audio format to be able to read/write the raw files that are most commonly used (as no other container format supports it yet). The muxers are mostly copied from the PCM demuxer and the raw muxers, as DFPWM is typically stored as raw data. Please see the previous patch for more information on DFPWM. Changes since v4: Fixed descriptions of formats. Changes since v2/v3: Removed unused MIME parsing code, and added channels option. Signed-off-by: Jack Bruienne --- Changelog | 2 +- MAINTAINERS | 1 + doc/general_contents.texi | 1 + libavformat/Makefile | 2 + libavformat/allformats.c | 2 + libavformat/dfpwmdec.c | 82 +++++++++++++++++++++++++++++++++++++++ libavformat/rawenc.c | 13 +++++++ libavformat/version.h | 4 +- 8 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 libavformat/dfpwmdec.c diff --git a/Changelog b/Changelog index f3249fe..ac614f8 100644 --- a/Changelog +++ b/Changelog @@ -5,7 +5,7 @@ version 5.1: - dialogue enhance audio filter - dropped obsolete XvMC hwaccel - pcm-bluray encoder -- DFPWM audio encoder/decoder +- DFPWM audio encoder/decoder and raw muxer/demuxer version 5.0: diff --git a/MAINTAINERS b/MAINTAINERS index 57b6f33..931cf4b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -416,6 +416,7 @@ Muxers/Demuxers: dashdec.c Steven Liu dashenc.c Karthick Jeyapal daud.c Reimar Doeffinger + dfpwmdec.c Jack Bruienne dss.c Oleksij Rempel dtsdec.c foo86 dtshddec.c Paul B Mahol diff --git a/doc/general_contents.texi b/doc/general_contents.texi index 14aeaed..fcd9da1 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -578,6 +578,7 @@ library: @item raw aptX @tab X @tab X @item raw aptX HD @tab X @tab X @item raw Chinese AVS video @tab X @tab X +@item raw DFPWM @tab X @tab X @item raw Dirac @tab X @tab X @item raw DNxHD @tab X @tab X @item raw DTS @tab X @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index 16d019d..322c8e7 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -166,6 +166,8 @@ OBJS-$(CONFIG_DAUD_MUXER) += daudenc.o OBJS-$(CONFIG_DCSTR_DEMUXER) += dcstr.o OBJS-$(CONFIG_DERF_DEMUXER) += derf.o pcm.o OBJS-$(CONFIG_DFA_DEMUXER) += dfa.o +OBJS-$(CONFIG_DFPWM_DEMUXER) += dfpwmdec.o pcm.o +OBJS-$(CONFIG_DFPWM_MUXER) += rawenc.o OBJS-$(CONFIG_DHAV_DEMUXER) += dhav.o OBJS-$(CONFIG_DIRAC_DEMUXER) += diracdec.o rawdec.o OBJS-$(CONFIG_DIRAC_MUXER) += rawenc.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index d066a77..587ad59 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -124,6 +124,8 @@ extern const AVOutputFormat ff_daud_muxer; extern const AVInputFormat ff_dcstr_demuxer; extern const AVInputFormat ff_derf_demuxer; extern const AVInputFormat ff_dfa_demuxer; +extern const AVInputFormat ff_dfpwm_demuxer; +extern const AVOutputFormat ff_dfpwm_muxer; extern const AVInputFormat ff_dhav_demuxer; extern const AVInputFormat ff_dirac_demuxer; extern const AVOutputFormat ff_dirac_muxer; diff --git a/libavformat/dfpwmdec.c b/libavformat/dfpwmdec.c new file mode 100644 index 0000000..85d9b61 --- /dev/null +++ b/libavformat/dfpwmdec.c @@ -0,0 +1,82 @@ +/* + * RAW PCM demuxers + * Copyright (c) 2002 Fabrice Bellard + * Copyright (c) 2022 Jack Bruienne + * + * 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 "avformat.h" +#include "internal.h" +#include "pcm.h" +#include "libavutil/log.h" +#include "libavutil/opt.h" +#include "libavutil/avassert.h" + +typedef struct DFPWMAudioDemuxerContext { + AVClass *class; + int sample_rate; + int channels; +} DFPWMAudioDemuxerContext; + +static int dfpwm_read_header(AVFormatContext *s) +{ + DFPWMAudioDemuxerContext *s1 = s->priv_data; + AVCodecParameters *par; + AVStream *st; + + st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + par = st->codecpar; + + par->codec_type = AVMEDIA_TYPE_AUDIO; + par->codec_id = s->iformat->raw_codec_id; + par->sample_rate = s1->sample_rate; + par->channels = s1->channels; + par->bits_per_coded_sample = 1; + par->block_align = 1; + + avpriv_set_pts_info(st, 64, 1, par->sample_rate); + return 0; +} + +static const AVOption dfpwm_options[] = { + { "sample_rate", "", offsetof(DFPWMAudioDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 48000}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, + { "channels", "", offsetof(DFPWMAudioDemuxerContext, channels), AV_OPT_TYPE_INT, {.i64 = 1}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, + { NULL }, +}; +static const AVClass dfpwm_demuxer_class = { + .class_name = "dfpwm demuxer", + .item_name = av_default_item_name, + .option = dfpwm_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +const AVInputFormat ff_dfpwm_demuxer = { + .name = "dfpwm", + .long_name = NULL_IF_CONFIG_SMALL("raw DFPWM1a"), + .priv_data_size = sizeof(DFPWMAudioDemuxerContext), + .read_header = dfpwm_read_header, + .read_packet = ff_pcm_read_packet, + .read_seek = ff_pcm_read_seek, + .flags = AVFMT_GENERIC_INDEX, + .extensions = "dfpwm", + .raw_codec_id = AV_CODEC_ID_DFPWM, + .priv_class = &dfpwm_demuxer_class, +}; \ No newline at end of file diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 4bbae77..f8c267c 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -192,6 +192,19 @@ const AVOutputFormat ff_data_muxer = { }; #endif +#if CONFIG_DFPWM_MUXER +const AVOutputFormat ff_dfpwm_muxer = { + .name = "dfpwm", + .long_name = NULL_IF_CONFIG_SMALL("raw DFPWM1a"), + .extensions = "dfpwm", + .audio_codec = AV_CODEC_ID_DFPWM, + .video_codec = AV_CODEC_ID_NONE, + .init = force_one_stream, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_DIRAC_MUXER const AVOutputFormat ff_dirac_muxer = { .name = "dirac", diff --git a/libavformat/version.h b/libavformat/version.h index 05688e3..0f89af4 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -32,8 +32,8 @@ // Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium) // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 -#define LIBAVFORMAT_VERSION_MINOR 17 -#define LIBAVFORMAT_VERSION_MICRO 103 +#define LIBAVFORMAT_VERSION_MINOR 18 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \