From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DFC1C45436 for ; Fri, 31 Mar 2023 11:54:22 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D27768C25B; Fri, 31 Mar 2023 14:54:20 +0300 (EEST) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63ECE68C210 for ; Fri, 31 Mar 2023 14:54:14 +0300 (EEST) Received: by mail-pj1-f54.google.com with SMTP id j13so20182393pjd.1 for ; Fri, 31 Mar 2023 04:54:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680263652; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=1kT/AY4d7wDgKzq9o6AJ2HECBfwF5BRfjilu2dn+wB0=; b=hwxdVLxnN72T/wjExD8fvLAkZ4mcFLKcgeXSVT/EyZVs4/aH0OXmalx3sWIIX0Ttfe jZef2UTLgohmziM3phxhS48aoffWaYd6+ZPD4TnJdC3CspKxUQPF8/DCznpjH0VIXMuY l7eHzcYVfqDY2tZjTFTnA6Dy1B21KUtlPoCyeNFjKAgv6nMTLJIU0E6ZAugWNJGkSMGI VEBQVfASalggwZgSS0Vw+4bRDfxfLZE/J38C5EdvOMlZA24OlJAp85Ihj3PfqNRrV2hU sEYgiLf+4TK7zYOxSHhijLiVcL0FBQ7mwXxlxy1Q51C8vkCm+Po/nTg868NfJJoYUAHT GNTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680263652; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1kT/AY4d7wDgKzq9o6AJ2HECBfwF5BRfjilu2dn+wB0=; b=SsvDc62z/qtqE++s/KIPOqiD/geN/rq15CtOwW3gUi1T9R7x3Fr3susz0Ym5PcjOVw vzhF/u86je/34pi53agnTARgQP0tSH+mQlw4Yi2dhazmL9nYxoCWaZc/YMAbgPVcxXhe QWe1XFo1e6kK6vkCL+fmujpvLKk0mmVY/Lj0bIGL4ForBENz6gAFXUGJxcsC2j8Ssnxt /xvFbs2LyipMtLjqKTr4D/BLy3wHBuTIS5ddWZrTMBkaAn8Mtk+2BGyi0+IYFkOE6SlJ fEgGQ7DOSLhzZDdQ187yj7EjUzOWDWOXfOE31GV17MsnSqZCxwjqD9rL9ywiE2iyL/hw bSUw== X-Gm-Message-State: AAQBX9cJ+bu9Ij9OzuZcmkHsszg3ZRDV3kEuoaI+mVBpGhy1zOZ88AXO bQJY3VrjMz1uYskwkBP6wVl0daQs+12agA== X-Google-Smtp-Source: AKy350Y0UYDsOojqTpoJOc9OIqe0CjSknIT2ARZmykOwewVRTzyzQRb6Uww4vsn7BK5arYWqk2c0rg== X-Received: by 2002:a17:90a:190d:b0:240:95a9:923d with SMTP id 13-20020a17090a190d00b0024095a9923dmr15523394pjg.48.1680263652421; Fri, 31 Mar 2023 04:54:12 -0700 (PDT) Received: from localhost.localdomain (70.206.96.34.bc.googleusercontent.com. [34.96.206.70]) by smtp.gmail.com with ESMTPSA id 65-20020a630444000000b0050fb4181e8bsm1458696pge.40.2023.03.31.04.54.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 Mar 2023 04:54:11 -0700 (PDT) From: "jianfeng.zheng" X-Google-Original-From: "jianfeng.zheng" To: ffmpeg-devel@ffmpeg.org Date: Fri, 31 Mar 2023 19:54:06 +0800 Message-Id: <20230331115406.279001-1-jianfeng.zheng@mthreads.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 1/2] vaapi: support VAProfileH264High10 decoding 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: see https://github.com/intel/libva/pull/664 Signed-off-by: jianfeng.zheng --- libavcodec/h264_slice.c | 9 ++++++++- libavcodec/vaapi_decode.c | 5 +++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 7767e16cf1..d05b83a121 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -809,8 +809,15 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) *fmt++ = AV_PIX_FMT_YUV444P10; } else if (CHROMA422(h)) *fmt++ = AV_PIX_FMT_YUV422P10; - else + else { +#if CONFIG_H264_VAAPI_HWACCEL + // Just add as candidate. Whether VAProfileH264High10 usable or + // not is decided by vaapi_decode_make_config() defined in FFmpeg + // and vaQueryCodingProfile() defined in libva. + *fmt++ = AV_PIX_FMT_VAAPI; +#endif *fmt++ = AV_PIX_FMT_YUV420P10; + } break; case 12: if (CHROMA444(h)) { diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c index ab8c12e364..dd55cbd6f1 100644 --- a/libavcodec/vaapi_decode.c +++ b/libavcodec/vaapi_decode.c @@ -398,6 +398,11 @@ static const struct { MAP(MPEG4, MPEG4_ADVANCED_SIMPLE, MPEG4AdvancedSimple), MAP(MPEG4, MPEG4_MAIN, MPEG4Main ), +#if VA_CHECK_VERSION(1, 18, 0) + MAP(H264, H264_HIGH_10_INTRA, + H264High10 ), + MAP(H264, H264_HIGH_10, H264High10 ), +#endif MAP(H264, H264_CONSTRAINED_BASELINE, H264ConstrainedBaseline), MAP(H264, H264_MAIN, H264Main ), -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".