From patchwork Thu Sep 21 03:26:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 5209 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp1470789jaa; Wed, 20 Sep 2017 20:30:56 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCOjylI4rZ5uGjG4zVG56h4Pv4/hChj9yGHGEVTNkJ+5Kkq2KhjP2uNV0O5Zhdo+bnmr2A5 X-Received: by 10.223.139.212 with SMTP id w20mr502563wra.275.1505964656247; Wed, 20 Sep 2017 20:30:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505964656; cv=none; d=google.com; s=arc-20160816; b=Hg1d9HamRv8Y88yNBKZiiEybNVcBe9UIomhVYW+DQDez8Yoen3WFWAFplsDL9tW4JI UeIAPFba1fdoo+HJJy5rPObwHbS7ABG3DzqyUYhWup1KcxYGlR/tFNt8Ty/hCq6dWbcZ F3H5TJ8F+4v4vqNkE8YsUtHI8il1dURYrp+P5TvdPug2UxR2haaXTSJU6rUPRzJfl7XO KPipD629MyP98q5EDPB6wGW9BeyrdtJ3f2CiyzjqUcrT5PK8nETP/Gzh55tagjlhlMYk VV5o8GeTQYUKvAuC8RyFRdT8vmceuKesgb4cp9jAdydCHs2ZIuF8pmLxfHSIxi8XCQ9x 8j1w== 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:delivered-to :arc-authentication-results; bh=1ak+lDCaRd4j3/rlKFmfY7oMoE8lLqliYJmbJLbyook=; b=B3jUSRmooZTaapnANnRC3cBHUn4BjYk+Js3QkmoyAqOgeuHimX0jnqk0uurkZUfDj1 IZPXBDPKFsZMyUDAcgzqiQbSspRlFDF0vsCqIbCfhsieBQGs3m2c9m75SxN9HZj6+CcO G6jTUn+xxsP8z624H9ORgBmyt95Xs/YoqMxyvWEv+59B63BdWItZ7GacCkqdMbSHIR43 DjN5bzVMdWuWNchlTAUaCOmm6mWIbo1JTZLpJFmRuLKTIfgd8c8KlMODivQk9xvqyx7H G1VJtkNy0TNIK4HXq8c1tyOQmophNE/EVGBOFYkx0t9XNYZY62/Xn58IvgomBpoK1gwY P9jQ== 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 135si521892wmu.277.2017.09.20.20.30.55; Wed, 20 Sep 2017 20:30:56 -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 81EA568035C; Thu, 21 Sep 2017 06:30:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ABE27680352 for ; Thu, 21 Sep 2017 06:30:37 +0300 (EEST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP; 20 Sep 2017 20:30:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.42,423,1500966000"; d="scan'208"; a="1016827588" Received: from bluekbl.sh.intel.com (HELO localhost.localdomain) ([10.239.159.160]) by orsmga003.jf.intel.com with ESMTP; 20 Sep 2017 20:30:41 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 21 Sep 2017 11:26:09 +0800 Message-Id: <20170921032609.26242-1-zhong.li@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [FFmpeg-devel] [PATCH] mpeg2_hwaccel: always submit twice for a frame with two fileds. 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: Zhong Li , sw@jkqxz.net, jun.zhao@intel.com, nfxjfg@googlemail.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Though this patch to fix https://trac.ffmpeg.org/ticket/6668, and allows to set the slice_flags option to decoder, I belive it is unnecessary to set SLICE_FLAG_ALLOW_FIELD flag to other hwaccels(dxva, vdpau, etc). Signed-off-by: Zhong Li --- libavcodec/mpeg12dec.c | 3 +-- libavcodec/options_table.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 22c29c1505..701845a46c 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1689,8 +1689,7 @@ static int mpeg_field_start(MpegEncContext *s, const uint8_t *buf, int buf_size) return AVERROR_INVALIDDATA; } - if (s->avctx->hwaccel && - (s->avctx->slice_flags & SLICE_FLAG_ALLOW_FIELD)) { + if (s->avctx->hwaccel) { if ((ret = s->avctx->hwaccel->end_frame(s->avctx)) < 0) { av_log(avctx, AV_LOG_ERROR, "hardware accelerator failed to decode first field\n"); diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 12712fb541..5b9e344554 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -340,7 +340,7 @@ static const AVOption avcodec_options[] = { #if FF_API_PRIVATE_OPT {"context", "context model", OFFSET(context_model), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|E}, #endif -{"slice_flags", NULL, OFFSET(slice_flags), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, +{"slice_flags", NULL, OFFSET(slice_flags), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|D}, #if FF_API_XVMC {"xvmc_acceleration", NULL, OFFSET(xvmc_acceleration), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX}, #endif /* FF_API_XVMC */