From patchwork Thu May 28 00:34:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: A G X-Patchwork-Id: 19907 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3D98044B104 for ; Thu, 28 May 2020 03:34:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0FED468A9F0; Thu, 28 May 2020 03:34:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11olkn2090.outbound.protection.outlook.com [40.92.18.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D5E3A6891FB for ; Thu, 28 May 2020 03:34:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KBNnc7Fbf9cA1xSr3Ng3JOZi+ETRwtPdzLMsKMv7xuceFhEYP9/1xAkyZAMVc/33ZeDxd7vfkC2j1U5xRXDCwtE6vVh6voNTfICto5b3u/DWizeV/xYziHWuqOPovIdrSJH/hTo/6zA1YnONIrfhUaMEp1IblVrnsQJu35B4vwAJUd7UPqMrNULdeByqdPZsvm4uzZs7RYSkeB+RP6x3v6XJ197Foss0b+d8qpptvbBJvnqp63u3DJyibQhyF6fk6IE3sENhCPEBUrPiWvTNV/NiMKij3p2mO7qlMzfeAVEFS6afEOu71DTRXQYQtyrd2YjRHyihui/JcUiBKrBaYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8/tNYQbYlLi3aG6XEzc8YTNSXQvpHCdBPgmeI24Q59A=; b=Cg4lI22hmB6ZkdrigBQxK3NtZlKrToAM8rtixRWP2uZN6N/y7FFTqekDVoGqpXb3YhoWpLB47G0M/DXztOLTy65Ld/m8IbUwcjJBnJSwZxkT7Q94VDAksmJ2McwM46y3rA4wQwxqzwgiBcA3mm081oKslEUez5XEBPrcXQnw1ZNIevHV3uT570vVBleTokdlmTTdt4MGAv9hZJfhNQPV0zFtX1eEAKSXMWwUw4TiBlbJvQC2UHARWenKGpiEdjJB+jOgSilH/RaDfhLpye9IaHmdTQYjOLY4e7ks9/mcF80AZeARc/pvCK8Du5fY4LWpYAFDmeMMewKCF+TVc1vdbA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8/tNYQbYlLi3aG6XEzc8YTNSXQvpHCdBPgmeI24Q59A=; b=aCSTSrS3DCbHRbvEzhNIPsscCHtMZURaPJqHi8tp4FmuM1gght7GN3WBBhhvhupXdNwSFMENKeqFxWOsF8c9y5APiPlZ4uFbaeB6uUn7e4zaqYm8u84X6x1nGhXIcVsD5rGH3zy8X3t7C2UU5xz8xITKzI815kqXAjhf9LttjG+aXvGDKvIifBaY4br5yDGl77S91jM3e47Rf0jx0kIBT+b5WrjF2t2ZeuUxSWq7w6/XafWubv6Xl5HME3HRZD2ZCnotK33W03siABDVpMVU41Sbw+bI28T3B+rncGmt7rDH+AsflJY+nGtrvtz5COq5PVz9POQ++elgc0xodufcDQ== Received: from BN8NAM11FT054.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4b::45) by BN8NAM11HT148.eop-nam11.prod.protection.outlook.com (2a01:111:e400:fc4b::184) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.23; Thu, 28 May 2020 00:34:09 +0000 Received: from BYAPR15MB2647.namprd15.prod.outlook.com (2a01:111:e400:fc4b::42) by BN8NAM11FT054.mail.protection.outlook.com (2a01:111:e400:fc4b::358) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3021.23 via Frontend Transport; Thu, 28 May 2020 00:34:09 +0000 Received: from BYAPR15MB2647.namprd15.prod.outlook.com ([fe80::f083:ed57:da58:e2a1]) by BYAPR15MB2647.namprd15.prod.outlook.com ([fe80::f083:ed57:da58:e2a1%6]) with mapi id 15.20.3021.029; Thu, 28 May 2020 00:34:09 +0000 From: A G To: FFmpeg development discussions and patches Thread-Topic: [PATCH v2] avformat/ogg: Add partial support for OggPCM demuxing Thread-Index: AQHWNIc3eJDE71/nmUSZ5LSVFG3i2w== Date: Thu, 28 May 2020 00:34:08 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-incomingtopheadermarker: OriginalChecksum:A508DF63F2670767F92AC9976D2C603D54A919FFBE420F7B5D15440CF25D613D; UpperCasedChecksum:F80B84E5B61B0B40D3855DEDF1410517F413B5921A5DC2A705C80A26EA8687A2; SizeAsReceived:6811; Count:42 x-tmn: [Kplgi69AnVK9f8+o/Nah004jHGXqWxWWp2egaGSCpVg=] x-ms-publictraffictype: Email x-incomingheadercount: 42 x-eopattributedmessage: 0 x-ms-office365-filtering-correlation-id: 3ab88e40-1119-4a50-101d-08d8029ed5fa x-ms-traffictypediagnostic: BN8NAM11HT148: x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: x/igGD6j7O0sgs5M6vdLJHBiDCBCHGZl3lkGt3gzD9UarF5ev5qA4z/fQi46CJub3v9XV4icrok+PE9H+00upfL9Ca1OAE+7Zw5loqQNUqMQL8fYn8+4wvSfJP0+1p7KAfpXUHVT1O7P0cj1OXzKmRhZYsET6pT5RQ55pEYNkSrEfT4yBauCOqmCv9RbIS00eDONpgYUc6f9ULzegCvQ8jmveSyIZ0GeOtKu5SW2eXLXNtkbBBJq25fTcyfR6svG x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:0; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR15MB2647.namprd15.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:; DIR:OUT; SFP:1901; x-ms-exchange-antispam-messagedata: iJq4G17Te+5pdyXJOeW4u2b9jEGLAAJNdbkW9mojujqav5i2nxFYINXR4lnDrdDPCJCbhX4n5ZdtaUfUlSVLGzjhjb4inQfOYHUoPpOeeH+G4GdszgqHuyyzqlI5qgt02o4Ga89eLjaj7yds/Z55SF4e9BRBQyCHV36L9WGKHqc= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 3ab88e40-1119-4a50-101d-08d8029ed5fa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 May 2020 00:34:08.9909 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8NAM11HT148 X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH v2] avformat/ogg: Add partial support for OggPCM demuxing 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This adds partial support for OggPCM muxing. It is effectively just an updated version of this: https://ffmpeg.org/pipermail/ffmpeg-devel/2013-July/145556.html --- libavformat/Makefile | 1 + libavformat/oggdec.c | 1 + libavformat/oggdec.h | 1 + libavformat/oggparsepcm.c | 123 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 126 insertions(+) create mode 100644 libavformat/oggparsepcm.c -- 2.26.2 diff --git a/libavformat/Makefile b/libavformat/Makefile index efe82f9f08..145407bb40 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -364,6 +364,7 @@ OBJS-$(CONFIG_OGG_DEMUXER) += oggdec.o \ oggparseflac.o \ oggparseogm.o \ oggparseopus.o \ + oggparsepcm.o \ oggparseskeleton.o \ oggparsespeex.o \ oggparsetheora.o \ diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 1a3acbb55e..6a95485680 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -49,6 +49,7 @@ static const struct ogg_codec * const ogg_codecs[] = { &ff_flac_codec, &ff_celt_codec, &ff_opus_codec, + &ff_pcm_codec, &ff_vp8_codec, &ff_old_dirac_codec, &ff_old_flac_codec, diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 629a1d6262..ae001b4ded 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -124,6 +124,7 @@ extern const struct ogg_codec ff_ogm_video_codec; extern const struct ogg_codec ff_old_dirac_codec; extern const struct ogg_codec ff_old_flac_codec; extern const struct ogg_codec ff_opus_codec; +extern const struct ogg_codec ff_pcm_codec; extern const struct ogg_codec ff_skeleton_codec; extern const struct ogg_codec ff_speex_codec; extern const struct ogg_codec ff_theora_codec; diff --git a/libavformat/oggparsepcm.c b/libavformat/oggparsepcm.c new file mode 100644 index 0000000000..3a1470ac99 --- /dev/null +++ b/libavformat/oggparsepcm.c @@ -0,0 +1,123 @@ +/* + * PCM parser for Ogg + * Copyright (c) 2013 James Almer + * + * 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/intreadwrite.h" +#include "avformat.h" +#include "internal.h" +#include "oggdec.h" + +struct oggpcm_private { + int vorbis_comment; + uint32_t extra_headers; +}; + +static const struct ogg_pcm_codec { + uint32_t codec_id; + uint32_t format_id; +} ogg_pcm_codecs[] = { + { AV_CODEC_ID_PCM_S8, 0x00 }, + { AV_CODEC_ID_PCM_U8, 0x01 }, + { AV_CODEC_ID_PCM_S16LE, 0x02 }, + { AV_CODEC_ID_PCM_S16BE, 0x03 }, + { AV_CODEC_ID_PCM_S24LE, 0x04 }, + { AV_CODEC_ID_PCM_S24BE, 0x05 }, + { AV_CODEC_ID_PCM_S32LE, 0x06 }, + { AV_CODEC_ID_PCM_S32BE, 0x07 }, + { AV_CODEC_ID_PCM_F32LE, 0x20 }, + { AV_CODEC_ID_PCM_F32BE, 0x21 }, + { AV_CODEC_ID_PCM_F64LE, 0x22 }, + { AV_CODEC_ID_PCM_F64BE, 0x23 }, +}; + +static const struct ogg_pcm_codec *ogg_get_pcm_codec_id(uint32_t format_id) +{ + int i; + + for (i = 0; i < FF_ARRAY_ELEMS(ogg_pcm_codecs); i++) + if (ogg_pcm_codecs[i].format_id == format_id) + return &ogg_pcm_codecs[i]; + + return NULL; +} + +static int pcm_header(AVFormatContext *as, int idx) +{ + struct ogg *ogg = as->priv_data; + struct ogg_stream *os = ogg->streams + idx; + struct oggpcm_private *priv = os->private; + const struct ogg_pcm_codec *pcm; + AVStream *st = as->streams[idx]; + uint8_t *p = os->buf + os->pstart; + uint16_t major, minor; + uint32_t format_id; + + if (!priv) { + priv = os->private = av_mallocz(sizeof(*priv)); + if (!priv) + return AVERROR(ENOMEM); + } + + if (os->flags & OGG_FLAG_BOS) { + if (os->psize < 28) { + av_log(as, AV_LOG_ERROR, "Invalid OggPCM header packet"); + return AVERROR_INVALIDDATA; + } + + major = AV_RB16(p + 8); + minor = AV_RB16(p + 10); + if (major) { + av_log(as, AV_LOG_ERROR, "Unsupported OggPCM version %u.%u\n", major, minor); + return AVERROR_INVALIDDATA; + } + + format_id = AV_RB32(p + 12); + pcm = ogg_get_pcm_codec_id(format_id); + if (!pcm) { + av_log(as, AV_LOG_ERROR, "Unsupported PCM format ID 0x%X\n", format_id); + return AVERROR_INVALIDDATA; + } + + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = pcm->codec_id; + st->codecpar->sample_rate = AV_RB32(p + 16); + st->codecpar->channels = AV_RB8 (p + 21); + priv->extra_headers = AV_RB32(p + 24); + priv->vorbis_comment = 1; + avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate); + } else if (priv->vorbis_comment) { + ff_vorbis_stream_comment(as, st, p, os->psize); + priv->vorbis_comment = 0; + } else if (priv->extra_headers) { + // TODO: Support for channel mapping and conversion headers. + priv->extra_headers--; + } else + return 0; + + return 1; +} + +const struct ogg_codec ff_pcm_codec = { + .name = "OggPCM", + .magic = "PCM ", + .magicsize = 8, + .header = pcm_header, + .nb_header = 2, +};