From patchwork Thu Apr 13 19:54:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3400 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp840715vsd; Thu, 13 Apr 2017 12:55:42 -0700 (PDT) X-Received: by 10.28.10.209 with SMTP id 200mr4948475wmk.126.1492113342158; Thu, 13 Apr 2017 12:55:42 -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 e18si21001299wra.98.2017.04.13.12.55.35; Thu, 13 Apr 2017 12:55:42 -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 989A4689958; Thu, 13 Apr 2017 22:55:25 +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 7CD576898DC for ; Thu, 13 Apr 2017 22:55:19 +0300 (EEST) Received: by mail-qk0-f193.google.com with SMTP id p68so9718841qke.1 for ; Thu, 13 Apr 2017 12:55:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=PMgZyzmYrP35FTPBpwoiBnAlBP/m3blXsqOOFlruDWw=; b=Kv8naojcwZGCIEcdyKv2xaqAi8v74RC9iyo5HYOANiUSE/07G7SL+GnC+wML6Fot9r /54oNfkjBH8Qbs7NwXDO5IJuQeGAbAuVhz/HExQM7ZdieMhhwR0/im7jGisSpy/42V2I LLQyPeC/cVRLoPLtl4fZZAD+Y2ALYsNL93KFJF7Yu3xWLQHskDNjVVwwoRK/laVm0j65 L7WleonZe0IvoOiCfP34i0wE5nw2t/LHFXb6htHR2iukScfXRQeAigU87SnntmZ+P3yf vQASZCrsG/DMcpzKEzFASURyM4xCyNms5iDyYgT+5cOZ9PmL4XwLngFVjfcBu5uIX9cH ucKg== 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; bh=PMgZyzmYrP35FTPBpwoiBnAlBP/m3blXsqOOFlruDWw=; b=DhqcrMEcDeJskv9M49lETrhpOztw5Zxaj6tg+VdMcBO0J0LhSQTzIMBMrKNQKS4izv 5sbm/1xxUbe47k80F42kgoYmNmO5Js/Wr4BWWa8w5k9rNKHTXjLbF4crO2FAnGyKJ1bn jVknH5VGNLiPpeYb9QdLzgHGEUnMRD9lt6WpeIytYcwjLrizCbkNwn3KtCoOViE75fq1 PXKmYnroSF4fcENzedtWdtK81REAlbuskzsXO3JOzofYtw8eZQVn02te0XIlMgR/vN9N PiJWMxUji0fLyWFqb28bfiwebuSY6B5MP9eA8/fWZSBVHBmDL6Qb/B39sEw58LCDtKC+ hsPQ== X-Gm-Message-State: AN3rC/6OJ2c93AtGkM1MdZl4M3/WKdpoopycG5sRNC89vib5bS0nQplo uHPvglqktaEdDDbJ X-Received: by 10.55.161.6 with SMTP id k6mr3814752qke.148.1492113324625; Thu, 13 Apr 2017 12:55:24 -0700 (PDT) Received: from localhost.localdomain ([181.231.62.139]) by smtp.gmail.com with ESMTPSA id g185sm16443226qkc.7.2017.04.13.12.55.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 13 Apr 2017 12:55:24 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Apr 2017 16:54:12 -0300 Message-Id: <20170413195417.9064-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 Subject: [FFmpeg-devel] [PATCH 1/6] avformat/movenc: always check for new extradata on a packet 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" Don't just look at zero sized packets, and also check for AAC extradata updates, in preparation for the following patches. Signed-off-by: James Almer --- libavformat/movenc.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index e6e2313c53..d4fa60b029 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -5303,6 +5303,24 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) mov->flags &= ~FF_MOV_FLAG_FRAG_DISCONT; } + if (trk->par->codec_id == AV_CODEC_ID_MP4ALS || + trk->par->codec_id == AV_CODEC_ID_AAC || + trk->par->codec_id == AV_CODEC_ID_FLAC) { + int side_size = 0; + uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size); + if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) { + void *newextra = av_mallocz(side_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!newextra) + return AVERROR(ENOMEM); + av_free(par->extradata); + par->extradata = newextra; + memcpy(par->extradata, side, side_size); + par->extradata_size = side_size; + if (!pkt->size) // Flush packet + mov->need_rewrite_extradata = 1; + } + } + if (!pkt->size) { if (trk->start_dts == AV_NOPTS_VALUE && trk->frag_discont) { trk->start_dts = pkt->dts; @@ -5312,22 +5330,6 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) trk->start_cts = 0; } - if (trk->par->codec_id == AV_CODEC_ID_MP4ALS || - trk->par->codec_id == AV_CODEC_ID_FLAC) { - int side_size = 0; - uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size); - if (side && side_size > 0 && (side_size != par->extradata_size || memcmp(side, par->extradata, side_size))) { - void *newextra = av_mallocz(side_size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!newextra) - return AVERROR(ENOMEM); - av_free(par->extradata); - par->extradata = newextra; - memcpy(par->extradata, side, side_size); - par->extradata_size = side_size; - mov->need_rewrite_extradata = 1; - } - } - return 0; /* Discard 0 sized packets */ }