From patchwork Wed Sep 11 19:30:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baptiste Coudurier X-Patchwork-Id: 15031 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 84B6744A486 for ; Wed, 11 Sep 2019 22:30:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6B76C687F68; Wed, 11 Sep 2019 22:30:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8476B6805FB for ; Wed, 11 Sep 2019 22:30:52 +0300 (EEST) Received: by mail-pg1-f170.google.com with SMTP id n4so12048976pgv.2 for ; Wed, 11 Sep 2019 12:30:52 -0700 (PDT) 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=Yoi0wSGrpUJVFCsgc3woiK+CfnZk/5MP7o2c4ECKN5o=; b=eEGuoNPCl4lyimR03Is1vgluXSnSPoV0CiSpJncWtXjhIpC7ju8TACgtYZV+ys3beP 8FclCqIWZT8LTdz+F+9jOr1inMFGiCJk9LndddYsxcVqWrTiE/mkFsAr2jWxledj1vbZ +wWglfC4mYn73rLdUeMmcvoE4v+3fjmm8MRiK+ZfpIgaPnNhCuJTbwVs2+MGE0+3u31d ZUoG/ABQhPNUzefF0HHB83fSzJ0DnXzzbaeJ/Rn5839J7u+gex7c3sTTI0CkEdcWeTKW UNKqQ+O7OFu6j5sfrXOeaayu7xVP1pfHhUzITy+u/U5Y0Zg0uf47iGZRn+YaCLdBDrDT f1lg== 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=Yoi0wSGrpUJVFCsgc3woiK+CfnZk/5MP7o2c4ECKN5o=; b=QyJ5LJvqD1IoJzPdd62l5dRFj3re05UR51MF/7GxKEwXMilogSQpPunBTSSE92q/g1 Ua1vUFNgPjolUyaw4pgiM1n62+X/KVYkK7nJiEVqOITKQlnL47TEBYuOQsne+5OcIK8J Abe/FJ1YYSZQIMdnJZ34CVb8WeWVxpJakG5aRGKl/D1YhxKMOnqquSJZutvWAN63EM4j z6VkZ2zvGP2qVm/8DnKtyyjAlA6SPcw121F/VaQDaybiUx3wQGonWslRrxMoQvz21vLB QGwNScwLxNvxYwDsf5eaCVZu7sMgTNZGgmEAAF3PlgAb97mRX5Va7ALykhk6DT2Q8XCY Zrqw== X-Gm-Message-State: APjAAAVvQM7/30k6DkfU+xaA2gtmfnAmTXlArFJaPb9dFS8ZNBT7LMJF 9n7Mlm1suxI6j/e/JG6X3SnDtmJR X-Google-Smtp-Source: APXvYqxzw+pbIQs4rpUt9hJHDDWvS9bkkqjgzpYz1gJm7lGTq4lwn5CFk/dTTKwNVkLGOLl5I09asg== X-Received: by 2002:a62:4d45:: with SMTP id a66mr41614982pfb.24.1568230250809; Wed, 11 Sep 2019 12:30:50 -0700 (PDT) Received: from baptiste.quibi.com ([64.124.32.234]) by smtp.gmail.com with ESMTPSA id i5sm8887641pfo.98.2019.09.11.12.30.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Sep 2019 12:30:50 -0700 (PDT) From: Baptiste Coudurier To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Sep 2019 12:30:48 -0700 Message-Id: <20190911193048.34851-1-baptiste.coudurier@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/dvdec: correctly set interlaced and tff 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" --- libavcodec/dvdec.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index 4345cd9e29..cfa0fb9905 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -592,12 +592,19 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, void *data, if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) return ret; - frame.f->interlaced_frame = 1; - frame.f->top_field_first = 0; /* Determine the codec's field order from the packet */ if ( *vsc_pack == dv_video_control ) { - frame.f->top_field_first = !(vsc_pack[3] & 0x40); + if (avctx->height == 720) { + frame.f->interlaced_frame = 0; + frame.f->top_field_first = 0; + } else if (avctx->height == 1080) { + frame.f->interlaced_frame = 1; + frame.f->top_field_first = (vsc_pack[3] & 0x40) == 0x40; + } else { + frame.f->interlaced_frame = (vsc_pack[3] & 0x10) == 0x10; + frame.f->top_field_first = !(vsc_pack[3] & 0x40); + } } s->buf = buf;