From patchwork Wed Jul 4 20:38:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 9621 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1167848jad; Wed, 4 Jul 2018 13:38:37 -0700 (PDT) X-Google-Smtp-Source: AAOMgpc9F1L5FxCs/t6PKSkAsr+/FmZJnweeN4pVCb9v1yM/JfmSZrfO8K494cpMCO/+YeuPr1me X-Received: by 2002:a1c:ee9a:: with SMTP id j26-v6mr2116711wmi.116.1530736717207; Wed, 04 Jul 2018 13:38:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530736717; cv=none; d=google.com; s=arc-20160816; b=XAkYzfWUa6igG+yzN4zWIX/W0ajacZm85AaVoS0TYjOliVt1N/awKmDvSH+JqRzWxO wM2mUwScHIu0+Z3X/cT+I0ZJadc3EsPJzhijjMLRkohu062PDGTd9CXvDLHpxAESaYDf wU7dtRwogpk0CMx2ZHfJZefBCnw+LurfTbpotkqr25Fs/pIeXqidZJo9ftfh7r4KrfM/ oukoXvp8BmSNxwJDTE8obo2TGWUi5EQVpWFNIatC7JPvHAiUyneLyFgvRPc4uDOUSLsL qU0KKwoWf7MH6KZKT5K8hmXdyKCHKxH78jMaE/JOC/EVwvul5XTdXjttPGutv8ByA4jh v4LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:user-agent:references:message-id :in-reply-to:to:from:date:delivered-to:arc-authentication-results; bh=6Rnqgl1s0/xsyRjQhIabYPMTEiOCPU4nzyuGXgxAwQ0=; b=QGAaMgWzKMUaxOIoyhHpcWV0Rs+ReNtnxQow7NO6Cv6VU8CaI+1LvCL3WOEdNi9/bv 86K1AwVgh58bYEyRiou4LnrSnZUbstnkBOLJL0biKb9Jltrpr8NBUVyYoPKXk4qhWar3 aHIZM6VJdxLL8twWPR60KfwVBkR/USXGJQnRe2fXd6p9x0YsuVAg7JiQdaoD+fLaVxyr 7wkmGQoDuCABNLE9eqtmGbv8Hdkq4ZVDQ485w48yL2CrffWEP5NFf692STnMe9oxjADz u9IbDo0dkycfgyZgYj083oG1fKw8lkk+GK68dIDE4LsGn+nVxd0xovIUAJHqhTRFTQTu 3wOA== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 31-v6si3429385wra.115.2018.07.04.13.38.36; Wed, 04 Jul 2018 13:38:37 -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 EF8BB68AB7B; Wed, 4 Jul 2018 23:38:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0FE5B68AB6F for ; Wed, 4 Jul 2018 23:38:25 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id B131DE05EF for ; Wed, 4 Jul 2018 22:38:29 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MppxM4kjMTpa for ; Wed, 4 Jul 2018 22:38:28 +0200 (CEST) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id 91CE8E056F for ; Wed, 4 Jul 2018 22:38:28 +0200 (CEST) Date: Wed, 4 Jul 2018 22:38:28 +0200 (CEST) From: Marton Balint X-X-Sender: cus@iq To: FFmpeg development discussions and patches In-Reply-To: <20180704183514.71654-9-baptiste.coudurier@gmail.com> Message-ID: References: <20180704183514.71654-9-baptiste.coudurier@gmail.com> User-Agent: Alpine 2.20 (LSU 67 2015-01-07) MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 09/12] lavf/mxfenc: support creating s436m data tracks 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" On Wed, 4 Jul 2018, Baptiste Coudurier wrote: > --- > libavformat/mxf.c | 1 + > libavformat/mxfdec.c | 3 +++ > libavformat/mxfenc.c | 41 +++++++++++++++++++++++++++++++++++++---- > libavformat/utils.c | 6 +++++- > 4 files changed, 46 insertions(+), 5 deletions(-) > > diff --git a/libavformat/mxf.c b/libavformat/mxf.c > index 8376a2b9bf..451cbcfb2c 100644 > --- a/libavformat/mxf.c > +++ b/libavformat/mxf.c > @@ -28,6 +28,7 @@ > const MXFCodecUL ff_mxf_data_definition_uls[] = { > { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x01,0x00,0x00,0x00 }, 13, AVMEDIA_TYPE_VIDEO }, > { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x02,0x00,0x00,0x00 }, 13, AVMEDIA_TYPE_AUDIO }, > + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x01,0x03,0x02,0x02,0x03,0x00,0x00,0x00 }, 13, AVMEDIA_TYPE_DATA }, > { { 0x80,0x7D,0x00,0x60,0x08,0x14,0x3E,0x6F,0x6F,0x3C,0x8C,0xE1,0x6C,0xEF,0x11,0xD2 }, 16, AVMEDIA_TYPE_VIDEO }, /* LegacyPicture Avid Media Composer MXF */ > { { 0x80,0x7D,0x00,0x60,0x08,0x14,0x3E,0x6F,0x78,0xE1,0xEB,0xE1,0x6C,0xEF,0x11,0xD2 }, 16, AVMEDIA_TYPE_AUDIO }, /* LegacySound Avid Media Composer MXF */ > { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AVMEDIA_TYPE_DATA }, > diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c > index 8c417aea26..3f443bbbc9 100644 > --- a/libavformat/mxfdec.c > +++ b/libavformat/mxfdec.c > @@ -3291,6 +3291,9 @@ static int mxf_set_pts(MXFContext *mxf, AVStream *st, AVPacket *pkt, int64_t nex > int ret = mxf_set_audio_pts(mxf, par, pkt); > if (ret < 0) > return ret; > + } else { > + pkt->dts = pkt->pts = mxf->current_edit_unit; > + pkt->duration = 1; > } > return 0; > } Sorry, my clip wrapping patches I just committed conflicted with your work here, you should use something like this for this hunk: Thanks, Marton --- a/libavformat/mxfdec.c +++ b/libavformat/mxfdec.c @@ -3298,6 +3298,8 @@ static int mxf_set_pts(MXFContext *mxf, AVStream *st, AVPacket *pkt) if (ret < 0) return ret; } else if (track) { + pkt->dts = pkt->pts = track->sample_count; + pkt->duration = 1; track->sample_count++; } return 0;