From patchwork Fri Nov 10 21:40:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 5944 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp3885214jah; Fri, 10 Nov 2017 13:43:15 -0800 (PST) X-Google-Smtp-Source: AGs4zMY9L/W/K3KLm8EGT06H7NN3PxvCge9pTGz/tc0nTqYqESfYkLinX/vMsY7RhGmHSQUjkIb+ X-Received: by 10.28.183.8 with SMTP id h8mr1195326wmf.2.1510350195075; Fri, 10 Nov 2017 13:43:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510350195; cv=none; d=google.com; s=arc-20160816; b=lX4lqzTpqPRKOyyr5sMFtUGs+E7Dig5Od55ogZZUG9zU9AHYDayzr89S5ZOkOpKe99 mVOan9ggUwB6KMGqPbDcVGYW7JiJSsCxYOb5qIU6kUGWYMB5cBuLebcy7Jvoy/WRNnaA OO6nIPRKjBK7nxPzFoSopr3+jMcetj1pBQZNrPvh2UPU5TwNeg75SexP95A3tq8ZiQvl eUlOc6QN77YRdO9PqFlu8m0y+J9vk4LyLw3mRgvpFfq7HzsqJFlDH8n2i28Hof1RkJER Kdi4QSKDb3mbuJMJZQX/NJ1b0o3+TdJYDSuLGS9GKtkVZaRLi8QuYkNK0cqfQ1A57oc2 JZYw== 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=03x5VArlvVOE35YSNb+/94Knh8CM9KBL6Qi4QE3tBIA=; b=idIQ0pg2pAwGGz2TUGRI+FtBP+Tais4ZaZxljR8zri1vYdWh7M6jxns8iteDRJH6Yo S6PPz4Iclm91Ve2nGOgJ82yGfM5KXn3C0GvaHcRjz651m56AOQUVHI3+/De83cKcLSmI ynsMmONuQdu3r9YY4Rk4shjifMNOqsBfZF6ZDNmADKXnkFlpnfl/YznlHTrXqyb9IPNt vwlFpSwDtez9trqcieCvxPwDXgESpZMl8KK+187xfFBF1V2+3YNmjXWcX7Zh72TXFz5v XIvAilObyvHStGXgO+jZyeZ2J71Ywt8j2D1EN3BQmiRN9+Ieac8QAa7U6idbP1rzhP7X WTkg== 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=l1Foy7pV; 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 h17si8976229wre.294.2017.11.10.13.43.14; Fri, 10 Nov 2017 13:43:15 -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=l1Foy7pV; 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 8D63A689FBB; Fri, 10 Nov 2017 23:41:08 +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 7F0FF689F49 for ; Fri, 10 Nov 2017 23:41:00 +0200 (EET) Received: by mail-pg0-f43.google.com with SMTP id t10so7299574pgo.3 for ; Fri, 10 Nov 2017 13:41:14 -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=Yp1ph99RtUb/v9CKH1f02BFZeWAXx+isKes5iu5oihk=; b=l1Foy7pVvyd5JmhaYb0cH0P4xQi0KTKIRqMifSRXK+/d3ppUOEg7uz7E/XFzEhs0Yi XmzNDM90EQ2yZVbw18XSuDxCESlRMA5+QVUsRdlkwFUBI8+LrrG/YrrVFsm/0MZSXKfK tEwF1hHT+bvaQVjP1nNWjoJmEUSH1pK2K1zwesJ1+B7jrDCo7UF4JsHYEe26rngnLlsI /BbQr+cSe/EdUBxVkcy+RXbbeeFCFXpVGTprKBAktq7KGXJsEn9DgMmqPeVhSN3QkmAA fXjK7bBb3291aYvL1awhpS7H+R4+A6C1ccq/bK3IrsCgwx8PTKuFouF8hXaJPAjvyOpF e4lw== 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=Yp1ph99RtUb/v9CKH1f02BFZeWAXx+isKes5iu5oihk=; b=IJLna5pZDwioS4ZjD1Q5ypPoY+9zn6VwVKm25f72K3uyuyMd9SWZexNmcAm9P95aIT eDAsOnfw0BwD8SWTlCXLjPEsQDlt6YmDtbIVZPPVp8mLneilpJqt/zHCZPzFPnAj3dWH 9i7kvW5gu/61YwkOYJ3ee7SOoCztPBPvGD4nD3t+FF2AUQJELI7fCMs+PKZGVepnH3N9 Vs/9+6tf4k4nYydd3k9RSzsurO03vdkfzwSvawpVw6sj0Mo1u18tGquvlRH7oC9Czh3e rmswKYD7fWkNgD94siujX97VcyHXnM+b3fXpoDlPzSpKaI0Z7gbfY4E5XRR8zwrcX/uV ZAqA== X-Gm-Message-State: AJaThX4/Bcgd3jMw4BzPwZyDdHMs5rIEbZqoCjd2el837BwdWr6iEbxJ JJOk4sZb8dl87Nvv+evGrlpf2Buk X-Received: by 10.99.94.198 with SMTP id s189mr1683134pgb.32.1510350072461; Fri, 10 Nov 2017 13:41:12 -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 81sm20734554pfh.145.2017.11.10.13.41.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Nov 2017 13:41:11 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Nov 2017 13:40:55 -0800 Message-Id: <20171110214059.84891-10-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171110214059.84891-1-ffmpeg@tmm1.net> References: <20171110214059.84891-1-ffmpeg@tmm1.net> Subject: [FFmpeg-devel] [PATCH v4 10/14] avcodec/videotoolbox: remove unnecessary if statement 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: nfxjfg@googlemail.com, Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta Cosmetic change only. --- libavcodec/videotoolbox.c | 68 +++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index ff8ba41821..fc33dce608 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -702,45 +702,43 @@ static CFDictionaryRef videotoolbox_decoder_config_create(CMVideoCodecType codec kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder, kCFBooleanTrue); - if (1) { - CFMutableDictionaryRef avc_info; - CFDataRef data = NULL; - - avc_info = CFDictionaryCreateMutable(kCFAllocatorDefault, - 1, - &kCFTypeDictionaryKeyCallBacks, - &kCFTypeDictionaryValueCallBacks); - - switch (codec_type) { - case kCMVideoCodecType_MPEG4Video : - if (avctx->extradata_size) - data = videotoolbox_esds_extradata_create(avctx); - if (data) - CFDictionarySetValue(avc_info, CFSTR("esds"), data); - break; - case kCMVideoCodecType_H264 : - data = ff_videotoolbox_avcc_extradata_create(avctx); - if (data) - CFDictionarySetValue(avc_info, CFSTR("avcC"), data); - break; - case kCMVideoCodecType_HEVC : - data = ff_videotoolbox_hvcc_extradata_create(avctx); - if (data) - CFDictionarySetValue(avc_info, CFSTR("hvcC"), data); - break; - default: - break; - } + CFMutableDictionaryRef avc_info; + CFDataRef data = NULL; - CFDictionarySetValue(config_info, - kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms, - avc_info); + avc_info = CFDictionaryCreateMutable(kCFAllocatorDefault, + 1, + &kCFTypeDictionaryKeyCallBacks, + &kCFTypeDictionaryValueCallBacks); + switch (codec_type) { + case kCMVideoCodecType_MPEG4Video : + if (avctx->extradata_size) + data = videotoolbox_esds_extradata_create(avctx); if (data) - CFRelease(data); - - CFRelease(avc_info); + CFDictionarySetValue(avc_info, CFSTR("esds"), data); + break; + case kCMVideoCodecType_H264 : + data = ff_videotoolbox_avcc_extradata_create(avctx); + if (data) + CFDictionarySetValue(avc_info, CFSTR("avcC"), data); + break; + case kCMVideoCodecType_HEVC : + data = ff_videotoolbox_hvcc_extradata_create(avctx); + if (data) + CFDictionarySetValue(avc_info, CFSTR("hvcC"), data); + break; + default: + break; } + + CFDictionarySetValue(config_info, + kCMFormatDescriptionExtension_SampleDescriptionExtensionAtoms, + avc_info); + + if (data) + CFRelease(data); + + CFRelease(avc_info); return config_info; }