From patchwork Wed Mar 15 13:45:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rick Kern X-Patchwork-Id: 2937 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp304187vsy; Wed, 15 Mar 2017 06:51:52 -0700 (PDT) X-Received: by 10.28.166.133 with SMTP id p127mr20666604wme.62.1489585912659; Wed, 15 Mar 2017 06:51:52 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x81si547599wmx.143.2017.03.15.06.51.51; Wed, 15 Mar 2017 06:51:52 -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=@gmail.com; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BEBE86882AF; Wed, 15 Mar 2017 15:51:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f196.google.com (mail-qt0-f196.google.com [209.85.216.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 535AC680A96 for ; Wed, 15 Mar 2017 15:51:26 +0200 (EET) Received: by mail-qt0-f196.google.com with SMTP id r5so1951854qtb.2 for ; Wed, 15 Mar 2017 06:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:in-reply-to:references:mime-version:date:message-id:subject:to; bh=0K+AM2PAWIAyb+YJnStoYUJh4AxHB2Fra7oCuie96dg=; b=hAdGidOJMv7JKsVU0Zjg5qJiCvYQMPjAOcbY5tLbXJyF/48Qi6dfCn1rYG9dXoZGbq YfGfiq2C1FWLoUfK68g1FiSKJ7MbOrrk9LIN/JOGspiTWkZmZ/mFIFE/6NhVwbuv7BqZ oCjqHso5uUWn7juxDJcnvrUZ4ieVNBFuZHowPWgzy+8rVSNxT24bywTLSKJ4Y5dSWHaV I4xT/zKFI+rCD0QQGouj/7pGseMs8j48AjBIgVVXS+NBDqCA66oMsUf/355Yu7p4kf+h M8pifwjW7aQsuMNIQxwBWcZoR6VNvYjtKZ1vwcRnTj3pHIEh2ZQoSAQhJS0FWvryz/no jXjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:in-reply-to:references:mime-version:date :message-id:subject:to; bh=0K+AM2PAWIAyb+YJnStoYUJh4AxHB2Fra7oCuie96dg=; b=tVzSVsGF5rXkKFd1aAELQOQxjOkp+7PwQ9i5awAodAPdzpl9nEhtdyZGnNrETqlqX2 ehr1zO2/H6nxN4o/U8mfCXTXttBXgjxfV3NyHNd2qNmrt3igubGi7O8h1aW/N8lS/LL4 cNP4beR3qxC9evG7HDACG3lQpQaUrSmpqsyPAQ73bJlhoUKpcYmLHG32PDyO3OkubFxX 26wgwnk9Jg/1PSNC06LAlymojOkM8FdMT6zzVPkRu6aJd1S5hm799eIjhUdGbaIqarMt arfuJba8qMAp2oxOMAP6n9zI8yNipWTux+ywS/SV98en4XbeE4L4zPWn1IgrjCKuuV45 nGww== X-Gm-Message-State: AFeK/H172+/sJ+KuJmRRqRV8cWfmsPoCgWvTFygW2HoO3DX0z0L/u8JkNkoN8EXugHTXpt0MANoN3WZMGVtODA== X-Received: by 10.200.37.13 with SMTP id 13mr2708307qtm.209.1489585550493; Wed, 15 Mar 2017 06:45:50 -0700 (PDT) Received: from 1058052472880 named unknown by gmailapi.google.com with HTTPREST; Wed, 15 Mar 2017 06:45:49 -0700 From: Richard Kern In-Reply-To: <20170314145343.15362-1-lq@chinaffmpeg.org> References: <20170314145343.15362-1-lq@chinaffmpeg.org> X-Mailer: Airmail (397) MIME-Version: 1.0 Date: Wed, 15 Mar 2017 06:45:49 -0700 Message-ID: To: FFmpeg development discussions and patches , Steven Liu X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: Re: [FFmpeg-devel] [PATCH v2] avcodec/videotoolbox: add rc_max_bitrate control into videotoolbox 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On March 14, 2017 at 10:54:47 AM, Steven Liu (lq@chinaffmpeg.org) wrote: add kVTCompressionPropertyKey_DataRateLimits support by rc_max_bitrate Reviewed-by: Rick Kern Signed-off-by: Steven Liu --- libavcodec/videotoolboxenc.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) kVTCompressionPropertyKey_ProfileLevel, diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 005f5d6..0cba2c8 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -898,7 +898,14 @@ static int vtenc_create_encoder(AVCodecContext *avctx, { VTEncContext *vtctx = avctx->priv_data; SInt32 bit_rate = avctx->bit_rate; + SInt32 max_rate = avctx->rc_max_rate; CFNumberRef bit_rate_num; + CFNumberRef bytes_per_second; + CFNumberRef one_second; + CFArrayRef data_rate_limits; + int64_t bytes_per_second_value = 0; + int64_t one_second_value = 0; + void *nums[2]; int status = VTCompressionSessionCreate(kCFAllocatorDefault, avctx->width, @@ -938,6 +945,46 @@ static int vtenc_create_encoder(AVCodecContext *avctx, return AVERROR_EXTERNAL; } + 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] = bytes_per_second; + nums[1] = one_second; + data_rate_limits = CFArrayCreate(kCFAllocatorDefault, + 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); + CFRelease(data_rate_limits); + + if (status) { + av_log(avctx, AV_LOG_ERROR, "Error setting max bitrate property: %d\n", status); + return AVERROR_EXTERNAL; + } + if (profile_level) { status = VTSessionSetProperty(vtctx->session,