From patchwork Tue Nov 7 22:26:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jacobs X-Patchwork-Id: 5977 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp4675790jah; Tue, 7 Nov 2017 14:26:51 -0800 (PST) X-Google-Smtp-Source: ABhQp+RPsXJ5DMOoLZONoOBUf5dB14ODCQZy+3i8bw4jHNO0ujEWx0dAcEOwlG1rnFwMAymsnLh7 X-Received: by 10.28.67.133 with SMTP id q127mr506429wma.71.1510093611445; Tue, 07 Nov 2017 14:26:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510093611; cv=none; d=google.com; s=arc-20160816; b=K6imzW4yWK4eBi3TOq0U/Wq6GhlvEEm5wkYuPnGkiGAEbe2V/ZYUNx2lzqEg/88Gwf uXMTwX8Zy5hw21yqzTxQ7ye6eRuYR4bYwPDGC0YIN+wecBWExdy+Ul31+2gnWfrdAXZx ORtoYeZd6JUjs8yfI5FChVpnUcpBYb9IH2TdLiJjMJmnhCbIhAu8azE6mGfENpEhhK0C kJQB5M/LJsW62cRv26mdVniwUO6xQb1URifXbVpLJB4SBP6N1W9ECH9yVigH7GT+Oaz/ 8YuVDN+2LlQtOEv/wKg/DeQUgM/aoVKljNdMFCAPShZy/8frpEpIZ6F1bQw3eWAyJUCQ 3dIw== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=CpEIxOi0AKWN5nPAvB/fNT5zaPux1KtuIdWcDUh5Y/A=; b=0z56F9XWrjnngEw5SUl7AnOc/Xey73OJR00H6FIUErqXaxjrTp00HI5AksFiZrgPze M8gd4UuMtQ1zVcCJYoUYXsZaqxgdSr3pH5PNr7+4yMAvfrVY6jz7b9RlEjv3TEsQTg8j XAZw8mRZC3BqJZc6s7Pv5JQyzr6SqOPwwsR8HvvvUEX1htDhJXYgUFQ+SkevMWfAh83L mJlTkoqZmw0HO/8+ftqqwIt6rWxUn5pf+yMGdMX246kZoKQEiZAqG0woFdq5Rc0d/8nt Iyy9ZKji/3LSgma5xcOJpKCjH0AjZd/vn3CH4MWrgfXkNvuadnJ62KBfG6jJeyEovAOm Ahkw== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f10si2158611wmi.47.2017.11.07.14.26.51; Tue, 07 Nov 2017 14:26:51 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 075106882BB; Wed, 8 Nov 2017 00:26:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp6-g21.free.fr (smtp6-g21.free.fr [212.27.42.6]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 394E26882B7 for ; Wed, 8 Nov 2017 00:26:27 +0200 (EET) Received: from marge.gnuage.org (unknown [IPv6:2a01:e35:2e26:9790::10]) by smtp6-g21.free.fr (Postfix) with ESMTPS id 9829478032A for ; Tue, 7 Nov 2017 23:26:39 +0100 (CET) Received: from [2a01:e35:2e26:9790:bc8a:b994:5b68:84cc] (helo=xps) by marge.gnuage.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1eCCKL-0007KC-7k; Tue, 07 Nov 2017 23:26:39 +0100 Received: from aurel by xps with local (Exim 4.89) (envelope-from ) id 1eCCKL-0006tL-2C; Tue, 07 Nov 2017 23:26:37 +0100 From: Aurelien Jacobs To: FFmpeg development discussions and patches Date: Tue, 7 Nov 2017 23:26:13 +0100 Message-Id: <20171107222613.26435-2-aurel@gnuage.org> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171107222613.26435-1-aurel@gnuage.org> References: <20171107222613.26435-1-aurel@gnuage.org> X-SA-Exim-Connect-IP: 2a01:e35:2e26:9790:bc8a:b994:5b68:84cc X-SA-Exim-Mail-From: aurel@gnuage.org X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: No (on marge.gnuage.org); Unknown failure Subject: [FFmpeg-devel] [PATCH 2/2] aptx: add raw muxer and demuxer for aptX 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 Cc: Aurelien Jacobs MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- doc/general.texi | 1 + libavformat/Makefile | 2 ++ libavformat/allformats.c | 1 + libavformat/aptxdec.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++ libavformat/rawenc.c | 13 +++++++++++ libavformat/utils.c | 1 + 6 files changed, 76 insertions(+) create mode 100644 libavformat/aptxdec.c diff --git a/doc/general.texi b/doc/general.texi index 4a89531c47..79e0bd0993 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -439,6 +439,7 @@ library: @item QCP @tab @tab X @item raw ADTS (AAC) @tab X @tab X @item raw AC-3 @tab X @tab X +@item raw aptX @tab X @tab X @item raw Chinese AVS video @tab X @tab X @item raw CRI ADX @tab X @tab X @item raw Dirac @tab X @tab X diff --git a/libavformat/Makefile b/libavformat/Makefile index caebe5b146..21fb892a81 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -92,6 +92,8 @@ OBJS-$(CONFIG_APC_DEMUXER) += apc.o OBJS-$(CONFIG_APE_DEMUXER) += ape.o apetag.o img2.o OBJS-$(CONFIG_APNG_DEMUXER) += apngdec.o OBJS-$(CONFIG_APNG_MUXER) += apngenc.o +OBJS-$(CONFIG_APTX_DEMUXER) += aptxdec.o rawdec.o +OBJS-$(CONFIG_APTX_MUXER) += rawenc.o OBJS-$(CONFIG_AQTITLE_DEMUXER) += aqtitledec.o subtitles.o OBJS-$(CONFIG_ASF_DEMUXER) += asfdec_f.o asf.o asfcrypt.o \ avlanguage.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 405ddb5ad9..40964a0df0 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -67,6 +67,7 @@ static void register_all(void) REGISTER_DEMUXER (APC, apc); REGISTER_DEMUXER (APE, ape); REGISTER_MUXDEMUX(APNG, apng); + REGISTER_MUXDEMUX(APTX, aptx); REGISTER_DEMUXER (AQTITLE, aqtitle); REGISTER_MUXDEMUX(ASF, asf); REGISTER_DEMUXER (ASF_O, asf_o); diff --git a/libavformat/aptxdec.c b/libavformat/aptxdec.c new file mode 100644 index 0000000000..90ce789454 --- /dev/null +++ b/libavformat/aptxdec.c @@ -0,0 +1,58 @@ +/* + * RAW aptX demuxer + * + * Copyright (C) 2017 Aurelien Jacobs + * + * 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 "avformat.h" +#include "rawdec.h" + +#define APTX_BLOCK_SIZE 4 +#define APTX_PACKET_SIZE (256*APTX_BLOCK_SIZE) + +static int aptx_read_header(AVFormatContext *s) +{ + AVStream *st = avformat_new_stream(s, NULL); + if (!st) + return AVERROR(ENOMEM); + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->codec_id = AV_CODEC_ID_APTX; + st->codecpar->format = AV_SAMPLE_FMT_S32P; + st->codecpar->channels = 2; + st->codecpar->sample_rate = 44100; + st->codecpar->bits_per_coded_sample = 4; + st->codecpar->block_align = APTX_BLOCK_SIZE; + st->codecpar->frame_size = APTX_PACKET_SIZE; + st->start_time = 0; + return 0; +} + +static int aptx_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + return av_get_packet(s->pb, pkt, APTX_PACKET_SIZE); +} + +AVInputFormat ff_aptx_demuxer = { + .name = "aptx", + .long_name = NULL_IF_CONFIG_SMALL("raw aptX"), + .extensions = "aptx", + .read_header = aptx_read_header, + .read_packet = aptx_read_packet, + .flags = AVFMT_GENERIC_INDEX, +}; diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index f640121cb4..aa3ef76fbf 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -91,6 +91,19 @@ AVOutputFormat ff_adx_muxer = { }; #endif +#if CONFIG_APTX_MUXER +AVOutputFormat ff_aptx_muxer = { + .name = "aptx", + .long_name = NULL_IF_CONFIG_SMALL("raw aptX (Audio Processing Technology for Bluetooth)"), + .extensions = "aptx", + .audio_codec = AV_CODEC_ID_APTX, + .video_codec = AV_CODEC_ID_NONE, + .write_header = force_one_stream, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_CAVSVIDEO_MUXER AVOutputFormat ff_cavsvideo_muxer = { .name = "cavsvideo", diff --git a/libavformat/utils.c b/libavformat/utils.c index cbfb78bf4d..33145e7e90 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -324,6 +324,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, } fmt_id_type[] = { { "aac", AV_CODEC_ID_AAC, AVMEDIA_TYPE_AUDIO }, { "ac3", AV_CODEC_ID_AC3, AVMEDIA_TYPE_AUDIO }, + { "aptx", AV_CODEC_ID_APTX, AVMEDIA_TYPE_AUDIO }, { "dts", AV_CODEC_ID_DTS, AVMEDIA_TYPE_AUDIO }, { "dvbsub", AV_CODEC_ID_DVB_SUBTITLE,AVMEDIA_TYPE_SUBTITLE }, { "dvbtxt", AV_CODEC_ID_DVB_TELETEXT,AVMEDIA_TYPE_SUBTITLE },