From patchwork Tue Jun 7 07:08:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 36084 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp6703367pzj; Tue, 7 Jun 2022 00:16:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJvC+ZWO4qK/14AFOG09Qu9knc19sK7Yz052fUKFeBaKtpRGm13AuOuAIShon5uCXGu0NC X-Received: by 2002:a05:6402:f:b0:42e:561:a1c0 with SMTP id d15-20020a056402000f00b0042e0561a1c0mr31971025edu.309.1654586167410; Tue, 07 Jun 2022 00:16:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654586167; cv=none; d=google.com; s=arc-20160816; b=Y1Q6uxel2sM+oFzJiuRMjDhttuUPlQol4IHENCSu0E+fWdutAPvvPvOWNy8B7KCc4T BRHNb3AyYtvuErUCWO2/fpGsdsU455j/qffRCy8OCbc9CU5J6n5wvlEwhZO5Dy8zOvU7 xdZg+4mKTIY87VbA1dg02XsO+Mr/HkviRzEj2njdjNrMcpljqOdPckH70qg7jjngS5KW laXBkLKVRAovaadTVIAT8hSZCoIHsc+zWQ405tMiL2gwLWAY7jA+1LcU81bGQqyo30ek ZSVvYbcvfQndYGMlRBY0RzG+nJ+s4DKx5gstSL1f3n9l0HBla/UI0MqeoZYFFQw/OtwR wAgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=bp4Ct9aqTs/zdLEot0OIroNrETDduwmwo1Ml8UDOUGE=; b=RrTbiGKXfEG8U1m/9uC5VTR5+6v9dSNAdWH4hhmEaD9O6T9ovhiTtJG3wap1CmBB9N 9dswI//ZIm1ijb5tr4QTG8BZPmMzlSJOVOMlfQnvToTG0j9zdWEbUc0DpC16+Yp+g+K0 8qu/vq+xFm8HIdJwNkQMFCh1Kcc3LqT/8uUlB4tk+iVdX/LriMNe1lrWxTkx3D9YdB84 XWcq7jerk3CDIhhOvWwQuWV+ivm408pyCIOe4nPdsKiMvtbMOMbzIm5OxprmwoMQj6fK aU4B772mMSIwqavEkIewzxfR7Ozl+c76iHx6Jxi5x1lzdVR439F8J2dzBZy6TfQ769Lh v0hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=bApO5Ak8; 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 hg3-20020a1709072cc300b006ff05f85ac7si14979700ejc.381.2022.06.07.00.16.07; Tue, 07 Jun 2022 00:16:07 -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=@intel.com header.s=Intel header.b=bApO5Ak8; 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 3EE9068B61A; Tue, 7 Jun 2022 10:15:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A582368B5BA for ; Tue, 7 Jun 2022 10:15:30 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1654586135; x=1686122135; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zrfoRLnOLbzuKy/UCGBhe1ch8MZKZ3opJz0TucHgacQ=; b=bApO5Ak8xtfprbfkWXByJcnOYAZ2N8hAADq+sFBMJ/4Iof/DxipOfPaq qw0axfj13iUmcGIRTsJsqfgigy5+K1yJvWOQh2OpKQN+7qbfB1SNfD9J5 Uc1rhUo+Gv+mhWAe59Z0ImEYQhc5dPw6jmiUedSQqLvDvL3r+45kT/mK1 6nedg1xiBYJUebgRDrtBu9WOCSVogLHIIpv5zTFkNvM66yjoyinUClxel 8EoAznjkuvt8KJlV4NpZQzFILHXmTVZ1WloCsqSrL8ULs4voCXYmeiSYt +YNaZw5mxiJ0CJ9ECtM1uRfue2hpiu36Xt9RvZd1McLAgymJaQcxKtKzv g==; X-IronPort-AV: E=McAfee;i="6400,9594,10370"; a="337975057" X-IronPort-AV: E=Sophos;i="5.91,283,1647327600"; d="scan'208";a="337975057" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Jun 2022 00:15:22 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,283,1647327600"; d="scan'208";a="635988953" Received: from t.sh.intel.com ([10.239.159.147]) by fmsmga008.fm.intel.com with ESMTP; 07 Jun 2022 00:15:21 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Jun 2022 15:08:30 +0800 Message-Id: <20220607070830.2654218-4-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220607070830.2654218-1-fei.w.wang@intel.com> References: <20220607070830.2654218-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 4/4] lavc/hevcdec: respect the value of no_output_of_prior_pics_flag X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Xu Guangxin , Fei Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rEfNMUOGd60q From: Xu Guangxin Even resolution or number of picture stores changes, we still need follow no_output_of_prior_pics_flag in next IDR. Tested-by: Fei Wang Signed-off-by: Xu Guangxin --- libavcodec/hevcdec.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 99785aa5d1..b0317339a2 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -594,15 +594,8 @@ static int hls_slice_header(HEVCContext *s) if (s->ps.sps != (HEVCSPS*)s->ps.sps_list[s->ps.pps->sps_id]->data) { const HEVCSPS *sps = (HEVCSPS*)s->ps.sps_list[s->ps.pps->sps_id]->data; - const HEVCSPS *last_sps = s->ps.sps; enum AVPixelFormat pix_fmt; - if (last_sps && IS_IRAP(s) && s->nal_unit_type != HEVC_NAL_CRA_NUT) { - if (sps->width != last_sps->width || sps->height != last_sps->height || - sps->temporal_layer[sps->max_sub_layers - 1].max_dec_pic_buffering != - last_sps->temporal_layer[last_sps->max_sub_layers - 1].max_dec_pic_buffering) - sh->no_output_of_prior_pics_flag = 0; - } ff_hevc_clear_refs(s); ret = set_sps(s, sps, sps->pix_fmt);