From patchwork Fri Nov 10 21:40:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 5908 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp3883736jah; Fri, 10 Nov 2017 13:41:22 -0800 (PST) X-Google-Smtp-Source: AGs4zMYUPZ48/QxeDNzurCEZwaecB5zTsjLDLOymHYiQlvN3Y7p/upWaSg1Q8Yo7WJ2i0NFKEpqW X-Received: by 10.28.174.140 with SMTP id x134mr1210181wme.103.1510350082423; Fri, 10 Nov 2017 13:41:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510350082; cv=none; d=google.com; s=arc-20160816; b=N+Gg9mh0EBmFnUvsHAVOLH0fdEA/6s3qAnGV6Jca+ftzh7+xFTtIsZkFzCc21CjdMg uy+RsquHpvKWXujdBRDIn+Y26NIJhu/t+k0h2HjnUUMo5KFSYm2610lROvYfWXc39t+S uCXo5uQVx6zLYDXcdssL450ao5i/A//udZTQBaT6n8tTfbIvY0S2P2LAqhUu3rRsnd3k RWbGMac9c/Jmi71Hn6OORVidbEDpUNZuOjfKDwXeG7nwFpLC0KWuF0xv/eV3g4vn30r4 t5ZwNyJBiqDItUycAcfPvasbnLQrBN4rfOJ+ElQwxL6dGxU+XebyctUen6hHjFnL8YAF yjSg== 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=VqBLGDj+UXKPd9DKT+VRr9LAfF8FAwqJ81CnQISrVdo=; b=Fv+YjGtuAwiKv2i0pToNJoxRVO4HPv7yBJKUwqMUl04DIiAs8UPnxxffqM+u+MMGqz zk4HT5qX1kWYzkURWz11ZpwQoFYSpYw2Z7COulum2eowgDZK1FTdyoRbw6/g+0bWO2OX cyCLOx5FExfBenjnNb9OY/Y6eFYIt5KITewBaXWeHCg0Zdd+Y13vxGXoYg/+7J3WJMda 00mq5Xvg2yqugCnOCADHNoq0fZWcIoXjoNFYMWpTxzMjYuT9FUkwLF0TtaB5YDc1BR7j groiHemjaCM8e+WnoVpTgqiyMMATSoZeZ/k2oOX/fVYhMRlRdW232zDiNA8BBzuv07BF 3Hyw== 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=t4L/1sYq; 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 x132si2004096wmb.58.2017.11.10.13.41.22; Fri, 10 Nov 2017 13:41:22 -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=t4L/1sYq; 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 8769F689D5F; Fri, 10 Nov 2017 23:40:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 230A268042A for ; Fri, 10 Nov 2017 23:40:52 +0200 (EET) Received: by mail-pf0-f180.google.com with SMTP id u70so2744543pfa.7 for ; Fri, 10 Nov 2017 13:41:05 -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=g3GbcScAIhl1rL1LNDQPo7QY3r1YPIFGUNmiUw8N/Uc=; b=t4L/1sYqyt9GwFiBIHRwThwr2pSpiPovAPgp3V+dv0lavTrbQWIfFLnwdQ85YplRi8 20TWVBtCVjwpng7CGXMq5kLpzEaMnUsxrhwIFnQCdXARV7EmU4jo9hbYnIucZoR2U/4o YTtxwEFT3zZUmkDIXUc6zqc0tGu6akDYz04kfXUOUJTQ8e3LaALlF+LL3cxyZeXgo15E SEfwSeXJ4SdsayAoMt/NUTz/ERAuFhxpVUafdsXHGaJvE2J/0Fc4+FQ3Eh0j3ikvIRfr t45a71ILBDjBKeftJPWoqm7nYiALEcyBAAAoOxNAArnV9C1+w9ZJTMh034QCESyeYdpQ QPug== 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=g3GbcScAIhl1rL1LNDQPo7QY3r1YPIFGUNmiUw8N/Uc=; b=ss5K43XmYj0sp0JZkugCGaIudZQ49Rj/ko/wSZfZa2ms8YaVckX3nxi4akfPUmXkOj yI1G3N9vKuLJ2gYxZeY/S9vLq73DQ73n6vosxB16NSMe0etRgLKBhIrCSRI74j7ZEnbE Yjzp/yNJ/ZK2Mvy/PbCbljKNplWZGYtGfrX/SGtLrT5qw4ybg5T8ZTwISEsl3718TjtU aBHlMI+yn86yumaCOlTib1QHqW4QoApy4AMrMHgZdB5doY50n8SnfkoKo6m9n8k7Pwy5 Cm3HUHlpxDJSp3k3007jP05cishoUFqT4xUrn+qNrqwcEBtbTGSmHkOXDgYyDWwEjYM7 ZJbQ== X-Gm-Message-State: AJaThX7RodMNUECpiG5X48BO6VPmTQLgZCojOZCWWaqu1OOAjui+d/iR LTklc9Ceh/c31vFOL7rK+NNjbRny X-Received: by 10.101.75.204 with SMTP id p12mr1654538pgr.61.1510350064183; Fri, 10 Nov 2017 13:41:04 -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.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Nov 2017 13:41:03 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Nov 2017 13:40:47 -0800 Message-Id: <20171110214059.84891-2-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 02/14] avcodec/videotoolbox: extract videotoolbox_{start, stop} helpers 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 These helpers will be used in later commits to automatically restart the decoder session when SPS changes are encountered. --- libavcodec/videotoolbox.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index f5a282f72c..24f74ee86e 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -756,7 +756,7 @@ static CMVideoFormatDescriptionRef videotoolbox_format_desc_create(CMVideoCodecT return cm_fmt_desc; } -static int videotoolbox_default_init(AVCodecContext *avctx) +static int videotoolbox_start(AVCodecContext *avctx) { AVVideotoolboxContext *videotoolbox = videotoolbox_get_context(avctx); OSStatus status; @@ -794,6 +794,11 @@ static int videotoolbox_default_init(AVCodecContext *avctx) decoder_spec = videotoolbox_decoder_config_create(videotoolbox->cm_codec_type, avctx); + if (!decoder_spec) { + av_log(avctx, AV_LOG_ERROR, "decoder specification creation failed\n"); + return -1; + } + videotoolbox->cm_fmt_desc = videotoolbox_format_desc_create(videotoolbox->cm_codec_type, decoder_spec, avctx->width, @@ -846,18 +851,21 @@ static int videotoolbox_default_init(AVCodecContext *avctx) } } -static void videotoolbox_default_free(AVCodecContext *avctx) +static void videotoolbox_stop(AVCodecContext *avctx) { AVVideotoolboxContext *videotoolbox = videotoolbox_get_context(avctx); if (!videotoolbox) return; - if (videotoolbox->cm_fmt_desc) + if (videotoolbox->cm_fmt_desc) { CFRelease(videotoolbox->cm_fmt_desc); + videotoolbox->cm_fmt_desc = NULL; + } if (videotoolbox->session) { VTDecompressionSessionInvalidate(videotoolbox->session); CFRelease(videotoolbox->session); + videotoolbox->session = NULL; } } @@ -870,7 +878,7 @@ static int videotoolbox_uninit(AVCodecContext *avctx) ff_videotoolbox_uninit(avctx); if (vtctx->vt_ctx) - videotoolbox_default_free(avctx); + videotoolbox_stop(avctx); av_buffer_unref(&vtctx->cached_hw_frames_ctx); av_freep(&vtctx->vt_ctx); @@ -936,7 +944,7 @@ static int videotoolbox_common_init(AVCodecContext *avctx) goto fail; } - err = videotoolbox_default_init(avctx); + err = videotoolbox_start(avctx); if (err < 0) goto fail; @@ -1053,13 +1061,13 @@ int av_videotoolbox_default_init2(AVCodecContext *avctx, AVVideotoolboxContext * avctx->hwaccel_context = vtctx ?: av_videotoolbox_alloc_context(); if (!avctx->hwaccel_context) return AVERROR(ENOMEM); - return videotoolbox_default_init(avctx); + return videotoolbox_start(avctx); } void av_videotoolbox_default_free(AVCodecContext *avctx) { - videotoolbox_default_free(avctx); + videotoolbox_stop(avctx); av_freep(&avctx->hwaccel_context); } #endif /* CONFIG_VIDEOTOOLBOX */