From patchwork Sat Jan 6 16:48:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jacobs X-Patchwork-Id: 7165 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp726692jaa; Sat, 6 Jan 2018 08:49:27 -0800 (PST) X-Google-Smtp-Source: ACJfBot9FOo1gxypoAt9q1eFxG9fLQtJcM3r6U/PqoZpxfPMOeBIYgNWc8PLGqDile9YXkJ8sgM8 X-Received: by 10.28.24.11 with SMTP id 11mr5491830wmy.40.1515257366981; Sat, 06 Jan 2018 08:49:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515257366; cv=none; d=google.com; s=arc-20160816; b=kGcVJlF4q3RrzNm1dlmwVD3QCYEwsYw04iOj2k5Ta1XkyYjw6rhCzXLEnHTJtSfZC9 K6WXQdAfwVrhNQMgfbbSb37BjkyBhZwmIxf+gPKKDx6oE29SkUzDU2nNBdo3md21gsTR WPpf837rypMxM8K9unfXdLPnS4EzCbjiZoEt94IXt/iy2qdYwNSoAO53ZyIJGuVetz82 AxG8bq5ZWHPsQDWHF1ibtukUdoACwx8v5TJcHD8ybNn5Dnst+KqC8cWu4o9e9FImT5L+ j45/PDNRSvzsCt3RkXA4ikBQL876Kjf4jJj9zlHCbJ2+Y2fMOXJoIXXRcbwC7ZMd+/a6 PLtg== 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=bPtOPSeC4cqtSq4FFNTiujzRnguqYCAk2m5rtNGcLXE=; b=0x/Dvedbn7paZctpewDQPOWFIqepRri528J98bFt2ffsKjoHDO3IBsoqQ2IgpHvAX8 2WQ2jNM66hejQR+ptz/ibvEUYvyJd2/QSkKkqNtVJD8ObN26Ot4oTdOoUL3JyzgDQ5nN PZyikCbVY2lqjSLyCm1GXeswnBnjkwbDZHFQ8LfIFPWAq9nkc0+IviQrWxR568lzhpNd dGsn0cuz89wvCPhrzF4WQsVSrfiQovqEc3m2ht0vRJYKQtvdYKGJDpR6MdCCtm0p7FSs cav7A9t79J++Zy/u7OCNvqC6PzlJAxYBZ523YYaetPsUbkjaFdeKlv/67RXc0KJcjSz/ yG0w== 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 p39si6155605wrb.93.2018.01.06.08.49.26; Sat, 06 Jan 2018 08:49:26 -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 9029B689E1D; Sat, 6 Jan 2018 18:49:25 +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 454F9689E0A for ; Sat, 6 Jan 2018 18:49:24 +0200 (EET) Received: from marge.gnuage.org (unknown [IPv6:2a01:e35:2e26:9790::10]) by smtp6-g21.free.fr (Postfix) with ESMTPS id 3D9DD7803BC for ; Sat, 6 Jan 2018 17:49:23 +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 1eXreZ-0001sj-04; Sat, 06 Jan 2018 17:49:03 +0100 Received: from aurel by xps with local (Exim 4.90) (envelope-from ) id 1eXreY-0006sf-RP; Sat, 06 Jan 2018 17:49:02 +0100 From: Aurelien Jacobs To: FFmpeg development discussions and patches Date: Sat, 6 Jan 2018 17:48:08 +0100 Message-Id: <20180106164808.26162-6-aurel@gnuage.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180106164808.26162-1-aurel@gnuage.org> References: <20180106164808.26162-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-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on marge.gnuage.org X-Spam-Level: X-Spam-Status: No, score=-0.2 required=3.0 tests=BAYES_00, FSL_HELO_NON_FQDN_1, RDNS_NONE autolearn=no autolearn_force=no version=3.4.1 X-SA-Exim-Version: 4.2.1 (built Tue, 02 Aug 2016 21:08:31 +0000) X-SA-Exim-Scanned: Yes (on marge.gnuage.org) Subject: [FFmpeg-devel] [PATCH 5/5] aptx: add raw muxer and demuxer for aptX HD 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" --- Changelog | 2 +- libavformat/Makefile | 2 ++ libavformat/allformats.c | 1 + libavformat/aptxdec.c | 51 ++++++++++++++++++++++++++++++++++++++++++++---- libavformat/rawenc.c | 13 ++++++++++++ 5 files changed, 64 insertions(+), 5 deletions(-) diff --git a/Changelog b/Changelog index 9349bf1e8d..3a97b0b02e 100644 --- a/Changelog +++ b/Changelog @@ -12,7 +12,7 @@ version : - Intel QSV-accelerated MJPEG encoding - PCE support for extended channel layouts in the AAC encoder - native aptX and aptX HD encoder and decoder -- Raw aptX muxer and demuxer +- Raw aptX and aptX HD muxer and demuxer - NVIDIA NVDEC-accelerated H.264, HEVC, MPEG-1/2/4, VC1, VP8/9 hwaccel decoding - Intel QSV-accelerated overlay filter - mcompand audio filter diff --git a/libavformat/Makefile b/libavformat/Makefile index cb70eac920..dbe2890297 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -96,6 +96,8 @@ 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_APTX_HD_DEMUXER) += aptxdec.o rawdec.o +OBJS-$(CONFIG_APTX_HD_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 6a9b9883c9..b70b7463b9 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -70,6 +70,7 @@ static void register_all(void) REGISTER_DEMUXER (APE, ape); REGISTER_MUXDEMUX(APNG, apng); REGISTER_MUXDEMUX(APTX, aptx); + REGISTER_MUXDEMUX(APTX_HD, aptx_hd); REGISTER_DEMUXER (AQTITLE, aqtitle); REGISTER_MUXDEMUX(ASF, asf); REGISTER_DEMUXER (ASF_O, asf_o); diff --git a/libavformat/aptxdec.c b/libavformat/aptxdec.c index 3b8fae1b55..18c2d76b71 100644 --- a/libavformat/aptxdec.c +++ b/libavformat/aptxdec.c @@ -26,26 +26,49 @@ #define APTX_BLOCK_SIZE 4 #define APTX_PACKET_SIZE (256*APTX_BLOCK_SIZE) +#define APTX_HD_BLOCK_SIZE 6 +#define APTX_HD_PACKET_SIZE (256*APTX_HD_BLOCK_SIZE) + typedef struct AptXDemuxerContext { AVClass *class; int sample_rate; } AptXDemuxerContext; -static int aptx_read_header(AVFormatContext *s) +static AVStream *aptx_read_header_common(AVFormatContext *s) { AptXDemuxerContext *s1 = s->priv_data; AVStream *st = avformat_new_stream(s, NULL); if (!st) - return AVERROR(ENOMEM); + return NULL; 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 = s1->sample_rate; + st->start_time = 0; + return st; +} + +static int aptx_read_header(AVFormatContext *s) +{ + AVStream *st = aptx_read_header_common(s); + if (!st) + return AVERROR(ENOMEM); + st->codecpar->codec_id = AV_CODEC_ID_APTX; 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_hd_read_header(AVFormatContext *s) +{ + AVStream *st = aptx_read_header_common(s); + if (!st) + return AVERROR(ENOMEM); + st->codecpar->codec_id = AV_CODEC_ID_APTX_HD; + st->codecpar->bits_per_coded_sample = 6; + st->codecpar->block_align = APTX_HD_BLOCK_SIZE; + st->codecpar->frame_size = APTX_HD_PACKET_SIZE; return 0; } @@ -54,6 +77,11 @@ static int aptx_read_packet(AVFormatContext *s, AVPacket *pkt) return av_get_packet(s->pb, pkt, APTX_PACKET_SIZE); } +static int aptx_hd_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + return av_get_packet(s->pb, pkt, APTX_HD_PACKET_SIZE); +} + static const AVOption aptx_options[] = { { "sample_rate", "", offsetof(AptXDemuxerContext, sample_rate), AV_OPT_TYPE_INT, {.i64 = 48000}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, { NULL }, @@ -66,6 +94,7 @@ static const AVClass aptx_demuxer_class = { .version = LIBAVUTIL_VERSION_INT, }; +#if CONFIG_APTX_MUXER AVInputFormat ff_aptx_demuxer = { .name = "aptx", .long_name = NULL_IF_CONFIG_SMALL("raw aptX"), @@ -76,3 +105,17 @@ AVInputFormat ff_aptx_demuxer = { .flags = AVFMT_GENERIC_INDEX, .priv_class = &aptx_demuxer_class, }; +#endif + +#if CONFIG_APTX_HD_DEMUXER +AVInputFormat ff_aptx_hd_demuxer = { + .name = "aptx_hd", + .long_name = NULL_IF_CONFIG_SMALL("raw aptX HD"), + .extensions = "aptxhd", + .priv_data_size = sizeof(AptXDemuxerContext), + .read_header = aptx_hd_read_header, + .read_packet = aptx_hd_read_packet, + .flags = AVFMT_GENERIC_INDEX, + .priv_class = &aptx_demuxer_class, +}; +#endif diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index aa3ef76fbf..dcf880d17e 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -104,6 +104,19 @@ AVOutputFormat ff_aptx_muxer = { }; #endif +#if CONFIG_APTX_HD_MUXER +AVOutputFormat ff_aptx_hd_muxer = { + .name = "aptx_hd", + .long_name = NULL_IF_CONFIG_SMALL("raw aptX HD (Audio Processing Technology for Bluetooth)"), + .extensions = "aptxhd", + .audio_codec = AV_CODEC_ID_APTX_HD, + .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",