From patchwork Mon Sep 17 11:21:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 10342 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp3414312jap; Mon, 17 Sep 2018 04:21:59 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdaqhf/lD3sED/0r2QLkmm8nTxCJ46gvSht0Ku+UzNaACHadETyF8OfwOqY76kFwmXYzQToF X-Received: by 2002:a1c:6854:: with SMTP id d81-v6mr10061506wmc.160.1537183319767; Mon, 17 Sep 2018 04:21:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537183319; cv=none; d=google.com; s=arc-20160816; b=jrQPtJPGnOGx4pjiDI0MO4er965BW3X2LDIrunIYn5mkQn2IJTPKpPCculClyTPmnZ m6oNmuZ6yqyuKx7JL+vbQLU8MD/4uJZysBAOBzv7rVOlbskdOXQlkt9CPK/9UfaOTwDD zl0oFqfGHjXyHnnwk20jUugQdI0u7HNQLDgcNI+RrUeFnUNC428HbdO+WqCxqVnCfFmL 571zk4TdLto3S/I2CcFvwwWP3ZFq88a1o5KSj/RRZpTecSIDkCt1N7eNZM0M7L2NGgu4 EoSui4j9oSMT19H8FZBMfUo+ZREdcjBc8mVAETI2ry9XaCcLBiMzSXkgMm6Y3dNenN5W Mg0A== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=GZj0AJjjydjpnd2PR0cJ0RR6uWnsVrBzMhSnv8NOQuQ=; b=hca1xt2VJJ6Cs96nmPxlU4cx1m0izUdULpqWjyo6o210JNMwXmY0Wc7fEP0vB3V3gW 99hBDOmA9lx3kE0YaQ3nhQDuQd3awhm22oQcCn8ActcWVlGaRn09MRLDOgNHfqCPPJEo 18bIovAnFNjKFgCVVRWEcDKg1jnY1Zmjd+AW47ma0LsW1Cf6I7KBuDIhtX5gT7uoD3hY 9JC3r5yBO0VrzIWYnDXxUciOzEqH9DkYUanhkU47/5hdo8M/p7WJ6T+bmSQ3pNYutRaB QKFw4jd5Tudx01cqLhjZmuaCah7tN542/pr7zTR+JuV89FdvNSS1MlziqoYK/5DkDGD1 tU4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="O/fNXB0A"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f10-v6si6710724wmg.24.2018.09.17.04.21.59; Mon, 17 Sep 2018 04:21:59 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b="O/fNXB0A"; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0FABD68A718; Mon, 17 Sep 2018 14:21:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5E10D68A6EB for ; Mon, 17 Sep 2018 14:21:38 +0300 (EEST) Received: by mail-pf1-f180.google.com with SMTP id x17-v6so7421952pfh.5 for ; Mon, 17 Sep 2018 04:21:50 -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; bh=evowQyhfId81wbb7f7Mwuw8zVmpifx63XPLvJ6uLaxs=; b=O/fNXB0AzNoA+Mw1/NPlG2r73bKiNDX6Wv+CvXk7Vv91cb+FgPvs+wZ0lY/rbZ21IL 5z5BCX/rJrr+mdjYJQUB0LIc1cqC7kwZyLG4lw4wOXshv6LbkUvz15oUXgoe7IKw1o6q cJ9lQ9LvX41LiMfnTvbj4Pvzx3hL9pjIidt2J+tUusD+4HkUebE5Ir6DgBypo6VudPdK lOCZoePBdcY7LTCegx0az+XXgON+uRLtA+4J8Hhu2Yq7Dz/aFgprqENDSqokD77QzYj2 wZIEYa/tROuAFtyAIoBmao97qZAmvB7A1hf+dwmff25P34NE0DuTWDqBv2z00ZuBsQ2J 2ONw== 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; bh=evowQyhfId81wbb7f7Mwuw8zVmpifx63XPLvJ6uLaxs=; b=szPcCcn3yeQJGQ377IZ9fEVjI6p0BRdJihKC2CVSaVaoGvFBKdPpExBIYcYE1Ur0hW IocuLA1BlQhwf68t8F8WC21K1rYf3Nbe/UIRI4rUqMrgw82+aPyaLQI9BX1IfRndgvov X4Aufkvlqd39zdCPfbYwr//dCCZ9jNylbrWQyBnDuWS5jLUdqITRbtbiGvrjnjYn4O/R tyirD/GHFu1ykjHA9OPhl593nuwcQaqI7wWpumqZ5KAgxDC8W5xgSpRKtCldE5gTnuh2 kAaNX50/41+5TrOe3hYplYys4pERCQS9xGUgghyY3Y5bTptV7PjyP4PUYNDGhXPnW27w NA8Q== X-Gm-Message-State: APzg51CraenSoGHPRfdJM87CDwE9QUowouR50XKgNRDKZopf+G/kv7fI 3IHIlhN27+h9/h7mwy3aC2SOf1hw X-Received: by 2002:a62:2c53:: with SMTP id s80-v6mr25101548pfs.154.1537183308823; Mon, 17 Sep 2018 04:21:48 -0700 (PDT) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id j16-v6sm28923546pfk.125.2018.09.17.04.21.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Sep 2018 04:21:47 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Sep 2018 19:21:31 +0800 Message-Id: <1537183291-992-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH] lavc/mpeg2dec: fix MPEG2 VA-API interlace decoding issue. 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: "Dong, Jerry" , Jun Zhao MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jun Zhao For interlaced frame, it has to call slice_end() for both fields. And VASliceParameterBufferMPEG2::slice_vertical_position is supposed to be the position in the picture but not field in this case. Signed-off-by: Dong, Jerry Signed-off-by: Jun Zhao --- libavcodec/mpeg12dec.c | 9 +++++++++ libavcodec/vaapi_mpeg2.c | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 83e5378..c21f133 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -2546,6 +2546,15 @@ static int decode_chunks(AVCodecContext *avctx, AVFrame *picture, s2->er.error_count += s2->thread_context[i]->er.error_count; s->slice_count = 0; } + + if (s2->first_field) { + /* slice ends for the first field */ + ret = slice_end(avctx, picture); + av_assert1(ret == 0); + if (ret < 0) + return ret; + } + if (last_code == 0 || last_code == SLICE_MIN_START_CODE) { ret = mpeg_decode_postinit(avctx); if (ret < 0) { diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c index aaed434..b159f49 100644 --- a/libavcodec/vaapi_mpeg2.c +++ b/libavcodec/vaapi_mpeg2.c @@ -156,7 +156,7 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer .slice_data_flag = VA_SLICE_DATA_FLAG_ALL, .macroblock_offset = macroblock_offset, .slice_horizontal_position = s->mb_x, - .slice_vertical_position = s->mb_y >> (s->picture_structure != PICT_FRAME), + .slice_vertical_position = s->mb_y, .quantiser_scale_code = quantiser_scale_code, .intra_slice_flag = intra_slice_flag, };