From patchwork Wed Jul 4 07:05:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Guillem X-Patchwork-Id: 9605 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp461858jad; Wed, 4 Jul 2018 00:05:44 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfMqGCQD9sOBrHis9A8nBzNY/ckd65Zq6MLPZPerHl1Ejkfiz9y0WLXMAAuZqhiaNPbtdFD X-Received: by 2002:a1c:8e4e:: with SMTP id q75-v6mr784832wmd.137.1530687944821; Wed, 04 Jul 2018 00:05:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530687944; cv=none; d=google.com; s=arc-20160816; b=WopV0ej+J7EUoVwaJqqkJpkJiCOHksjF0+4ZesjAyQULmCYFoHA2jELlZBClJrAYg5 0LRYKw0rp3kIqvOzVPOVDm3OfWemtqWwsgt9W4pzt8ojQYwub+c4JUlFwQoUFgjuTblt XNuOHNItMigK/eJUDaA/jawV0t6tKwlC3N2zr3pQ/1bxhKLfOUD9qgpjrjd+zN8ynpk0 ZMv+ekl5vpUlm/R/zA8QYNmH0lWYP3/kGwhpX7LGOaOpHfoWnd6PNIelrrqg8Szk5NtK ZAMXj93xw0mbLw5JVaoD3eh2Jme+hOGTTM2TaZoSycmEAsnem+egacnpIQCFPbcIMW6J eLwQ== 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=twsAVM2jYbVy0EpQZSzYFN26W0oAjtWbuq1fYWLTkdw=; b=Ti4jCe08LS1XTnAbxhyAryCcWWxIU+Py7I/QmXMMZkToC35V1g30Xi/sFgDPanwjc0 adl1Ov7zyS4RwV//W+v0dm8YDzwfLrpfiFYZG+seZWrv5KdRs2g50m4YLP5HCUxRxl+k aBfbrrV5GHomv/V17dTy9/KO3hhUwA2+lTjFU+iQ/64+Nv6gLnLXKuX6hfRvZsPc0QxU KZBPeAG2s6iegpY1q7k9cozKVQCG6+LBapijb4Gtr1REm9HpgcK50UZM5MswFj5DjAoq AGmyd6Of6UrqHydiubxf78LNI6Kg/JTpFa1GxAoX3CFoVWuxy3s4sBOaucEhudscq42U wHgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gllm.fr header.s=fm3 header.b=EKuE9k2+; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=Yhp4kCzm; 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 m17-v6si2682685wrb.217.2018.07.04.00.05.44; Wed, 04 Jul 2018 00:05:44 -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=EKuE9k2+; dkim=neutral (body hash did not verify) header.i=@messagingengine.com header.s=fm3 header.b=Yhp4kCzm; 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 1BA4568AA3F; Wed, 4 Jul 2018 10:05:31 +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 1993768AA33 for ; Wed, 4 Jul 2018 10:05:24 +0300 (EEST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9CB6321F32 for ; Wed, 4 Jul 2018 03:05:27 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 04 Jul 2018 03:05:27 -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=EERDwOrADM4qQYCvSzH2Z180hk3Gh CTrqexVSmCAQUk=; b=EKuE9k2+aLoZgbKcnSFFyXCjRtZxBZX6cNzJ750w7nReB FiPiL9nwhGrhFPDRBbMoyuStG+tU4znXP6pk9JoSOZfn8X7KeKNgeywWeVkw4Yl6 wkBTO0uBwJxvUNLEQ/fm1KHHu36FwBhR4B6Iewxacyvhm0WAugqMk1cjg55yfMYK QpKGK0LDNMTjnzrlqNNwx9e/PoG1IYcaOz+xz7rJAmRlBjBqJJlvtYVU7CkkXapY bIJPFuZDmJ7X1cbcWolncH0fzbrcqTrZbWiMmtFpzEqr/a/xgG6YMLqcbGgw37q4 CPCuSit6S7KMXBakICWf8xcsy+HLycFIc9ipTBdpQ== 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=EERDwOrADM4qQYCvSzH2Z180hk3GhCTrqexVSmCAQUk=; b=Yhp4kCzm MEu4vxqAZaGv33X7tIYrQAJXbBgyIZM9Nytxdnux4fVNj13FnisJv73xbkw2xlk9 LlexBX0ZHsP2Q93LFb7u4yc5OJ77likCINd7Ez2oGEwRpyWBSqugg7Nbg3bVzdr3 8DeGBCPGdMU91MLEHaQIxaLC9iId5UKPO9/DoAZVJ78beYDyZ207VL52Xp4wqsoR B/5RgWYTYsEEZeFVCydU7Njw1Blh+zVy5Qr24BSG4hi96ht6RzGKpLQi1w1zg1lh p8XFBnGZJ5Npjxz3Sq4EvbRaHb87MvWdkuKZJ6vEoYVfZPAIzGlcChvWOEfAp5EM 2wE+kfbgfbU0aQ== X-ME-Proxy: X-ME-Sender: Received: from localhost.localdomain (unknown [78.194.250.245]) by mail.messagingengine.com (Postfix) with ESMTPA id 09E0CE482E for ; Wed, 4 Jul 2018 03:05:26 -0400 (EDT) From: Thomas Guillem To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Jul 2018 09:05:23 +0200 Message-Id: <20180704070523.2573-2-thomas@gllm.fr> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180704070523.2573-1-thomas@gllm.fr> References: <20180704070523.2573-1-thomas@gllm.fr> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/videotoolboxenc: reindent after previous commit 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" --- libavcodec/videotoolboxenc.c | 72 ++++++++++++++++++------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index aa9aae7e05..050e5cefee 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -1020,45 +1020,45 @@ static int vtenc_create_encoder(AVCodecContext *avctx, if (vtctx->codec_id == AV_CODEC_ID_H264) { // kVTCompressionPropertyKey_DataRateLimits is not available for HEVC if (max_rate > 0) { - bytes_per_second_value = max_rate >> 3; - bytes_per_second = CFNumberCreate(kCFAllocatorDefault, - kCFNumberSInt64Type, - &bytes_per_second_value); - if (!bytes_per_second) { - return AVERROR(ENOMEM); - } - one_second_value = 1; - one_second = CFNumberCreate(kCFAllocatorDefault, - kCFNumberSInt64Type, - &one_second_value); - if (!one_second) { - CFRelease(bytes_per_second); - return AVERROR(ENOMEM); - } - nums[0] = (void *)bytes_per_second; - nums[1] = (void *)one_second; - data_rate_limits = CFArrayCreate(kCFAllocatorDefault, - (const void **)nums, - 2, - &kCFTypeArrayCallBacks); - - if (!data_rate_limits) { + bytes_per_second_value = max_rate >> 3; + bytes_per_second = CFNumberCreate(kCFAllocatorDefault, + kCFNumberSInt64Type, + &bytes_per_second_value); + if (!bytes_per_second) { + return AVERROR(ENOMEM); + } + one_second_value = 1; + one_second = CFNumberCreate(kCFAllocatorDefault, + kCFNumberSInt64Type, + &one_second_value); + if (!one_second) { + CFRelease(bytes_per_second); + return AVERROR(ENOMEM); + } + nums[0] = (void *)bytes_per_second; + nums[1] = (void *)one_second; + data_rate_limits = CFArrayCreate(kCFAllocatorDefault, + (const void **)nums, + 2, + &kCFTypeArrayCallBacks); + + if (!data_rate_limits) { + CFRelease(bytes_per_second); + CFRelease(one_second); + return AVERROR(ENOMEM); + } + status = VTSessionSetProperty(vtctx->session, + kVTCompressionPropertyKey_DataRateLimits, + data_rate_limits); + CFRelease(bytes_per_second); CFRelease(one_second); - return AVERROR(ENOMEM); - } - status = VTSessionSetProperty(vtctx->session, - kVTCompressionPropertyKey_DataRateLimits, - data_rate_limits); + CFRelease(data_rate_limits); - CFRelease(bytes_per_second); - CFRelease(one_second); - CFRelease(data_rate_limits); - - if (status) { - av_log(avctx, AV_LOG_ERROR, "Error setting max bitrate property: %d\n", status); - return AVERROR_EXTERNAL; - } + if (status) { + av_log(avctx, AV_LOG_ERROR, "Error setting max bitrate property: %d\n", status); + return AVERROR_EXTERNAL; + } } if (profile_level) {