From patchwork Thu Aug 18 05:51:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umair Khan X-Patchwork-Id: 215 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp454684vsd; Thu, 18 Aug 2016 10:27:49 -0700 (PDT) X-Received: by 10.194.185.202 with SMTP id fe10mr3029503wjc.93.1471541268171; Thu, 18 Aug 2016 10:27:48 -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 v81si517424wma.46.2016.08.18.10.27.47; Thu, 18 Aug 2016 10:27:48 -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 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 81FDD689CBE; Thu, 18 Aug 2016 08:55:09 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f41.google.com (mail-it0-f41.google.com [209.85.214.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AE98689C6B for ; Thu, 18 Aug 2016 08:51:22 +0300 (EEST) Received: by mail-it0-f41.google.com with SMTP id e63so1024148ith.1 for ; Wed, 17 Aug 2016 22:51:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=MCTnXSmgIVPOKex8550KuOkBbaxmMPweuaz+UMplr20=; b=sLOfk8sEZsHzPa9JmzFh7HSVRbmopS87FSbHnbdrBYJKFVVY5QMFU8fQZXAtIvCsY3 kIKMLMtRpfT3JCnaI3rknvZZgHAoQpnp+ncRrbyyPv4sBuf4IxSqymE8CA/LjtEPiiUz 0Lhhs4keTu0HUoPE/1R/67/14qpG4uhzqIJ8QZK6vP7nM3ZhOWuYJ+X2tLduV34fOIhP F4JrbfTAz65LBAXAnZbjXsx5OWdFs2Qr+DCD9xkwa/p75RSgen32oot4w+eWkthoklex Rl4mRebrumzUpUCgQDFGZ709OcwbWD/zgT4ND5v1cYpLXJvoX8UWz1k+zh2zkPI/DUif Tn2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=MCTnXSmgIVPOKex8550KuOkBbaxmMPweuaz+UMplr20=; b=SVtZxd89myvGukmuiw/EqoDAzZMB33YS8Xl5U1tOA3+g+zgLBgS1wAdNSIC8+5XR29 Qn93L+Aql9w4TxncZFEULuCMngB68TYZQqhJpZLg4m0FtWizi8+30V/bZ8ij5BI4VaYZ lkuUnHQ9FWbZ5vKiicph6m+pCVys8byo3EY1wpuCZzyYi5Z4yW1fOCVUnoJe4fDvSdWn 4RXsMdokodZHmXPnULV6/Qj0HHiad+GkBdjgt8szd7/BMw2fgMjQI0n90VvzDM8pGIyt iNaE5ni4UJ+GOT+vO9cSIC7EVJ5GQclbe0gflpNZXYKVyBdwALvGtqnsjABuk6+ATE2W 90Mw== X-Gm-Message-State: AEkoousaUB06+FriIpB1566P6KulHXER9QdsFxkzioLs066ezo7lU3wNX7tEAi8bMdj7nVpmOViLpQmMDRhkWg== X-Received: by 10.36.120.150 with SMTP id p144mr1101052itc.44.1471499480575; Wed, 17 Aug 2016 22:51:20 -0700 (PDT) MIME-Version: 1.0 Received: by 10.79.26.215 with HTTP; Wed, 17 Aug 2016 22:51:00 -0700 (PDT) In-Reply-To: References: From: Umair Khan Date: Thu, 18 Aug 2016 11:21:00 +0530 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] avformat/movenc: allow rewriting extradata 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi, On Thu, Aug 18, 2016 at 2:10 AM, Umair Khan wrote: > On Thu, Aug 18, 2016 at 1:28 AM, James Almer wrote: >> On 8/17/2016 3:59 PM, Umair Khan wrote: >>> Hi, >>> >>> Patch attached. >>> >>> I hope this is the cleanest solution. :) >>> >>> - Umair >>> >>> >>> patch.diff >>> >>> >>> From be04357d54897173b1776ed92ab8347b3cdffd46 Mon Sep 17 00:00:00 2001 >>> From: Umair Khan >>> Date: Thu, 18 Aug 2016 00:27:42 +0530 >>> Subject: [PATCH] avformat/movenc: allow rewriting extradata >>> >>> Signed-off-by: Umair Khan >>> --- >>> libavformat/movenc.c | 30 ++++++++++++++++++++++++++++++ >>> libavformat/movenc.h | 2 ++ >>> 2 files changed, 32 insertions(+) >>> >>> diff --git a/libavformat/movenc.c b/libavformat/movenc.c >>> index 14db880..b33f24c 100644 >>> --- a/libavformat/movenc.c >>> +++ b/libavformat/movenc.c >>> @@ -4919,6 +4919,19 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) >>> trk->start_cts = pkt->pts - pkt->dts; >>> else >>> trk->start_cts = 0; >>> + } >>> + >>> + if (trk->par->codec_id == AV_CODEC_ID_MP4ALS) { >>> + int side_size = 0; >>> + uint8_t *side = av_packet_get_side_data(pkt, AV_PKT_DATA_NEW_EXTRADATA, &side_size); >>> + av_log(s, AV_LOG_ERROR, "side_size = %d\n", side_size); >> >> I'm not sure this is useful at all, but if you think it is >> then make it either AV_ERROR_VERBOSE or AV_ERROR_DEBUG. > > Sorry for this. I overlooked it. > I'll resend the patch. Updated patch attached. - Umair From 3bda0c5d727e7b1f45e8fddc8c0022c0a1d5e66a Mon Sep 17 00:00:00 2001 From: Umair Khan Date: Thu, 18 Aug 2016 00:27:42 +0530 Subject: [PATCH] avformat/movenc: allow rewriting extradata Signed-off-by: Umair Khan --- libavformat/movenc.c | 28 ++++++++++++++++++++++++++++ libavformat/movenc.h | 2 ++ 2 files changed, 30 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 14db880..1235b37 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4919,6 +4919,18 @@ static int mov_write_single_packet(AVFormatContext *s, AVPacket *pkt) trk->start_cts = pkt->pts - pkt->dts; else trk->start_cts = 0; + } + + if (trk->par->codec_id == AV_CODEC_ID_MP4ALS) { + 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))) { + av_free(par->extradata); + par->extradata = av_mallocz(side_size + AV_INPUT_BUFFER_PADDING_SIZE); + memcpy(par->extradata, side, side_size); + par->extradata_size = side_size; + mov->need_rewrite_extradata = 1; + } } return 0; /* Discard 0 sized packets */ @@ -5923,6 +5935,22 @@ static int mov_write_trailer(AVFormatContext *s) int i; int64_t moov_pos; + if (mov->need_rewrite_extradata) { + for (i = 0; i < s->nb_streams; i++) { + MOVTrack *track= &mov->tracks[i]; + AVCodecParameters *par = track->par; + + track->vos_len = par->extradata_size; + track->vos_data = av_malloc(track->vos_len); + if (!track->vos_data) { + AVERROR(ENOMEM); + goto error; + } + memcpy(track->vos_data, par->extradata, track->vos_len); + } + mov->need_rewrite_extradata = 0; + } + /* * Before actually writing the trailer, make sure that there are no * dangling subtitles, that need a terminating sample. diff --git a/libavformat/movenc.h b/libavformat/movenc.h index 6e9f5ac..894a1b0 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -215,6 +215,8 @@ typedef struct MOVMuxContext { uint8_t *encryption_kid; int encryption_kid_len; + int need_rewrite_extradata; + } MOVMuxContext; #define FF_MOV_FLAG_RTP_HINT (1 << 0)