From patchwork Sat Nov 25 04:06:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 44790 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp1915060pzb; Fri, 24 Nov 2023 20:06:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IFsKuEZqWmS3Pmi54COdXbzPew6w9oJVRT1wH5GyvynO1vAOf2gBfseowrJtvlIUFzptufR X-Received: by 2002:a2e:5cc8:0:b0:2bf:b0d3:20f9 with SMTP id q191-20020a2e5cc8000000b002bfb0d320f9mr3243113ljb.5.1700885196331; Fri, 24 Nov 2023 20:06:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700885196; cv=none; d=google.com; s=arc-20160816; b=jgLkn1iZucnq8lWCHQFOWHRW+k2fhuv2fDmZgFyW49yYAsSbsHzusmrl/O30VIGjMs LPhCdTH+d/8X3msB6JLf9H6ImLZQMiz45/NFQUS/+f/+cpoe3ALbeOYKBf0aGLpvm0au ruiFVbgtNj7mN/3lwI5b8eYQla9VVxk3sxUyeBJ+Lo++rzd3OWVERoXIHxXHRbmClKd3 /xJMY568JaZzq8gdNEGGiotttG9S+Uru0CLqDxdnvZBiBjXVcw5Aker4moR1fg9JnGXe ned+fRQnGorbFc+866/VOoXrb0Hm9T9brEuru+SoI0sflRMjwHIUTmRE+FSnBCpLDZ7V taug== 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:date:to:from:message-id :dkim-signature:delivered-to; bh=SxOV8TsBc+gd14HZuLBwysnEwvcH8G05GA61et6eqk8=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=L0pe8mOkK0guLg3Zq7e6lth6P6DbUHoJWmNpfSBOX5OLbBwSeFLrG6JFTXQHSHP/Rm OHXIIPkUDSB6b3O6yddwSV6l9Nok8t0ecpde+Bdnf0eDDGZrwpnWVW6oCnEZnOUIw3Vz IixFWjywXzfaOhBLk9F62aNjUTUuUrfsnNJha3aAKzsJwbt4+NPemnZmthsoe+DfbCj1 dWIHIDdbgYo5EU2usNHbtsEWSNf9wz1mVLewHP6E5hkUMiksvEDLBUCfK3fyOLaNTCen t2pTjZwU9CPERStozVtFDvhJjm2iKBjldL/RbBfFL+Jv+pwW3qMxJdKgEhgAx/QOS9MH fUQA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=WgKTQn7W; 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 g14-20020a17090613ce00b009e00dcf17b5si2408985ejc.840.2023.11.24.20.06.35; Fri, 24 Nov 2023 20:06:36 -0800 (PST) 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=WgKTQn7W; 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 5FA9668CF2E; Sat, 25 Nov 2023 06:06:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-239.mail.qq.com (out203-205-221-239.mail.qq.com [203.205.221.239]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FF1968CEF5 for ; Sat, 25 Nov 2023 06:06:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1700885165; bh=fq6aIc0zwEfHfm9Xb3tqL5JpB5/9EFXql/vqN4AKpJM=; h=From:To:Cc:Subject:Date; b=WgKTQn7WkNX82Kb46IodZ9qttrdAJ6StCbeXZqxk9iIUyWSZnFH8pyRTkMhT8XN0m 8pvGE4lJlaRBlCsSNsN7pXh9XspTX3ngSYxrBfIMD9jRUL9r01h921on/m6Wts33HY XNL8MU6xyGxaPE4I9OvYkBr5Ln8N7MnPul3B2lqw= Received: from ZHILIZHAO-MB1.tencent.com ([183.238.15.194]) by newxmesmtplogicsvrszb9-1.qq.com (NewEsmtp) with SMTP id 1840288B; Sat, 25 Nov 2023 12:06:04 +0800 X-QQ-mid: xmsmtpt1700885164t7rn7wmm6 Message-ID: X-QQ-XMAILINFO: MR/iVh5QLeiefIVaRaUPvApahe2ADwisoXEcsFebGxkMyIG4NOA7IKgxgyJMPj KYzVtLzdoR57uPNl8A4RI6Hs/KKlaWA0evNrG1NwzjOca4/kixlAh5xpcnnvjQtIvDkWq3OKi2HQ RRiteh31CkL5KxWNeuY11iWGFfHkZAT3a4V6LMTxro3hK2N4VeAuP+EMGVgjSnM/nJe8KPs9ZZ1n Z1eoXkrIGDfQhaCQ1dlL34kEedZeC6IsK8FG/FAvHrPais0ta7Pz09IUWsHXEw85lgUOOgUIgfH5 7VeNSsDyhjMIMmbvZMnxXfEOgYmfzudKLCQy4U9Cx2ofO2ookcKvO+xArMwXGrJwtjTWA0LFMKoP aQEs8ByF7h7RY/N0hjHc3VtMHQKu04YoAG0Uxea3nMDgVJjd/s3qVzUvdSzrz1DaMcDMUYO90HCE 8bemL9s6D6q1MRgfavBeiJosyBYy8U06TDfcN5fhntHzH8ffurGdRKRuLMG8EaNR+y1xB5h3WvL2 /Rqhp0yy7KWBPS3QaivJSS2Sa4zwdu1wmgsB/btRtN0hH2Fj7hesvghXQJox9Z6qAN2CcyJ7eurT +1otwCQNM1eWc8DmFUpZrpVx38ZiWMvrnL14f6G8yofGEEzX41tTrs5AFOKwRRzGCqqZAkamvXkt tPhEQfCPXs4rFpYAPLKob7vulXfodoXqpojahQJyADoJ6YC2MoYJ21/GUUDDi1LmdkiAqg6s35nZ Z4viU8iYHa9Q57SxgcuoVF6RgaAlLhJs8mLCRHkZhSavBHChFb63ekYB2c4JensyHBrfyaCrYGgS OFxdWJoZs6+4jMAxKe4dQOmKXYGlMHmJqq8VlWmkm8Y4DOPRhKKBjDxIW2TYzP6VDxghMoacbWPP d8Aonxll+CQi42Rq8Xm4ZfghdSjrV7MCsRS7SzEfzyZu8Rrdg9KyY3zXLeczuaDCMaQyrHqQUVWy atL43cc7KG0VHMBWPvyaSDZXpZQ7QM X-QQ-XMRINFO: Nq+8W0+stu50PRdwbJxPCL0= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Nov 2023 12:06:01 +0800 X-OQ-MSGID: <20231125040602.64250-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/videotoolboxenc: Fix build failure due to PropertyKey_EncoderID 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: 8LNr/40JnsT0 From: Zhao Zhili --- libavcodec/videotoolboxenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index b0e827d14a..b8a07e4e44 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -119,6 +119,7 @@ static struct{ CFStringRef kVTCompressionPropertyKey_TargetQualityForAlpha; CFStringRef kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality; CFStringRef kVTCompressionPropertyKey_ConstantBitRate; + CFStringRef kVTCompressionPropertyKey_EncoderID; CFStringRef kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder; CFStringRef kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder; @@ -191,6 +192,7 @@ static void loadVTEncSymbols(void){ GET_SYM(kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality, "PrioritizeEncodingSpeedOverQuality"); GET_SYM(kVTCompressionPropertyKey_ConstantBitRate, "ConstantBitRate"); + GET_SYM(kVTCompressionPropertyKey_EncoderID, "EncoderID"); GET_SYM(kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder, "EnableHardwareAcceleratedVideoEncoder"); @@ -1178,7 +1180,7 @@ static int vtenc_create_encoder(AVCodecContext *avctx, { CFStringRef encoderID = NULL; status = VTSessionCopyProperty(vtctx->session, - kVTCompressionPropertyKey_EncoderID, + compat_keys.kVTCompressionPropertyKey_EncoderID, kCFAllocatorDefault, &encoderID); if (status == noErr) { From patchwork Sat Nov 25 04:06:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 44791 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp1915136pzb; Fri, 24 Nov 2023 20:06:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IGRBQxXmhn4180+ag/o7zAXPYV1QSttiQ0pQY7iBV58zc8LqonqhIe0wI0TTt8cjxONJFeH X-Received: by 2002:a17:906:608d:b0:9d2:20ee:b18b with SMTP id t13-20020a170906608d00b009d220eeb18bmr3266226ejj.42.1700885208279; Fri, 24 Nov 2023 20:06:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700885208; cv=none; d=google.com; s=arc-20160816; b=N9SDUS9tO2gSZuhrcBSFKXY2aj4aGciNrk3bnd8zDutLe+9Ywol/afor9iuS7fKrv2 NxTgzFzjoRfs8M2AJdluoLWLIxdyVKnLLEMYs1f+s+xL9HZdf5D72lb918wae4DDC2x7 p9GZbpjxdipbFOfxaywjZNr7zSI89aPKCy90nmBkERzzxMOW/Z0hbuBtobp6Dmcb2AH4 RHVuYpfqyVJLMn2z8y4Q75MbYQSRvbO5FFDUOBySxU71+mP9OXSI61Jkd1knNhJ66dec 1QE7ZgJBDDPfambYqHHwtFdkphx2eXc8w3h0BRj6Bd2UObiiNjXinh5BDhH1WTP53K53 qVGA== 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=G/OgaM3ZpWSftnNFgdE0hltWAUnQ7KKngnCp76LU3Q0=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=sYJ7F5E5B57rJlafdWKHUfn4s7RX46qf7eDRfLsP7r30BUYBDtd9cUXYeBQYIWzqeI xjSqUHAbq2HQGHubRd7OlgYWS+TgR0QMsT8WgkhnqRfh9LqRp0CH5prcSL6VNrXrvcjh VNAU9Ib+hU7Z9KP3jdPJXY+hYaOJMK592RuYETNcQZrB5a8F4+piRGvmF1+l3cT96hbZ RfcvuQA+NVY0WuiXslIy9aCU5OWdjlN8k1wgvMZ9zVs1XQ94DuPKcBMx3fb//kJAsaF2 NE9MbWHpAokNdEWm8hcybnroFiLJlG78J4S4gCOHhyWoINvGOMSb1XBq1TGFP05+EHAV 6zZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Wy2qBDzh; 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 b10-20020a170906038a00b009ffc363b6cdsi2611754eja.913.2023.11.24.20.06.47; Fri, 24 Nov 2023 20:06:48 -0800 (PST) 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=Wy2qBDzh; 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 8F62D68CB9D; Sat, 25 Nov 2023 06:06:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-202.mail.qq.com (out203-205-221-202.mail.qq.com [203.205.221.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 62D0368CF1C for ; Sat, 25 Nov 2023 06:06:14 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1700885165; bh=e0O/nk+Ua1XrwaAoynv9SkpsZclTzfXf4s9c4b1fzIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Wy2qBDzh4THnvXfNdD6aUhFL1IMKUTxVxREAt1WQS34L/BLamO+IHohAyjbbFkCOZ cHX6idyS82o5qP+awijeNnFHNfLzrHa6fKP4GQje+i7KA3hdSwNkdEhcqNTiNO9dv/ jhuSA5iXt2eHrZMyiKTKFB3oXmm3bXulxF4LWAyE= Received: from ZHILIZHAO-MB1.tencent.com ([183.238.15.194]) by newxmesmtplogicsvrszb9-1.qq.com (NewEsmtp) with SMTP id 1840288B; Sat, 25 Nov 2023 12:06:04 +0800 X-QQ-mid: xmsmtpt1700885165tnq27svrc Message-ID: X-QQ-XMAILINFO: NB2Y38G+/V2YwckhGIh7C/pWCQQXw1G6AV+LdHdNDwPaBg/P2UV/764+wbIbOa /5hU9zMkobAMpNVPmmOJhz2KaacRyRE4e6QUFP9fsoMllcidcGDA8HPV7ljiseIu+wqaZWoUmokx 5vNB+9TQKfr5MwGtupFgzRgfdQxBaoemekdTt8F3qwCdS58ICyOwCzItGB6I1q1xctKdxEBdbRsG Px9emB+DuSZtU3jUJK9OM7/mDiYKDh+PaHnJ4qk12XNlC30jX+UMEDP7VGElt0BFNeeS6ZCMzwSB hBkKFkasRbdZtxlUzk8R66H5T+3bY84o7Hawb4VuNOzwNA6tqLFhVp5Qo8mg8aGoQDpvq+WByAgj fdNbcGj+uGVH/gHdIg45b9Yp6n+tHcX57qsVQdu7vy6RCfbKpjpvNeQwjwaSaHdgOnGKA3HnYGbN HGGhEI+gx1eyFQ3CDxs1FC2IfkQ+/LTGhru8TzMxhqT65VMbhu4Igha0MmKTcP2K7r6zOe+cNIa7 Ot/vqUMWrO8mRF9weEkV/t46cmtFACYPUt8RfFXn1+HrO9fiIl4Eu1ilIlkl6O6lUlwssb7SEa0Z N2CrACgrrysp908JxZ5WwfkI5Tlz5dma+ex62mXuQmNChL2nEJCKFPl/qGrYVZ4PIp6pqTQffXvw Y4q+HVpEtoOiAORFPLze9EjGl90z/f0VmB+cBhcfR35QdQv40xoNYTy7rutDA96EBvb/h44sTql9 p8ttkMWlm5T4XJLDj1fDProJM6A/zGoU53xqQnk5xUb/D6ooYaXQPlnWZ2NOsfk/kw18pdL+Vcd5 lV03hpAXSFEj1rnKIicaWofIHwCc50wdXnSUUyWjyIYBaMT+VXkxE4tXMHhPGw1/V9x/FEj1G3KX b7yO47kO7lKkhnfNS6dhXyrVJCSIyEKbkp50di7GrtdjX5BzRfqh99ZjmcweAG+OTD8AhjiqPBJq E7KsVdu1HlKmZyStiH1h1OrjSRIkcx X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 25 Nov 2023 12:06:02 +0800 X-OQ-MSGID: <20231125040602.64250-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231125040602.64250-1-quinkblack@foxmail.com> References: <20231125040602.64250-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/videotoolboxenc: refactor dump encoder name 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: tTW2+9lyimon From: Zhao Zhili --- libavcodec/videotoolboxenc.c | 65 +++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index b8a07e4e44..fbd33fd3f9 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -280,6 +280,41 @@ typedef struct VTEncContext { int max_ref_frames; } VTEncContext; +static int vt_dump_encoder(AVCodecContext *avctx) +{ + VTEncContext *vtctx = avctx->priv_data; + CFStringRef encoder_id = NULL; + int status; + CFIndex length, max_size; + char *name; + + status = VTSessionCopyProperty(vtctx->session, + compat_keys.kVTCompressionPropertyKey_EncoderID, + kCFAllocatorDefault, + &encoder_id); + // OK if not supported + if (status != noErr) + return 0; + + length = CFStringGetLength(encoder_id); + max_size = CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8); + name = av_malloc(max_size); + if (!name) { + CFRelease(encoder_id); + return AVERROR(ENOMEM); + } + + CFStringGetCString(encoder_id, + name, + max_size, + kCFStringEncodingUTF8); + av_log(avctx, AV_LOG_DEBUG, "Init the encoder: %s\n", name); + av_freep(&name); + CFRelease(encoder_id); + + return 0; +} + static int vtenc_populate_extradata(AVCodecContext *avctx, CMVideoCodecType codec_type, CFStringRef profile_level, @@ -1176,33 +1211,9 @@ static int vtenc_create_encoder(AVCodecContext *avctx, } #endif - // Dump the init encoder - { - CFStringRef encoderID = NULL; - status = VTSessionCopyProperty(vtctx->session, - compat_keys.kVTCompressionPropertyKey_EncoderID, - kCFAllocatorDefault, - &encoderID); - if (status == noErr) { - CFIndex length = CFStringGetLength(encoderID); - CFIndex max_size = CFStringGetMaximumSizeForEncoding(length, kCFStringEncodingUTF8); - char *name = av_malloc(max_size); - if (!name) { - CFRelease(encoderID); - return AVERROR(ENOMEM); - } - - CFStringGetCString(encoderID, - name, - max_size, - kCFStringEncodingUTF8); - av_log(avctx, AV_LOG_DEBUG, "Init the encoder: %s\n", name); - - av_freep(&name); - } - if (encoderID != NULL) - CFRelease(encoderID); - } + status = vt_dump_encoder(avctx); + if (status < 0) + return status; if (avctx->flags & AV_CODEC_FLAG_QSCALE && !vtenc_qscale_enabled()) { av_log(avctx, AV_LOG_ERROR, "Error: -q:v qscale not available for encoder. Use -b:v bitrate instead.\n");