From patchwork Mon Jun 11 14:21:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Guillem X-Patchwork-Id: 9366 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:11c:0:0:0:0:0 with SMTP id c28-v6csp4187463jad; Mon, 11 Jun 2018 07:21:42 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIBEpoW3Yvp/5fZr21b/tpncbsYcox9C9sOBUHRS10ZlXQ8hq7LPv37tu2BZs+Ld6INELpX X-Received: by 2002:a1c:d905:: with SMTP id q5-v6mr9027164wmg.78.1528726902587; Mon, 11 Jun 2018 07:21:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528726902; cv=none; d=google.com; s=arc-20160816; b=xtVUrwJIh21AsL8dlXdAPok2Y1mY02sdsb1HHBpnzfKD8CeWRtcrpTvUdzo1SpO0ls yo1qMoqz5zg19kL/nFtZ63QevCiWYYtepKz6zjjPumGxQIIOtO6vq/mP1r76LTyOVMhm yJ3Iq/izt9AWy6W28qhXF0VNK8Oq49KcYxE6ing93CavxXs0111p8mBIKzFTBxCsWtd9 NqYy12N5J+AYY6+5bJAkoOTFZjdiL2vUoqB5xafZVA63O6wX5BSxxAN7GdrpGBGxtVpx oe+mymZv5R8R8KN5YvPHZizy9pROi2uX6H/rqUVYUOgv7Rijl4J27wN+OLLW5QKpiDOB TOzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:dkim-signature:delivered-to :arc-authentication-results; bh=V4XPIoLm7jYbhsifIALV+XqG04SZH9Bd1+ON7kaF8+Q=; b=NSmsJEElLI+XM2i4nVvsjN6yW6Zv3+NsYFVdM0Tw/Z2dpemhtJJWcNYa58syEiNhwy 4I9H8KfWTYiaIJlfjtf8yv22XaCwLxAQjWGbfSRugNu2x92jweR9uxYJjEj+RWWW1lQM Ts1LOo9hHAg9BEDJVHwJ+hsCYlHRFTrmUXM0Zq3oyBCBkMtBbbdIq1JWfZYmMhCWS2nG reRl79R06mp2gvDyatVs0x3XuEFIKrsnV/rcVWHCKsVAzhy/iKKOmRS3uAwvBqwl7A8A 2CKMP0h99sAI4B+LnDEdOLCRFZ5rSK855WEVCvBjNmMOKvVJIA5y9ME0TG89ye7QHAlZ pl8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gllm.fr header.s=fm3 header.b=Ek940CeG; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=fVzLmDOG; 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=gllm.fr Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m18-v6si34319823wrh.299.2018.06.11.07.21.42; Mon, 11 Jun 2018 07:21:42 -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=@gllm.fr header.s=fm3 header.b=Ek940CeG; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=fVzLmDOG; 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=gllm.fr Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 27C6868AD58; Mon, 11 Jun 2018 17:20:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41D8168AD2E for ; Mon, 11 Jun 2018 17:20:35 +0300 (EEST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 3BC0421ABB for ; Mon, 11 Jun 2018 10:21:23 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Mon, 11 Jun 2018 10:21:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gllm.fr; h=date :from:in-reply-to:message-id:references:subject:to:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=Qvl3cLoARCMFMNsyKz4gpXrOgS1hr Zq3BTVYFafTE8g=; b=Ek940CeGgp0Au3lZdFmODniCDN5OExB/upF7oJif+7YE7 jdY3LAGEp+AFifaZuc6Dc4tdODVwRkRXJFHO02xkiXI2kUv+f7ZaOOvAWi9aPZqH v6UMAluQc2Zh7bNHRf+8HhnheTGs7vKPaDH+f/k2Gnp9YVwgmHglLZtDH7gCJanz 5VTnrGg2qMtlmf9svyluefLKy6Mjdq6sM+CfzMSHqmIWCCVk1PMhOBiLqjk1qwgV tnx1V2/0Knwvdu7CbVvn29ebr7AIJWehDIuRCliNtHs+rn2pPLPGQrgiz1Yz5Jxm qJl34sA6TsEiBahnQ+fLtiLJeYuPPAP+knjMhT8jw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=Qvl3cLoARCMFMNsyKz4gpXrOgS1hrZq3BTVYFafTE8g=; b=fVzLmDOG YTFyhd54P+aKnFazflCH6O4QcU8MG2zxAnH0wZJvi8P+KbHlgTWgrz/4Nit98mz4 tefDe4qsqpF2qzdST4cfPdtZ5pATrmGL2VP4z14+oK9sq9BzuLnS8fWckiXNpNWf D+Im8AcrHg8JLpOLs6XVPqkQKUxa8uMEY7RKlpWukKd2IR/50Xc8HQOClwi9/1J6 MBlkux+UmLehEB1CzaF5WYY7rkGoXZKgz4Krb50pZ9Xofic/aFAZpx9Ysidp0OjL RqCpXH+/nPGxAg4z52zpMB6FDRrZwI91vDzdJV2QuVgnpuRTWM1D73lSxCinZiYN qGeZ5zUdkHc9rw== X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Proxy: X-ME-Sender: Received: from localhost.localdomain (unknown [78.194.250.245]) by mail.messagingengine.com (Postfix) with ESMTPA id A87A310268 for ; Mon, 11 Jun 2018 10:21:22 -0400 (EDT) From: Thomas Guillem To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Jun 2018 16:21:18 +0200 Message-Id: <20180611142119.12001-2-thomas@gllm.fr> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180611142119.12001-1-thomas@gllm.fr> References: <20180611142119.12001-1-thomas@gllm.fr> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/videotoolboxenc: split initialization X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Split vtenc_init() into vtenc_init() (VTEncContext initialization) and vtenc_configure_encoder() (creates the vt session). This commit will allow to restart the vt session while encoding. --- libavcodec/videotoolboxenc.c | 48 +++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 9f2a71b15d..1060055ba5 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -1262,19 +1262,16 @@ static int vtenc_create_encoder(AVCodecContext *avctx, return 0; } -static av_cold int vtenc_init(AVCodecContext *avctx) +static int vtenc_configure_encoder(AVCodecContext *avctx) { CFMutableDictionaryRef enc_info; CFMutableDictionaryRef pixel_buffer_info; CMVideoCodecType codec_type; VTEncContext *vtctx = avctx->priv_data; CFStringRef profile_level; - CFBooleanRef has_b_frames_cfbool; CFNumberRef gamma_level = NULL; int status; - pthread_once(&once_ctrl, loadVTEncSymbols); - codec_type = get_cm_codec_type(avctx->codec_id); if (!codec_type) { av_log(avctx, AV_LOG_ERROR, "Error: no mapping for AVCodecID %d\n", avctx->codec_id); @@ -1304,8 +1301,6 @@ static av_cold int vtenc_init(AVCodecContext *avctx) if (!get_vt_hevc_profile_level(avctx, &profile_level)) return AVERROR(EINVAL); } - vtctx->session = NULL; - enc_info = CFDictionaryCreateMutable( kCFAllocatorDefault, 20, @@ -1335,8 +1330,6 @@ static av_cold int vtenc_init(AVCodecContext *avctx) pixel_buffer_info = NULL; } - pthread_mutex_init(&vtctx->lock, NULL); - pthread_cond_init(&vtctx->cv_sample_sent, NULL); vtctx->dts_delta = vtctx->has_b_frames ? -1 : 0; get_cv_transfer_function(avctx, &vtctx->transfer_function, &gamma_level); @@ -1363,8 +1356,32 @@ static av_cold int vtenc_init(AVCodecContext *avctx) pixel_buffer_info, &vtctx->session); - if (status < 0) - goto init_cleanup; +init_cleanup: + if (gamma_level) + CFRelease(gamma_level); + + if (pixel_buffer_info) + CFRelease(pixel_buffer_info); + + CFRelease(enc_info); + + return status; +} + +static av_cold int vtenc_init(AVCodecContext *avctx) +{ + VTEncContext *vtctx = avctx->priv_data; + CFBooleanRef has_b_frames_cfbool; + int status; + + pthread_once(&once_ctrl, loadVTEncSymbols); + + pthread_mutex_init(&vtctx->lock, NULL); + pthread_cond_init(&vtctx->cv_sample_sent, NULL); + + vtctx->session = NULL; + status = vtenc_configure_encoder(avctx); + if (status) return status; status = VTSessionCopyProperty(vtctx->session, kVTCompressionPropertyKey_AllowFrameReordering, @@ -1378,16 +1395,7 @@ static av_cold int vtenc_init(AVCodecContext *avctx) } avctx->has_b_frames = vtctx->has_b_frames; -init_cleanup: - if (gamma_level) - CFRelease(gamma_level); - - if (pixel_buffer_info) - CFRelease(pixel_buffer_info); - - CFRelease(enc_info); - - return status; + return 0; } static void vtenc_get_frame_info(CMSampleBufferRef buffer, bool *is_key_frame)