From patchwork Mon Oct 2 10:38:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 5375 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.61.8 with SMTP id n8csp1362200jan; Mon, 2 Oct 2017 03:38:48 -0700 (PDT) X-Google-Smtp-Source: AOwi7QC6wVmPASyTG7LA5BehQcs4dAoR97q6YZ5rSr6UhrFwZXoYAoAYzKLzRsE1lsiPazEXdbef X-Received: by 10.223.134.248 with SMTP id 53mr15481202wry.57.1506940728246; Mon, 02 Oct 2017 03:38:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506940728; cv=none; d=google.com; s=arc-20160816; b=xAat3CXy+o+SPqPGvtGsm8/Gw3zFHOmvJwJWc2SyjQv7UzJPo5igIF1E4jY5Z6eN87 +eQP9jLeu22inf7y2E6XjqCS7A7lWpcnDdco8OArqBnea0X7SCn2mcPS5q+fes9LCj2D dnuRdvLPNXonj/WdRCnwBuaYQIrPRTMwOYmPGh+a8knGgOZYUXNuVBQoXxSB1zzE46wy R+wnHbr1eZcC6Wm1F5MyNv5L6oOdrP9XRpMgKf9d9dQMAVWALyOs6rwJ7NHoedgd1mHf 5AlEYnqnGKp/0DeEXEtH5EyeN93S3FN6DBHhLnIAX/mz0te8nTUMCPGO6fNOcRXwdMK5 OQkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:delivered-to:arc-authentication-results; bh=spcsmYfhRBCf45rPQGGSkOY19+Hktulrwq1V/M02A+o=; b=gngJ0mVenAmEfoBnsNqStmj28KpSqyaHsb74vZo9q710LH+3ImElXQU4hzEyHT4BeX qWwkLVUzMYB1qn2qm17s2WrAWVtQcox2lmH1eosXXLSPy38wzdUOcJXaL3djUF++p5il bfN+cnkAy8rOlfaZbph8DmUUxKKBAnrFcbohgcTqCtPiPG4EYOqv5BOeYCYSDgnWtmh+ 5yrWr7ux1N8WiabzcqyuA8USRbdPTGCkUy2gxb5BxevIHWu0+mu4MyX+OTFID/K+tc6j pr+K6tck7eUcTO0GrS5VmBpvvnf7F9c2mbzQCNIbkztcY9rMxEarlk8mItfUyQY72C1x L8NA== 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 z9si2747322wre.258.2017.10.02.03.38.47; Mon, 02 Oct 2017 03:38: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; 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 74684689DE1; Mon, 2 Oct 2017 13:38:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-1.mx.upcmail.net (vie01a-dmta-pe05-1.mx.upcmail.net [84.116.36.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3786F689B96 for ; Mon, 2 Oct 2017 13:38:18 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dyy7M-0006ye-DT for ffmpeg-devel@ffmpeg.org; Mon, 02 Oct 2017 12:38:32 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id GaeX1w00t0S5wYM01aeYT1; Mon, 02 Oct 2017 12:38:32 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 2 Oct 2017 12:38:29 +0200 Message-Id: <20171002103829.28866-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171002103829.28866-1-michael@niedermayer.cc> References: <20171002103829.28866-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mxfenc: Fix labels for IEC PAL DV 420 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" --- libavformat/mxfenc.c | 9 +++++++++ tests/ref/lavf/mxf_dv25 | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index 3da96bf919..035e65ed43 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -48,6 +48,7 @@ #include "libavutil/time_internal.h" #include "libavcodec/bytestream.h" #include "libavcodec/dnxhddata.h" +#include "libavcodec/dv_profile.h" #include "libavcodec/h264.h" #include "libavcodec/internal.h" #include "audiointerleave.h" @@ -1812,6 +1813,7 @@ static int mxf_parse_dv_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt) MXFStreamContext *sc = st->priv_data; uint8_t *vs_pack, *vsc_pack; int i, ul_index, frame_size, stype, pal; + const AVDVProfile *profile; if (mxf->header_written) return 1; @@ -1820,6 +1822,8 @@ static int mxf_parse_dv_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt) if (pkt->size < 120000) return -1; + profile = av_dv_frame_profile(NULL, pkt->data, pkt->size); + vs_pack = pkt->data + 80*5 + 48; vsc_pack = pkt->data + 80*5 + 53; stype = vs_pack[3] & 0x1f; @@ -1854,6 +1858,11 @@ static int mxf_parse_dv_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt) frame_size = pal ? 288000 : 240000; break; default: // DV25 + if (profile && profile->pix_fmt == AV_PIX_FMT_YUV420P && pal) { + ul_index = INDEX_DV25_525_60_IEC + pal; + frame_size = pal ? 144000 : 120000; + break; + } ul_index = INDEX_DV25_525_60 + pal; frame_size = pal ? 144000 : 120000; } diff --git a/tests/ref/lavf/mxf_dv25 b/tests/ref/lavf/mxf_dv25 index adecc07e70..85094828d1 100644 --- a/tests/ref/lavf/mxf_dv25 +++ b/tests/ref/lavf/mxf_dv25 @@ -1,3 +1,3 @@ -de98603ecc27c2f3cefd192d4820d3f4 *./tests/data/lavf/lavf.mxf_dv25 +1871bd11947924116776201f24fd0adf *./tests/data/lavf/lavf.mxf_dv25 3833389 ./tests/data/lavf/lavf.mxf_dv25 ./tests/data/lavf/lavf.mxf_dv25 CRC=0xbdaf7f52