From patchwork Sat Nov 10 03:58:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lewis Fox X-Patchwork-Id: 10971 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 ED38F44C969 for ; Sat, 10 Nov 2018 05:58:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5C6C3689DAE; Sat, 10 Nov 2018 05:57:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it1-f196.google.com (mail-it1-f196.google.com [209.85.166.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D9D2689D5B for ; Sat, 10 Nov 2018 05:57:41 +0200 (EET) Received: by mail-it1-f196.google.com with SMTP id r12-v6so5867920ita.3 for ; Fri, 09 Nov 2018 19:58:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=eq5mtkKnrHynqjjFDZ7Fbkts3+M4vFuDfkcZXLMl1Rk=; b=ZwWCz0rC6DwUtN+E7yBXpZDQ1UNzYhpmcOhGwRIB1xogAKSLg6oUr5oeiOFd318sNQ 3pdwoSfu9APuOqIB83RBOICfXUrSUgbw5mkz5e8M6DbeMgOGVkXVD6MUaG2A1qDULJ8U 6gpWUlQg5K0J9F/cG49Zktw0JpmUzWx17k8ymcC53VvVbTGUX0tuPICe+X1cU3v9yAPY psVkcy2/pYRoktoDxdrKpliwEJr/A5s9Z0+Xa9tRI8TdCWfHKWZVrgby94IGwrtCOSyc ocR1EE4XCBcQODeMuEo1qP3rwQyX/6SsezQMMwYi2cf6KzozuFqiPmsYDVn6Q6eJe02N TiKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=eq5mtkKnrHynqjjFDZ7Fbkts3+M4vFuDfkcZXLMl1Rk=; b=SF9F4XguTJtwzVrL7FmZaVm/LJg7p/RqPgIJUs8omh0oBiZq84K3r+Z6yd8PZExgrc pECT2LJdXvG6ERFKWljd82NB9cHfctMHdYuu4JIbGGwmJlJ2IcykkHgvHBg3hIwb3Qp0 IpvZt/MgvcYsXye76ovwnnXLvxxcaa0Qb90WdZ5sI0y01iUrqa7wjrGnADcHGfm8t/Oq 9nBEVQVGacyOnXNk1xcJLZfThDnRONwOE4aE5Y6Kc+zyB798k3p7xbmELGxF3jFx8o74 jfSzMppTLEMDhEoENr9L1jj2c9xchIBxg7H+q42ySeSfRVDE+xUNlSuhcsPeutCc7c9p VgXg== X-Gm-Message-State: AGRZ1gIpT5EA+h3OqHOXO9zGyM4XX9On0CX56AExVCd9pRR6hAhKi9a7 8W1R/7shtKH2KoTg9A8CapxxjZ43R1nxbw== X-Google-Smtp-Source: AJdET5c8aJ9Slw0a/KjIyEC4GVkDkN//+MgaxYLSMkhXg3bwmVxJbXZ3NyZQniUl2oFFug7SOo9dtg== X-Received: by 2002:a02:7fcd:: with SMTP id r196-v6mr10616763jac.31.1541822296076; Fri, 09 Nov 2018 19:58:16 -0800 (PST) Received: from localhost.localdomain (c-73-78-209-161.hsd1.co.comcast.net. [73.78.209.161]) by smtp.gmail.com with ESMTPSA id f7-v6sm3066385iog.30.2018.11.09.19.58.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Nov 2018 19:58:15 -0800 (PST) From: Lewis Fox X-Google-Original-From: Lewis Fox To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Nov 2018 20:58:41 -0700 Message-Id: <20181110035841.96238-1-LRFLEW.Coll@gmail.com> X-Mailer: git-send-email 2.17.2 (Apple Git-113) Subject: [FFmpeg-devel] [PATCH] Implement muxing AAC in a CAFF container 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: Lewis Fox MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Lewis Fox Signed-off-by: Lewis Fox --- libavformat/cafenc.c | 61 ++++++++++++++++++++++++++++++++++++------ libavformat/mov.c | 1 + libavformat/mov_esds.c | 1 - 3 files changed, 54 insertions(+), 9 deletions(-) diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index 0f7c4ebbb3..0eb3c27ad6 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -83,6 +83,8 @@ static uint32_t samples_per_packet(enum AVCodecID codec_id, int channels, int bl return 384; case AV_CODEC_ID_OPUS: return 960; + case AV_CODEC_ID_AAC: + return 1024; case AV_CODEC_ID_MP2: case AV_CODEC_ID_MP3: return 1152; @@ -102,10 +104,57 @@ static uint32_t samples_per_packet(enum AVCodecID codec_id, int channels, int bl } } +static void put_descr(AVIOContext *pb, int tag, unsigned int size) +{ + int i = 3; + avio_w8(pb, tag); + for (; i > 0; i--) + avio_w8(pb, (size >> (7 * i)) | 0x80); + avio_w8(pb, size & 0x7F); +} + +static void caf_write_aac_kuki(AVIOContext *pb, AVStream *stream) { + AVCodecParameters *par = stream->codecpar; + int decoder_specific_info_len = par->extradata_size ? 5 + par->extradata_size : 0; + + ffio_wfourcc(pb, "kuki"); + avio_wb64(pb, 5 + 3 + 5 + 13 + decoder_specific_info_len + 5 + 1); // size + + // ES descriptor + put_descr(pb, MP4ESDescrTag, 3 + 5 + 13 + decoder_specific_info_len + 5 + 1); + avio_wb16(pb, 0); + avio_w8(pb, 0x00); // flags (= no flags) + + // DecoderConfig descriptor + put_descr(pb, MP4DecConfigDescrTag, 13 + decoder_specific_info_len); + + // Object type indication + avio_w8(pb, ff_codec_get_tag(ff_mp4_obj_type, par->codec_id)); + + // the following fields is made of 6 bits to identify the streamtype (5 for audio) + // plus 1 bit to indicate upstream and 1 bit set to 1 (reserved) + avio_w8(pb, 0x15); // flags (= Audiostream) + + avio_wb24(pb, 6144); // Buffersize DB + avio_wb32(pb, par->bit_rate); // max bitrate (FIXME should be max rate in any 1 sec window) + avio_wb32(pb, par->bit_rate); // average bitrate (target bitrate, or 0 for VBR) + + if (par->extradata_size) { + // DecoderSpecific info descriptor + put_descr(pb, MP4DecSpecificDescrTag, par->extradata_size); + avio_write(pb, par->extradata, par->extradata_size); + } + + // SL descriptor + put_descr(pb, MP4SLDescrTag, 1); + avio_w8(pb, 0x02); +} + static int caf_write_header(AVFormatContext *s) { AVIOContext *pb = s->pb; - AVCodecParameters *par = s->streams[0]->codecpar; + AVStream *stream = s->streams[0]; + AVCodecParameters *par = stream->codecpar; CAFContext *caf = s->priv_data; AVDictionaryEntry *t = NULL; unsigned int codec_tag = ff_codec_get_tag(ff_codec_caf_tags, par->codec_id); @@ -117,12 +166,6 @@ static int caf_write_header(AVFormatContext *s) return AVERROR(EINVAL); } - switch (par->codec_id) { - case AV_CODEC_ID_AAC: - av_log(s, AV_LOG_ERROR, "muxing codec currently unsupported\n"); - return AVERROR_PATCHWELCOME; - } - if (par->codec_id == AV_CODEC_ID_OPUS && par->channels > 2) { av_log(s, AV_LOG_ERROR, "Only mono and stereo are supported for Opus\n"); return AVERROR_INVALIDDATA; @@ -161,7 +204,9 @@ static int caf_write_header(AVFormatContext *s) ff_mov_write_chan(pb, par->channel_layout); } - if (par->codec_id == AV_CODEC_ID_ALAC) { + if (par->codec_id == AV_CODEC_ID_AAC) { + caf_write_aac_kuki(pb, stream); + } else if (par->codec_id == AV_CODEC_ID_ALAC) { ffio_wfourcc(pb, "kuki"); avio_wb64(pb, 12 + par->extradata_size); avio_write(pb, "\0\0\0\14frmaalac", 12); diff --git a/libavformat/mov.c b/libavformat/mov.c index ec57a05803..f5f04d6ba6 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -776,6 +776,7 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom) static int mov_read_esds(MOVContext *c, AVIOContext *pb, MOVAtom atom) { + avio_rb32(pb); /* version + flags */ return ff_mov_read_esds(c->fc, pb); } diff --git a/libavformat/mov_esds.c b/libavformat/mov_esds.c index a444d969c6..ae7f4b6cbf 100644 --- a/libavformat/mov_esds.c +++ b/libavformat/mov_esds.c @@ -29,7 +29,6 @@ int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb) return 0; st = fc->streams[fc->nb_streams-1]; - avio_rb32(pb); /* version + flags */ ff_mp4_read_descr(fc, pb, &tag); if (tag == MP4ESDescrTag) { ff_mp4_parse_es_descr(pb, NULL);