From patchwork Fri Jun 9 11:14:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 42026 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp1054983pzb; Fri, 9 Jun 2023 04:21:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4MzDvdRaiptvwMgaPTakXGYt0yuzoBxftmsZARJ/QxPdagth47cu4nRSvk/9yLQhiQ60vA X-Received: by 2002:aa7:d14e:0:b0:516:642e:f92b with SMTP id r14-20020aa7d14e000000b00516642ef92bmr1142783edo.1.1686309701898; Fri, 09 Jun 2023 04:21:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686309701; cv=none; d=google.com; s=arc-20160816; b=fZYUTuli4QdgX0GmH8QcQW4FqOuEOC//6rsn/bBtVRkil9qLnwBzVgzMPAjDkfvTQF P1vTLAPCezsIkV2sB67ZBHTpZiIyu07LvwRQWiMeR/rYDmGbKcrJBERZDBaWjYyIAltV JxCoVztvo3UwqCWpXQnAlqsXT9+XXLo2JTZE/ZWGFJuVTogeiAFCJnIESImWNJRGS2Nt nmVHII1tBV8wNnBqXRqoSnKAldx5Q9yaAiRUTHIne+dbfrluFfzGTeGN/5IZptwsiW0j 6TxGTSARGC1/2jfwZHVdibSbwiOrv+JfGDavW1IMJWIksyx+qmyxJ9/JBmR2KZoWk9dO j7gA== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=9nJ/QrvdATo7Sj4c0p/UnmYIdFsizPmlPHO23S9Bvo8=; b=hh1c8O1pEQcT52H8StR9CfpSnzkMp3bg+mXhA0gYQvxDlDeY0EFI6tOEmkpKtVXoBl 4U3CBN+NKiIY6rZ/9qACT+t+qXVXS9eLzyaKMBeskUpij5pcj8mrKg9iC4A1dmiMP9QL GEmvplHgv5EU+FdZp0b+b7mzX665O+sOyeQk6uBjyvhRVX8oWdoFpsUEd0EsRRcKKAhc TUh/h3Gz7p2WdBrgczj6HdD2vdFww0mXBeKW/Upc8M9SSeY22giXuX8DRT2Sc5WhlWIZ +6/LCdcQHQ+9/VN7G7CqPad3xGdEVe3Bxs9pfc3OnqQmMTovO+vqAFbhoSc/lnQLMerI W0rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=UJWkBKmN; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o7-20020aa7dd47000000b005149bc2c0b1si1972629edw.67.2023.06.09.04.21.40; Fri, 09 Jun 2023 04:21:41 -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=@foxmail.com header.s=s201512 header.b=UJWkBKmN; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 668F268C33E; Fri, 9 Jun 2023 14:21:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2ABDF68C31F for ; Fri, 9 Jun 2023 14:21:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1686309672; bh=qqFgPNd8u/imEmsSgiyQ04gGfTwuFpkSwDNOJbY99Os=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=UJWkBKmN0agbkfvD5wnSf5/ezNAGiLikDEWFdrbM+HH98XzgFxoJlvXrqikTo8ekP 6aQj8fzyQGc3xZz0Io+5LrGiwypmv8SV2VC7ZADk/m53oLKkO57Q1LOd3Cfz6ch4xl xlxUCTNWAtCHgzL2NiOvQMvOfJHmKipIkzFlRXm0= Received: from ZHILIZHAO-MB2.tencent.com ([113.108.77.55]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 3C02EA18; Fri, 09 Jun 2023 19:15:00 +0800 X-QQ-mid: xmsmtpt1686309310t1pwvwci9 Message-ID: X-QQ-XMAILINFO: MiE+axgVDEQLcqUpJcREuaGroACzphBQqGpczEscCuKxrYQFALNdBUYgNwfCaJ 6l6D93mBkJbC5rhpnEeYu6eWiAldaK50fket6pav6FCcCuR5KR+dB1lwyE1WhEszG/xj6tk0GD+Y WKDxcBEc3vT0f34qaAS959ZG7v/FjF+Vv5QAHOXY3dw4EJHhY/8A6AXpy9+99IrhU+DbrLyaJjrq GgLk55zugqzP1A722uxAUNEcxLc61zSZJe3uBeiObei3458swlZ+XA4YXHLF56SAhucytkZSL/ET OvW+Kes1pc4ZlROOYStJ7SE6fM1j/vswY5eUn6ieTKjmAHShkfZsaN4wJj80DOQHOJN0ElRPwsKW tcLvksu6QN5QFcFdhXQoiofMdoJrcs32vTVRcm/5wnryIWO4VYv7RhECWep2dxqRlWYtdhH+KuZ0 cYoX5YE5GrFqvTy3wAy0oz5eqSTYEX5zPVQ1cIj3S8wKo0BCpzUwsztgkPvmppjRTMy/yXahllsr zblHx6MiNMi62LDmZwgjIsixyEP3L/fFIlXyPzJYG7CYyQCOOTmI9HTyNbn13G1eZyyrJKnRvQ/V 0mt3A0rF9aQrIGMhV+TTfBw09xl8w+/65rep+TI+VQl2hDHOTQueuz8vuLVvJ3CF/aaKNDZGUgHJ w6N7MbaanOs14RoJeZdwFofX4o4A1GciJaKa/1cG3JsBm7IUBRHg2Czg31g0Xn++C39SrXmtv9Dh Peh1Y4lpq0Y8ANbekXVqc2qIbeos8WjL7vTmxGtYDbJTg1DIijKQZBozrn+aXpF0C2/sh2t+CTof IbFcxYVc4ctln2bRNH2PNRwd8r06Eb5lSdbAa06pUeD8GKCwpb85jznnlvuX98CrU7TpJl66Q5Ds AfcPbEiU0AJOmOC8S90hmf8TQ+7YeP16LvPF35IklQYN5NAjh9xhDC/DW9pTOKcVXvKsiEoexhDS cATIeenvy/xoNAuYWBgp8VCQVFTro/hMCHGBp+Wli+R/RNMXU3gCScg0veGSdbYz/vYG9NNxySWV evch3errt+aW1h1dDL From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 Jun 2023 19:14:55 +0800 X-OQ-MSGID: <20230609111455.17989-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230609111455.17989-1-quinkblack@foxmail.com> References: <20230609111455.17989-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/videotoolboxenc: inherit profile from AVCodecContext 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mPzluxaKPSbJ From: Zhao Zhili This can happen when user set the avctx->profile field directly instead of specify profile via option. --- libavcodec/videotoolboxenc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 9f65519700..a313087876 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -1746,6 +1746,9 @@ static av_cold int vtenc_init(AVCodecContext *avctx) pthread_mutex_init(&vtctx->lock, NULL); pthread_cond_init(&vtctx->cv_sample_sent, NULL); + // It can happen when user set avctx->profile directly. + if (vtctx->profile == FF_PROFILE_UNKNOWN) + vtctx->profile = avctx->profile; vtctx->session = NULL; status = vtenc_configure_encoder(avctx); if (status) return status;