From patchwork Fri Nov 10 21:40:49 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 5946 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp3883964jah; Fri, 10 Nov 2017 13:41:43 -0800 (PST) X-Google-Smtp-Source: AGs4zMbgTth/wIn6nqdecQywN6UinscnOwAcw58ina7fu7mZm0XvIfOZS+UXFIEcXhR3My/OB/pP X-Received: by 10.223.129.41 with SMTP id 38mr1516883wrm.57.1510350102951; Fri, 10 Nov 2017 13:41:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510350102; cv=none; d=google.com; s=arc-20160816; b=pO0KadEMc8Z4IoGmgj4fHIojcTLuRzOvIUkmYb/Q7uacQXi2BrDJYRcJWRX774Db6W pTht/svocb8d2+qtWVjVGu0m5McQAGgp7TN1a7Y8dCXT4e83DP/5Ttmv/1nVmlYNPD2O 5dOzS6/mMY2s91ODbWk3IU09WzYzPbWf9lwy5f6Hot4xzpXmemaraQq5aJdKZ5GHx9Zs F4l1lw43oFwedzoLQ7G2ESmNGAaFPbUqQKXP9LWFBsJmuxwn0i4HO0zgqibep60meFKk P6/lk31qXrFVdMbsgKMTdgXnO7nUU0kSpXUKKilDcBEoUVhV/e+Rez+wt5ibR33S2TkY SCyA== 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=HaI+ozjXYxliC8E7LwK7VGF1l3dIWxBhmXUY92/dTWM=; b=evCiJGrRa0ZXTmuJvydzxgAlnv6fY8iSd8tYeD1mewvrTgkCT1Oso2t5mQUEmtItH/ MQ20UlHih3dgLmfeS7ECYpdhBqpKzEDVVDyVCMXHp8ad+CqMjSLrHSUX7iCEbftV8nyS tzhTSkpWOB4rSE8kLKlLKYWEsmWvYfjii0vWsXUHPhdU+/x9sbn+fNWE+aCPVCAIarvP wZmkf1ZjkaXf0Z1wtqBMKObKWUIB9Nn6gQ6GA5zygBdE/9l3L/oyi6qDsH8PpBkafKcn bKWP8RvFvOso/YGJocJUGkfBjA3H3vxihNf2KVqm9r6XVD96/baAfuxlNkAj4VJr6Und 5szg== 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=fIx1vujo; 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 p3si2076475wmh.112.2017.11.10.13.41.42; Fri, 10 Nov 2017 13:41:42 -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=fIx1vujo; 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 70E6B689EDC; Fri, 10 Nov 2017 23:41:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f50.google.com (mail-pg0-f50.google.com [74.125.83.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 770A068043D for ; Fri, 10 Nov 2017 23:40:54 +0200 (EET) Received: by mail-pg0-f50.google.com with SMTP id t10so7299367pgo.3 for ; Fri, 10 Nov 2017 13:41:08 -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=2ks2aZdS+F9Zy54V4+3a3+DkcWUjfsgjE0jIFXdK22c=; b=fIx1vujo8EvLxV2dY2gkko7LOf4jJ5KR0KyLKHM82/GdWCU6CPr3dXxhCtrH6jDTjI aJwYJzi8EfEcv/ipT5BJHCRIhhPmMUuO6eANIeTOSxyZyRGJZXwbE5Idyt2MgzRQL4Fz lOKqkcLRS+sbclYyXpr+RIeMUvt4QEhxcKCWPqKtxI9FjzdScWPhxNFSvN9IZiuUxq1F Xargfm4OMyrrE0pnefJBpB9iIFBMm8FyZGcZYLJJlf+jYr/+Mo6VwBKMWdzj7S2ZCb8k lVlPzprKqsL+PNoHq/GWLrYOEpULnfyuIT4xIFm3F92EyOWJls9A7V8pDJI8N8mdSUwU NjUw== 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=2ks2aZdS+F9Zy54V4+3a3+DkcWUjfsgjE0jIFXdK22c=; b=VnHQVhd5zDz3wh4hyWMlX05/QeYPc8iGFaqwYphZAkg58cUE+UJHOUGnpzZ7fwz5Dv PO6OthPC4aT/icUyEfql/eNS++ls9FafombGE2DMDbeoiZmf6QHDbDQ11gn3quNCTXqX 2TyuHxl0LvrJG28idtGLjGbQDfG37j/3Y/xFVJUN0qrLdDJL/EGPg6rKcMN8z3+irPu6 2uFUl2t5rAwQKE2zgzXJ9zHFwSVOM/ZkLu1c+13SMInL1bUlM/Mipym41HLFxZYX0+JN ZYeXzjWDmODDdyN/CmnHCZ2u6aGQqzjZd4nHR9AE6paPMDGAnVHEOIZnRJkKuf38ddYO Iadg== X-Gm-Message-State: AJaThX5vdrLohYZtMbp+C6J/8xLlpRevVBobW/OtZZTe4d6Pncq1r9PU xW0CGPuPvLE+HrQN6C0GjoNGeitQ X-Received: by 10.84.128.75 with SMTP id 69mr1716250pla.151.1510350066511; Fri, 10 Nov 2017 13:41:06 -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.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 Nov 2017 13:41:06 -0800 (PST) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 Nov 2017 13:40:49 -0800 Message-Id: <20171110214059.84891-4-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 04/14] avcodec/videotoolbox: print descriptive errors on decode failures 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 --- libavcodec/videotoolbox.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index a4a282c33a..9db2e1116b 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -572,9 +572,22 @@ static OSStatus videotoolbox_session_decode_frame(AVCodecContext *avctx) return status; } +static const char *videotoolbox_error_string(OSStatus status) +{ + switch (status) { + case kVTVideoDecoderBadDataErr: + return "bad data"; + case kVTVideoDecoderMalfunctionErr: + return "decoder malfunction"; + case kVTInvalidSessionErr: + return "invalid session"; + } + return "unknown"; +} + static int videotoolbox_common_end_frame(AVCodecContext *avctx, AVFrame *frame) { - int status; + OSStatus status; AVVideotoolboxContext *videotoolbox = videotoolbox_get_context(avctx); VTContext *vtctx = avctx->internal->hwaccel_priv_data; @@ -582,9 +595,8 @@ static int videotoolbox_common_end_frame(AVCodecContext *avctx, AVFrame *frame) return AVERROR_INVALIDDATA; status = videotoolbox_session_decode_frame(avctx); - - if (status) { - av_log(avctx, AV_LOG_ERROR, "Failed to decode frame (%d)\n", status); + if (status != noErr) { + av_log(avctx, AV_LOG_ERROR, "Failed to decode frame (%s, %d)\n", videotoolbox_error_string(status), (int)status); return AVERROR_UNKNOWN; }