From patchwork Thu Apr 18 08:15:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 48126 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ce4e:b0:1a9:af23:56c1 with SMTP id id14csp1533086pzb; Thu, 18 Apr 2024 01:15:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWSn1eHPCEWquF6XTsOaVqSrl4Dxys8ZCsSdjSqERi62JMHECteFBUBrr4jHqqRY0OFhr3xWOHEODA24qKZIKr8xyi45FMdn6yqtw== X-Google-Smtp-Source: AGHT+IHyyUKQhKdAzPuEr55lKvfbdxLNkKNWONWVh0z3ZNP4l5urYN0KfuTlUUg7NcLIYXstC/3F X-Received: by 2002:a2e:8608:0:b0:2d6:8868:f1a6 with SMTP id a8-20020a2e8608000000b002d68868f1a6mr1297809lji.43.1713428105101; Thu, 18 Apr 2024 01:15:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1713428105; cv=none; d=google.com; s=arc-20160816; b=s2HKR1FtMmM7lpyOjZKifSsN+cn5n/0YSuuANCS5voIuO/1Hx/PBvELiU6nionJsYc F/NYtqsihYR0t4ZmHrOAuiZj0HSxEjdlcgyKAswXoz1egoWsbxiyAxkUxHIgvHiUMAND 6zTw450/jN2W2wDoOD483GYZPO9s1ZqEIDrjT4ueEmz2vHV4v3KmCr85+ofwi6acgQyt pw6FvNGVericoG/LyRhb/CmXzzOP8SFFPHbxrTrq2TZ1hCduvaGL29ziM+XH3dq8yKkq cTyxU2kwssDr6AroD4p7QTkaSTzuJS6ONLTyy6EWF6LCQvGiDNXqopXMPrsHgGiZ6HUF xtjw== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=2NrFt8URV0jWvqp6H71Ds207qF/DauWzKUSGu+yBtJc=; fh=i4ESP4ZRFDcfYfwXKWpOXjc2YhmIGuOsCfZUnwNO0gc=; b=kv1MCuaefgKmc03jwO1qs/evqCmWD/ck4dadyS/OHD25oIj+yrzAEsIau0zgynTDCJ 8p8pzdspoA/erfIy8z9Uvmv++LdjEx60VzXsjsLPVILT3Q4olZm3sYu+a7ChlCn1yy9w NJ4jnPo/zQ+KdKZ3jMUbcipFRoq4S6k4JRPzQA3UC8Vj9OhL828UULyHfOwyPSeVkOsV x0UyB7e5t7iOmcAeJgsjCM1uIeooq5+z1g1Xtd4JU4Q6vJRAZJmQHoFDlAEGXka7I399 QtjWsgT+lsMC5CWvz5EZxx4aH6ZFeGmEwqe/GAqfEtq5I505ihsanbXjCIOzaKwSyYHE DVJQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=J0XS5tHK; 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 r9-20020a1709060d4900b00a52264031e5si543361ejh.169.2024.04.18.01.15.04; Thu, 18 Apr 2024 01:15:05 -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=J0XS5tHK; 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 1670B68D3F8; Thu, 18 Apr 2024 11:15:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C44B168CF80 for ; Thu, 18 Apr 2024 11:14:53 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713428100; x=1744964100; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=JTypZZyLHVjh26CH54TyhNZExSiaKxkXzVcZSaWQeJg=; b=J0XS5tHKTaHW3IzZU14zUJvZ9Oz9HvVwD7BeopRb0yn4O47pNGqAxhty 0O1GOoNS5jMFkPV3Y68wKRDRKDJcRSOomZaLpMkN8kGpMCRC08sbDkNbs q/w3NMHgcH4KLZ5m/rgicawP8cRbD7w003BA/4xHUtl5EAlB9lieyKn0u 4SM5dM43t32mHLq4+fP7KnoLo0xsynzub3gQfiwgncoBcxbmwqaXYwjr6 Kl/RyXe69cQpON5q72PMI9mXK1ob1Ob+tDqN5rNVD6MkOy7GWvSRIdBrp 4BqE97FisXi00Pjyo0uTchUuUhk4ah6uu3DocTIJ1Kl4rgqBePEMzvvSi Q==; X-CSE-ConnectionGUID: 7iYczVAiSYi6lWmsIg/Tpw== X-CSE-MsgGUID: MnD7D9LeTC+UwDUFixgRhQ== X-IronPort-AV: E=McAfee;i="6600,9927,11047"; a="8794489" X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="8794489" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa112.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Apr 2024 01:14:52 -0700 X-CSE-ConnectionGUID: G0E2KwyITZKNjQmR03jUZQ== X-CSE-MsgGUID: 4KTSHKXbSdqcpAJP0vD+9A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="22987196" Received: from unknown (HELO t-dg2.sh.intel.com) ([10.239.159.57]) by fmviesa009.fm.intel.com with ESMTP; 18 Apr 2024 01:14:50 -0700 From: fei.w.wang-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Apr 2024 16:15:09 +0800 Message-Id: <20240418081509.560476-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1] lavc/qsvdec: Use FFmpeg default 1/25 framerate if can't derive it from bitstream 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: fei.w.wang@intel.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: FN45lsn39OfK From: Fei Wang Fix error: $ ffmpeg -hwaccel qsv -i input.h265 -f null - ... [null @ 0x55da1a629200] Application provided invalid, non monotonically increasing dts to muxer in stream 0: 3 >= 3 Signed-off-by: Fei Wang --- libavcodec/qsvdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c index fd9267c6f4..218ca59e08 100644 --- a/libavcodec/qsvdec.c +++ b/libavcodec/qsvdec.c @@ -440,6 +440,11 @@ static int qsv_decode_header(AVCodecContext *avctx, QSVContext *q, param->ExtParam = q->ext_buffers; param->NumExtParam = q->nb_ext_buffers; + if (param->mfx.FrameInfo.FrameRateExtN == 0 || param->mfx.FrameInfo.FrameRateExtD == 0) { + param->mfx.FrameInfo.FrameRateExtN = 25; + param->mfx.FrameInfo.FrameRateExtD = 1; + } + #if QSV_VERSION_ATLEAST(1, 34) if (QSV_RUNTIME_VERSION_ATLEAST(q->ver, 1, 34) && avctx->codec_id == AV_CODEC_ID_AV1) param->mfx.FilmGrain = (avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) ? 0 : param->mfx.FilmGrain;