From patchwork Tue Sep 26 00:36:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 5272 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp3229709jaa; Mon, 25 Sep 2017 17:42:36 -0700 (PDT) X-Received: by 10.28.195.132 with SMTP id t126mr1627454wmf.0.1506386556416; Mon, 25 Sep 2017 17:42:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506386556; cv=none; d=google.com; s=arc-20160816; b=yRX4ywKG+8PeK7ECFGRkgWpIYUR7Bi29OFbabAYsqyzzg+Jm6R+ehfHmDanVqimWxA o0i7LY0e4lQDoaBE/VmQVTcPrqzcVHFm+1gVWqkTzoCP/4nDbbcD0eEB75rF03dJcBua 8w96OdUZdrt9dvu8ngP6LqudxN00IKeIFMiefTSnvM4Q/EmY2dgcEIta1QLdyyCJXM1S zrF56susvryL/QAb/rn5ZCEf9gNbca5Skma6AXO1H6w4CHChLDsQQNyfz8vchBKhI2wn cTeEF+MFsT8XmdOc0eCSrVU8rFYBVyvfYN6J9+f2d0O/T0CCsAdFjHkxxkudIpXM4d0d Ek0g== 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=c6j0Ay8lJoxv6Po1/ZtSDE+nGYLp1/rPeaNsQpa3dGo=; b=I4TGhy7EXviwJCrVxc4WK2bSh55bSjQZEWnDnL187/UnfBLROO45Vz65DWYw0Rtuu/ gd6ViuZgEJNImeI5sLTxxrRZgHgSpTyWlc0Gsk/vQuFOAt8/jlLnuYSCK4rSbZP3T6g9 KvNM/RPItDSEpYVVLFdc9efu6QIznvkvc7vgmvEd7NvihsFQQBWaxBpaC1WQpRWYFepb Xp6p4BwNWApUcyWkjq2RHsi2RYekA9fpHqWDi/H5/wKQRbqTvqQclC/vvAy0Dhm0LD8O AzIedqfVAKC60uC6llJbB8QvypFDycfS+gpFGjyWX4jDY/t+4NY3uyJaFFvq7jEsrhCH 2sIw== 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=M7dVnKOG; 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 t16si6002741wra.493.2017.09.25.17.42.36; Mon, 25 Sep 2017 17:42:36 -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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=M7dVnKOG; 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 4592B689ACC; Tue, 26 Sep 2017 03:42:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 209D6689A8E for ; Tue, 26 Sep 2017 03:42:17 +0300 (EEST) Received: by mail-pg0-f66.google.com with SMTP id m30so5774378pgn.5 for ; Mon, 25 Sep 2017 17:42:28 -0700 (PDT) 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=wM2lOsZfZwlOBB8tMCICUd6b4lKIe0yik7JoGscz4io=; b=M7dVnKOGwZ3PKthKnHXwNaqFmLk40+Y0jWyRxaBpNYkSPMnr9A7LkU9So7CDv5334E rgMEQod8jGB4LMTm0E4zpLqYgzdPRc9IPpe1VQ0z+7IUsRWqj+brgXjEs2wa600sMeb5 JXtnBwotXq7ww/7XswbjWLc2npJ4blVhU7mQ55OjoHSHee2KnpWPntNnPbhy42mNuhMt EfKC33+U5XF4H+9hkkAJv+DSw7RtGXWvXUPgkmCOLLeRA7D8MxJnP9yvOLzH3u4N7eUB ArsJ8j1ZA1EizXB8ZEd9HFvqfbznyNZ2WStis+gUFRjOZrm0Zf/5URliG5unNE7YQYd7 /73Q== 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=wM2lOsZfZwlOBB8tMCICUd6b4lKIe0yik7JoGscz4io=; b=JED6DlNYBeWWWHlUnfDqeEuUEgM9k5KDj3txjr+gJDUfI0cun7JLRnSTDbdRdKpYjq KX2Hvu9M5w/jvUXdsvaj61pBuT1AY/yT7CABebHGlUERJ38D4qsF2d9ZsGlCHIUQyqEv YXYE15kFn2eZ0W+lrkCX45fMjTB3oXjKvFiXAJIEle9h6gxNnTH1WNZ3UoX5Gebl+vjT 1iwsDmw/jneo0rjNC8fvrxf5nwMdHTN4mZEnFv1QjWej8lgMMeGiuRZ1vKqb8BKfEgVJ AXuy5HAeYVbPaq+QGDIti4UrxS76Zc4NL5pPu1x3BjkQDWKHwR15PUw/rNoaLMxx4eM+ AHag== X-Gm-Message-State: AHPjjUhjIZmOGYL0E3jLbXPVwRaYTDeXOdeGxJ0ADIFSmBTUzeLEAwKi 1U4t5AanvlIGYMnDDnVREdzefqL6 X-Google-Smtp-Source: AOwi7QD1p1Z83Bg1A4dNUlC/5En57JxWASMO0qLnsE8YK3RntQCtwVqGSQknsy3mqXSVWJJtlkzEtw== X-Received: by 10.84.238.205 with SMTP id l13mr9083767pln.173.1506386204793; Mon, 25 Sep 2017 17:36:44 -0700 (PDT) Received: from tmm1-macbook.local.net (c-73-252-174-83.hsd1.ca.comcast.net. [73.252.174.83]) by smtp.gmail.com with ESMTPSA id n18sm12483164pgd.69.2017.09.25.17.36.44 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Sep 2017 17:36:44 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Sep 2017 17:36:24 -0700 Message-Id: <20170926003631.55571-2-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.13.5 (Apple Git-94) In-Reply-To: <20170926003631.55571-1-ffmpeg@tmm1.net> References: <20170926003631.55571-1-ffmpeg@tmm1.net> Subject: [FFmpeg-devel] [PATCH 2/9] 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: 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 | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index dd13e2581b..7dfcf14c00 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -580,7 +580,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; @@ -615,6 +615,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, @@ -656,7 +661,7 @@ static int videotoolbox_default_init(AVCodecContext *avctx) case kVTVideoDecoderMalfunctionErr: av_log(avctx, AV_LOG_VERBOSE, "VideoToolbox malfunction.\n"); return AVERROR(EINVAL); - case kVTVideoDecoderBadDataErr : + case kVTVideoDecoderBadDataErr: av_log(avctx, AV_LOG_VERBOSE, "VideoToolbox reported invalid data.\n"); return AVERROR_INVALIDDATA; case 0: @@ -667,18 +672,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) { - if (videotoolbox->cm_fmt_desc) - CFRelease(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); - } + if (videotoolbox->session) { + VTDecompressionSessionInvalidate(videotoolbox->session); + CFRelease(videotoolbox->session); + videotoolbox->session = NULL; } } @@ -691,7 +699,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); @@ -757,7 +765,7 @@ static int videotoolbox_common_init(AVCodecContext *avctx) goto fail; } - err = videotoolbox_default_init(avctx); + err = videotoolbox_start(avctx); if (err < 0) goto fail; @@ -860,13 +868,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 */