From patchwork Sun Nov 12 18:22:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 6016 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1298328jah; Sun, 12 Nov 2017 10:22:52 -0800 (PST) X-Google-Smtp-Source: AGs4zMbthTuToi00axGoK88gBNdJZkgiwrfGCab1776eByZN9NOKBHQnVU4RES72EDgqEe+RQN4n X-Received: by 10.223.130.85 with SMTP id 79mr4880220wrb.59.1510510972565; Sun, 12 Nov 2017 10:22:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510510972; cv=none; d=google.com; s=arc-20160816; b=QlxngQccQCh0ywfv9ajMn3gwTAiBLBLgoZpzAySkSc88g5zhXnU837QIKJwYS5nrjc Bqjb1KMUT8HuRSkWyGiB+JcSgQLb5BnlrhV8G0iqLWZbUkOB/Kswu1Fk4lAiSH33Y7Ci A/uuqqA8jGloyGoReYCQQzWAE5ToaSAoVcQ6QyvClJL+WTs+y1bNoOKA0bCtyIRdpX68 TvxB/DIBED4FBF32AZb7qzDZhhcq1fvJgXeHy65NEjx8HMOLGiTQ4Ledv/dgzq3twg3r +bkeUKHXsAwyNQGggGZOXfFMB2GylLePcIMfrvyWhfm425x4WthGdq0gAUEFu0NHAuHU Sgfw== 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:cc: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:delivered-to:arc-authentication-results; bh=A7vN6+G1BSI6Mv37kCt3u9ts8imeG5zJxA49hp5+XYw=; b=MpUFRmVs/V/8yUt6PKDnl7mBfqgfXCZAxuWDBkuLk8S1rjf5NRTcgAT3KHhRgP5BBQ +cSIFg8b9s5InE7NRq5TiggcFQgx7XGko0s+1mFKKnoHxoqEI5e3qGuwNpSM4tGQpOI+ He4OhF2qi3RKf9jgZXlDOPM4Up29yuzPXxQXT+6SjTLkjlBQP8XChridczqpfMyt6fzw AL7vdBHgZbZZwZsBa1GcDfBDmJJN0QapV/AxEtC5ptyTKarNEJeGr/5a9INPA8b4J/Be ly6EiWVvSjq1pPRDkSQygRboEoYncr35KlpQ/XCxtq7BfT3WcCmPpNyqmnqsmGYt/5Lu PieA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=jWY27B4c; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s67si4631734wme.122.2017.11.12.10.22.52; Sun, 12 Nov 2017 10:22:52 -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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=jWY27B4c; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0B8AA68A4A3; Sun, 12 Nov 2017 20:22:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f43.google.com (mail-pg0-f43.google.com [74.125.83.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 218EB68A476 for ; Sun, 12 Nov 2017 20:22:30 +0200 (EET) Received: by mail-pg0-f43.google.com with SMTP id s2so11032623pge.10 for ; Sun, 12 Nov 2017 10:22:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=TjIzhXx4WG+MOSq9smZ0+ZN4RKqGj4nqduB4R4chSM4=; b=jWY27B4ciJ82MsVlBE2lFDS5RPG6uH9R9rwoRN/SbXKe2koymufcGZn/TYJyptY30F PEe2SrtXElGQ6HVHzwF+Tpjjdjzz7N54eSVZr6QTe3WrjgyptD+2MSUP1BD+2qe5Qgjz 3Z3aDUPTnLG9dPTbXkrjpY+F6hjJN02Y+ERTfTzW9XErkzv7wt7txwJSdp65GL7jqgux qbrjNdJ6V3GiR/ns1XdlF22OIsbSm13jkWWjwt4KFORKRbchoqsa+ILoB6ZEenaxvA5v XA4o2QKGBQBBARCL1jXJsLkCko4H+2bgIHh9L8Q0NMUj4Tv781ZZNX/mJexfodLqC0xi NebA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=TjIzhXx4WG+MOSq9smZ0+ZN4RKqGj4nqduB4R4chSM4=; b=XIj52wf0h2NfLf5N/Hf07r4V62ij2Wf++GmNz22CXA/wmn1QsSSIkPMNYPajH2/2Ar qaLNP5Xc9y4aUnbLWR8aPgi6dD+P2xik3eSnb+Db88732wgNs0jAo/dHJueR99Xch5VI +yDAsES/S5lmYCwNHMNFnH8kXWag1mVovo8hHBbX2W5E4/v1Kug7EESK0fRbwPJtKrxK +23OExDbnGnSfRM/UG1KvptC2iL6JBp9c1rGAIraZI8f4X0PxlhWBMWzrejqhucASkj6 qdF6g2qUxZXkm2Cpybzg5X8C905HupLkrwwdVEl4vQLTkf1A9CZ/JKnHGe7nNQci8P9W R3NQ== X-Gm-Message-State: AJaThX4LEDYJZYnny0JWmKk3VCO8NGbD/EwspXFEd71FdodBDLvVIUld TymHsN9CEqOFzkIdITmHax2Ba/24 X-Received: by 10.84.217.142 with SMTP id p14mr6561249pli.427.1510510962805; Sun, 12 Nov 2017 10:22:42 -0800 (PST) Received: from tmm1-imac.local.net (c-73-252-174-83.hsd1.ca.comcast.net. [73.252.174.83]) by smtp.gmail.com with ESMTPSA id q8sm31842553pfk.100.2017.11.12.10.22.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 12 Nov 2017 10:22:42 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Nov 2017 10:22:35 -0800 Message-Id: <20171112182235.28162-2-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171112182235.28162-1-ffmpeg@tmm1.net> References: <20171112182235.28162-1-ffmpeg@tmm1.net> Subject: [FFmpeg-devel] [PATCH v2 2/2] avcodec/videotoolboxenc: re-indent code 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 Cc: ceffmpeg@gmail.com, Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Cosmetic change only. --- libavcodec/videotoolboxenc.c | 158 +++++++++++++++++++++---------------------- 1 file changed, 79 insertions(+), 79 deletions(-) diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c index 5f6a382672..b1495bd6b4 100644 --- a/libavcodec/videotoolboxenc.c +++ b/libavcodec/videotoolboxenc.c @@ -407,11 +407,11 @@ static int get_params_size( size_t i; int status; status = vtctx->get_param_set_func(vid_fmt, - 0, - NULL, - NULL, - &ps_count, - NULL); + 0, + NULL, + NULL, + &ps_count, + NULL); if (status) { is_count_bad = 1; ps_count = 0; @@ -422,11 +422,11 @@ static int get_params_size( const uint8_t *ps; size_t ps_size; status = vtctx->get_param_set_func(vid_fmt, - i, - &ps, - &ps_size, - NULL, - NULL); + i, + &ps, + &ps_size, + NULL, + NULL); if (status) { /* * When ps_count is invalid, status != 0 ends the loop normally @@ -463,11 +463,11 @@ static int copy_param_sets( size_t i; status = vtctx->get_param_set_func(vid_fmt, - 0, - NULL, - NULL, - &ps_count, - NULL); + 0, + NULL, + NULL, + &ps_count, + NULL); if (status) { is_count_bad = 1; ps_count = 0; @@ -481,11 +481,11 @@ static int copy_param_sets( size_t next_offset; status = vtctx->get_param_set_func(vid_fmt, - i, - &ps, - &ps_size, - NULL, - NULL); + i, + &ps, + &ps_size, + NULL, + NULL); if (status) { if (i > 0 && is_count_bad) status = 0; @@ -597,11 +597,11 @@ static int get_length_code_size( } status = vtctx->get_param_set_func(vid_fmt, - 0, - NULL, - NULL, - NULL, - &isize); + 0, + NULL, + NULL, + NULL, + &isize); if (status) { av_log(avctx, AV_LOG_ERROR, "Error getting length code size: %d\n", status); return AVERROR_EXTERNAL; @@ -1018,55 +1018,55 @@ static int vtenc_create_encoder(AVCodecContext *avctx, } if (vtctx->codec_id == AV_CODEC_ID_H264) { - // kVTCompressionPropertyKey_DataRateLimits is not available for HEVC - 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); + // kVTCompressionPropertyKey_DataRateLimits is not available for HEVC + 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); - 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; - } + CFRelease(data_rate_limits); - if (profile_level) { - status = VTSessionSetProperty(vtctx->session, - kVTCompressionPropertyKey_ProfileLevel, - profile_level); if (status) { - av_log(avctx, AV_LOG_ERROR, "Error setting profile/level property: %d\n", 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, + kVTCompressionPropertyKey_ProfileLevel, + profile_level); + if (status) { + av_log(avctx, AV_LOG_ERROR, "Error setting profile/level property: %d\n", status); + } } - } } if (avctx->gop_size > 0) { @@ -1284,20 +1284,20 @@ static av_cold int vtenc_init(AVCodecContext *avctx) vtctx->codec_id = avctx->codec_id; if (vtctx->codec_id == AV_CODEC_ID_H264) { - vtctx->get_param_set_func = CMVideoFormatDescriptionGetH264ParameterSetAtIndex; + vtctx->get_param_set_func = CMVideoFormatDescriptionGetH264ParameterSetAtIndex; - vtctx->has_b_frames = avctx->max_b_frames > 0; - if(vtctx->has_b_frames && vtctx->profile == H264_PROF_BASELINE){ - av_log(avctx, AV_LOG_WARNING, "Cannot use B-frames with baseline profile. Output will not contain B-frames.\n"); - vtctx->has_b_frames = false; - } + vtctx->has_b_frames = avctx->max_b_frames > 0; + if(vtctx->has_b_frames && vtctx->profile == H264_PROF_BASELINE){ + av_log(avctx, AV_LOG_WARNING, "Cannot use B-frames with baseline profile. Output will not contain B-frames.\n"); + vtctx->has_b_frames = false; + } - if (vtctx->entropy == VT_CABAC && vtctx->profile == H264_PROF_BASELINE) { - av_log(avctx, AV_LOG_WARNING, "CABAC entropy requires 'main' or 'high' profile, but baseline was requested. Encode will not use CABAC entropy.\n"); - vtctx->entropy = VT_ENTROPY_NOT_SET; - } + if (vtctx->entropy == VT_CABAC && vtctx->profile == H264_PROF_BASELINE) { + av_log(avctx, AV_LOG_WARNING, "CABAC entropy requires 'main' or 'high' profile, but baseline was requested. Encode will not use CABAC entropy.\n"); + vtctx->entropy = VT_ENTROPY_NOT_SET; + } - if (!get_vt_h264_profile_level(avctx, &profile_level)) return AVERROR(EINVAL); + if (!get_vt_h264_profile_level(avctx, &profile_level)) return AVERROR(EINVAL); } else { vtctx->get_param_set_func = compat_keys.CMVideoFormatDescriptionGetHEVCParameterSetAtIndex; if (!get_vt_hevc_profile_level(avctx, &profile_level)) return AVERROR(EINVAL);