From patchwork Wed Dec 5 17:52:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 11291 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id B72CA44E831 for ; Wed, 5 Dec 2018 19:52:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6CE8C68A6FA; Wed, 5 Dec 2018 19:52:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2F77A68A655 for ; Wed, 5 Dec 2018 19:52:18 +0200 (EET) Received: by mail-wm1-f67.google.com with SMTP id a18so13890300wmj.1 for ; Wed, 05 Dec 2018 09:52:27 -0800 (PST) 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=0+cb4dzRwfl2iS73R+9CnvmSj7f3LcNePptCghIG6Hg=; b=XODn13MKfqqu/30uGly2HBKATWMqlLD9qv3jpb+m9OYvNa0j/tVAp9HNwyHj4iNFsg k2tIbgoV9M33Ke3dGMp2bwj7/w7j12HnA1gsMyYvpTXuW88k5OIcMdtnKqUCB7E/SwJb L7U1xAi/Fw9FlnfuHs/R4sn3jRgsmpV6xaGvjD9M/a5/njBH4/+v4f9eHbbvsAv2BLyZ MFm+uMGiFZfi0hNKUyGuoYt5x5PPn/XLwpCTtBz0nrPdBG03E7/7yIk9yICVpyw31DtD RikEv15XhxKbfjYrmIGLZfD5gHwF/hBD2GSE+SOfEVP6B3liF1hNYbkVsS8dGicpfgez uaMg== 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=0+cb4dzRwfl2iS73R+9CnvmSj7f3LcNePptCghIG6Hg=; b=KN+kQAl+NxmgcUDdsc8tT5P0+8LDRxgpI2pL1PBeS/4h8KS6FJLHMekCwl65y/SDkv DLMxcVH2t2+DgWnwwef4hGVE4sj6nu7+p3gKHUIgjQduSfi4dXiMA3W/48efwT4PFEc2 AJaRdUMmDALCNu12rUdl2fhPmRplctgH8zr/dETqbR/CHzDPDgv1VoK3WISBrzWRtHRY 2dr9QYSyJZEGZIEO7wtcIh2yzPOEjXBzNs3t062ovwT3q5eBBMEUkvYRJ7wmXFBzfKPU 5XbzYgt4gpJdiFG/YdJ4K1Rg0Dish8ycVBxuXWnZNduqC4Cmk+REdFznWCOSPMV9qMgo 4rMQ== X-Gm-Message-State: AA+aEWY1+IKZf6XeudHzblkOsjnkMy150FNsm9niTqc/k+ZvoKh+Auob uQl/B04MbYCfoiQtB85QyV5Ja4jN X-Google-Smtp-Source: AFSGD/XMOslE58KgkNUd+7IO4czWHeN0TvIlCe8VNkt11zUlj9fAdXBXnMN6WK7hRe30vamfOvJWyA== X-Received: by 2002:a1c:7306:: with SMTP id d6mr6486762wmb.98.1544032346413; Wed, 05 Dec 2018 09:52:26 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id y185sm10177604wmg.34.2018.12.05.09.52.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 09:52:25 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Dec 2018 18:52:09 +0100 Message-Id: <20181205175209.26199-4-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181205175209.26199-1-onemda@gmail.com> References: <20181205175209.26199-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 4/4] avformat/mxfenc: allow muxing prores 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" Signed-off-by: Paul B Mahol --- libavformat/mxfenc.c | 49 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 3549b4137d..e481b19ff3 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -146,6 +146,7 @@ enum ULIndex { INDEX_JPEG2000, INDEX_H264, INDEX_S436M, + INDEX_PRORES, }; static const struct { @@ -159,6 +160,7 @@ static const struct { { AV_CODEC_ID_DNXHD, INDEX_DNXHD }, { AV_CODEC_ID_JPEG2000, INDEX_JPEG2000 }, { AV_CODEC_ID_H264, INDEX_H264 }, + { AV_CODEC_ID_PRORES, INDEX_PRORES }, { AV_CODEC_ID_NONE } }; @@ -314,6 +316,11 @@ static const MXFContainerEssenceEntry mxf_essence_container_uls[] = { { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x17,0x01,0x02,0x00 }, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0a,0x04,0x01,0x02,0x02,0x01,0x01,0x5C,0x00 }, mxf_write_s436m_anc_desc }, + // ProRes + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x0d,0x01,0x03,0x01,0x02,0x1c,0x01,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x15,0x01,0x17,0x00 }, + { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x03,0x00 }, + mxf_write_cdci_desc }, { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, @@ -1945,6 +1952,43 @@ static int mxf_write_partition(AVFormatContext *s, int bodysid, return 0; } +static const struct { + int profile; + UID codec_ul; +} mxf_prores_codec_uls[] = { + { FF_PROFILE_PRORES_PROXY, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x01,0x00 } }, + { FF_PROFILE_PRORES_LT, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x02,0x00 } }, + { FF_PROFILE_PRORES_STANDARD, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x03,0x00 } }, + { FF_PROFILE_PRORES_HQ, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x04,0x00 } }, + { FF_PROFILE_PRORES_4444, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x05,0x00 } }, + { FF_PROFILE_PRORES_XQ, { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0d,0x04,0x01,0x02,0x02,0x03,0x06,0x06,0x00 } }, +}; + +static int mxf_parse_prores_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt) +{ + MXFContext *mxf = s->priv_data; + MXFStreamContext *sc = st->priv_data; + int i, profile; + + if (mxf->header_written) + return 1; + + sc->codec_ul = NULL; + profile = st->codecpar->profile; + for (i = 0; i < FF_ARRAY_ELEMS(mxf_prores_codec_uls); i++) { + if (profile == mxf_prores_codec_uls[i].profile) { + sc->codec_ul = &mxf_prores_codec_uls[i].codec_ul; + break; + } + } + if (!sc->codec_ul) + return 0; + + sc->frame_size = pkt->size; + + return 1; +} + static const struct { int cid; UID codec_ul; @@ -2736,6 +2780,11 @@ static int mxf_write_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_ERROR, "could not get dnxhd profile\n"); return -1; } + } else if (st->codecpar->codec_id == AV_CODEC_ID_PRORES) { + if (!mxf_parse_prores_frame(s, st, pkt)) { + av_log(s, AV_LOG_ERROR, "could not get prores profile\n"); + return -1; + } } else if (st->codecpar->codec_id == AV_CODEC_ID_DVVIDEO) { if (!mxf_parse_dv_frame(s, st, pkt)) { av_log(s, AV_LOG_ERROR, "could not get dv profile\n");