From patchwork Sat Nov 9 23:46:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baptiste Coudurier X-Patchwork-Id: 16186 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 F2F17449C09 for ; Sun, 10 Nov 2019 01:55:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CCAD768AB7A; Sun, 10 Nov 2019 01:55:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D7F268AAEC for ; Sun, 10 Nov 2019 01:55:23 +0200 (EET) Received: by mail-pf1-f195.google.com with SMTP id x28so7629253pfo.6 for ; Sat, 09 Nov 2019 15:55:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ajNRut4oQmjNuBcy3wERo3tSKhg8TIJfYwu4AfjPV5I=; b=LP0BjrMb6HmXHrmJcGIsjKCUl4xxosBN5FxecogC+Oq5hxlrOp1OxMN1xNcJsmm6Sr NF1sklP5iZrr16T41ffUNlmxYp0Fa7PXcVu5j6zhgt3WOa7o0NTBtBWzaOaC70PEbDGd AjYj8Yu/4CasaokiGH1EgqGOHD24XI38Q0fGhUx4uhn5bDNwrI/m4HRpClmODkeAc5kJ BFiTEi5yT1tPhe92Pcb/Hb6beIE0YH/EBmdTR+XDDsja/3MJp9sEyPdqO1lyrT3qS8Dh 0sdmO5RlGAWc7vLITgDWWSqacmPkptzXlL8hrgBSKIkAYEljxgP4WuhshEyWP5vAiBR+ Yh1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ajNRut4oQmjNuBcy3wERo3tSKhg8TIJfYwu4AfjPV5I=; b=McVLP98c+xnDa4tvltT9PHBd7FhUKBbqmXHGv9Zp8gFzrIyAjVXDWG/1aItyYMK30q Hub4Pki+Sr7NYBHAkv/uQ3wuo1ruIKFh50pwF73sbqe0uDWSxCzScXS83Hj9pDtVh7QY J42bQw/EmmtGH43UOcUU5nZeQHIP+ODEqRB7Gfj9QNVkYTRsGu4LIOllatCNg0yrmu0H IL+qUxmROtiokdVQuqCE6Qk4v0uDSADV//SHyALLjDvCF4NxEIRmy/0JFXZiz9oUoFWi IcclNik0n5g8xv3KXTsuth7kLT/qf3KVSgttzH72+1WfJ4t8LCwt50BPtl0UGpel4wmp pwwg== X-Gm-Message-State: APjAAAUoi71aDfx2Cp8TF6iuIQUR8cEdx0eoY3/SvYp2p561n8u3+Xtg vqxKGH/UkK893iXtaY6Xtu4Rg9G3 X-Google-Smtp-Source: APXvYqzs/74H7EYLXBxAQX39208gFFl8XcDlEb/2vpHlA+ATLvH8fB2vtKFmBNHTRt/zkk337+Milg== X-Received: by 2002:a17:90a:be05:: with SMTP id a5mr764531pjs.73.1573343215466; Sat, 09 Nov 2019 15:46:55 -0800 (PST) Received: from baptiste.quibi.com (cpe-104-173-251-254.socal.res.rr.com. [104.173.251.254]) by smtp.gmail.com with ESMTPSA id g11sm1988978pjv.8.2019.11.09.15.46.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Nov 2019 15:46:55 -0800 (PST) From: Baptiste Coudurier To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Nov 2019 15:46:52 -0800 Message-Id: <20191109234652.16763-1-baptiste.coudurier@gmail.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mxfenc: correctly set width values for dvcprohd 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 Cc: Baptiste Coudurier Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/mxfenc.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index b7ae5cc637..f7df9c3daf 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1092,7 +1092,7 @@ static int64_t mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID { MXFStreamContext *sc = st->priv_data; AVIOContext *pb = s->pb; - int stored_width = (st->codecpar->width +15)/16*16; + int stored_width = 0; int stored_height = (st->codecpar->height+15)/16*16; int display_height; int f1, f2; @@ -1101,6 +1101,15 @@ static int64_t mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID get_trc(transfer_ul, st->codecpar->color_trc); + if (st->codecpar->codec_id == AV_CODEC_ID_DVVIDEO) { + if (st->codecpar->height == 1080) + stored_width = 1920; + else if (st->codecpar->height == 720) + stored_width = 1280; + } + if (!stored_width) + stored_width = (st->codecpar->width+15)/16*16; + mxf_write_local_tag(pb, 4, 0x3203); avio_wb32(pb, stored_width); @@ -1123,7 +1132,7 @@ static int64_t mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID //Sampled width mxf_write_local_tag(pb, 4, 0x3205); - avio_wb32(pb, st->codecpar->width); + avio_wb32(pb, stored_width); //Samples height mxf_write_local_tag(pb, 4, 0x3204); @@ -1138,7 +1147,7 @@ static int64_t mxf_write_cdci_common(AVFormatContext *s, AVStream *st, const UID avio_wb32(pb, 0); mxf_write_local_tag(pb, 4, 0x3209); - avio_wb32(pb, st->codecpar->width); + avio_wb32(pb, stored_width); if (st->codecpar->height == 608) // PAL + VBI display_height = 576;