From patchwork Thu Apr 13 19:54:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3402 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp840779vsd; Thu, 13 Apr 2017 12:55:56 -0700 (PDT) X-Received: by 10.223.146.98 with SMTP id 89mr4285592wrj.71.1492113356371; Thu, 13 Apr 2017 12:55:56 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v72si37628733wrc.210.2017.04.13.12.55.55; Thu, 13 Apr 2017 12:55:56 -0700 (PDT) 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; 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=NONE 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 97D3868998B; Thu, 13 Apr 2017 22:55:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B394B68925B for ; Thu, 13 Apr 2017 22:55:21 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id p68so9718935qke.1 for ; Thu, 13 Apr 2017 12:55:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=4fRHfLywepXNserlc/sXWh/sS3Jry8thRjme4uGxwo0=; b=Gh4Kg/P2m5Oo8YwRMrqGtiL3MxH7yqwfyptrIbLuRqzNr/zjoVVDwuGGs3xzZVcJIR ZayEV/ZebZSIWuo8IDnFb86xq+vJol9pZhq0vSYCE4sdEmrYkZ2fJEScR52cDMlsr+sD ZFaxBqVBbn9wHCwOZDQOTkGcv41tX/NWUqxDKfjKiqxt8cnYEdcF+OKzz54pL/G6kl28 cwhkHrLe/abWOXxR3EG4CJtJTR5T36huVGZleUsvZ50X4UqNnTho9C86K4Cmq8yHvokb co3OI6pXz91h+PI6Wb2M+mpVgH3huar0z5+7UVcxiMRQ04UPdVOg5Bai3U/SYEhIU+sj eQmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=4fRHfLywepXNserlc/sXWh/sS3Jry8thRjme4uGxwo0=; b=IWjyqnUC9+Affj2CYFl1C5hlgLeG9NMKGj71vV0unsrHQK4mPywKK+eklm6kzBkZRm lOhQfrPUJdt+729cwnnnSB+w5Gbbitzy97vZeQ71Vrc/epP2n8bR2I0PMim/DT+M/WBQ VqfnVcqFVnUIpq85ducxRU59Fwdo8PhRKV/Rw/tpNMr6sb0tNZapkZjocI2uyjxPKtRp PG2fYMOf6k/u4eMA6CYUQuxyuWk3b1TNinG6ZdLCU/Si6e7kuR46k7zMMAs+iISoX1SX ZDvbSdjjzDeg5Tiy0PNR5UkP157T/O8u5LaOZv2XegiAvJJiYD/FDsdkB06a4lb4IeYR hmdw== X-Gm-Message-State: AN3rC/5LQt+MKpcmu0ZYCggKFVTKdmr8YPY/df/LOvbV2nAmLFZ5QZrC RTPVZsHqay7Zg9qH X-Received: by 10.55.83.71 with SMTP id h68mr3767861qkb.259.1492113327009; Thu, 13 Apr 2017 12:55:27 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id g185sm16443226qkc.7.2017.04.13.12.55.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Apr 2017 12:55:26 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2017 16:54:14 -0300 Message-Id: <20170413195417.9064-3-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170413195417.9064-1-jamrial@gmail.com> References: <20170413195417.9064-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/6] avformat/latmenc: check packet side data for AAC extradata updates 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is in preparation for the following patch. Signed-off-by: James Almer --- libavformat/latmenc.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/libavformat/latmenc.c b/libavformat/latmenc.c index 43ca4821cb..c919976d49 100644 --- a/libavformat/latmenc.c +++ b/libavformat/latmenc.c @@ -146,20 +146,34 @@ static void latm_write_frame_header(AVFormatContext *s, PutBitContext *bs) static int latm_write_packet(AVFormatContext *s, AVPacket *pkt) { LATMContext *ctx = s->priv_data; + AVCodecParameters *par = s->streams[0]->codecpar; AVIOContext *pb = s->pb; PutBitContext bs; int i, len; uint8_t loas_header[] = "\x56\xe0\x00"; - if (s->streams[0]->codecpar->codec_id == AV_CODEC_ID_AAC_LATM) + if (par->codec_id == AV_CODEC_ID_AAC_LATM) return ff_raw_write_packet(s, pkt); - if (!s->streams[0]->codecpar->extradata) { + if (!par->extradata) { if(pkt->size > 2 && pkt->data[0] == 0x56 && (pkt->data[1] >> 4) == 0xe && (AV_RB16(pkt->data + 1) & 0x1FFF) + 3 == pkt->size) return ff_raw_write_packet(s, pkt); - else - return AVERROR_INVALIDDATA; + else { + uint8_t *side_data; + int side_data_size = 0, ret; + + side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, + &side_data_size); + if (side_data_size) { + if (latm_decode_extradata(ctx, side_data, side_data_size) < 0) + return AVERROR_INVALIDDATA; + ret = ff_alloc_extradata(par, side_data_size); + if (ret < 0) + return ret; + memcpy(par->extradata, side_data, side_data_size); + } + } } if (pkt->size > 0x1fff)