From patchwork Wed Aug 17 09:53:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 208 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp149964vsd; Wed, 17 Aug 2016 02:57:14 -0700 (PDT) X-Received: by 10.194.238.170 with SMTP id vl10mr43886209wjc.18.1471427834263; Wed, 17 Aug 2016 02:57:14 -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 p1si24808104wmd.53.2016.08.17.02.57.12; Wed, 17 Aug 2016 02:57:14 -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; 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 9D914689BAA; Wed, 17 Aug 2016 12:56:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe01-1.mx.upcmail.net (vie01a-dmta-pe01-1.mx.upcmail.net [62.179.121.154]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF4F3689BA8 for ; Wed, 17 Aug 2016 12:56:43 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1bZxaX-0006jZ-J7 for ffmpeg-devel@ffmpeg.org; Wed, 17 Aug 2016 11:56:45 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id Y9wk1t00Y0S5wYM019wlSx; Wed, 17 Aug 2016 11:56:45 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 17 Aug 2016 11:53:34 +0200 Message-Id: <20160817095334.15855-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] ffmpeg: Update muxer extradata after flushing encoders 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 needed for encoders which store a final sample count or checksum in extradata alternatively every encoder as well as muxer can implement AV_PKT_DATA_NEW_EXTRADATA support to update the extradata at the end. Signed-off-by: Michael Niedermayer --- ffmpeg.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ffmpeg.c b/ffmpeg.c index bae515d..9d972d0 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1772,6 +1772,23 @@ static void flush_encoders(void) if (stop_encoding) break; } + if (ost->enc_ctx->extradata_size) { + void *ptr = av_mallocz(ost->enc_ctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + void *ptr2 = av_mallocz(ost->enc_ctx->extradata_size + AV_INPUT_BUFFER_PADDING_SIZE); + if (ptr && ptr2) { + av_free(ost->st->codec->extradata); + av_free(ost->st->codecpar->extradata); + ost->st->codec->extradata = ptr; + ost->st->codecpar->extradata = ptr2; + memcpy(ost->st->codec->extradata , ost->enc_ctx->extradata, ost->enc_ctx->extradata_size); + memcpy(ost->st->codecpar->extradata, ost->enc_ctx->extradata, ost->enc_ctx->extradata_size); + ost->st->codec ->extradata_size = ost->enc_ctx->extradata_size; + ost->st->codecpar->extradata_size = ost->enc_ctx->extradata_size; + } else { + av_free(ptr); + av_free(ptr2); + } + } } }