From patchwork Tue Sep 26 00:36:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 5274 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp3231187jaa; Mon, 25 Sep 2017 17:44:45 -0700 (PDT) X-Received: by 10.28.111.73 with SMTP id k70mr1424885wmc.84.1506386685329; Mon, 25 Sep 2017 17:44:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506386685; cv=none; d=google.com; s=arc-20160816; b=ptgOi1wYBm5cK2uajhHwYHcOHZBogtZmZ68WOUos2ijnyxZagScfCwCRjRD496A8+P OKUFe2P7ZEsYOeOjDwnlRbxbfnTcXNS0AB+v5kVSvkatdwknvgaUu5zDVYlY5N/nsk9c WWF4vVVXoPr1p+2JpcglbEvlGkGoacLkUX9FUgiOrPHKhPuJxulYWJXErUBmvJRqRiZ6 GtUxWmkrFPVK1TZQILIsLbUKd6YzQuFfULnY1Dlop8AFBNv5dUpNg3vw0I1oFCUaoiOn GIMs97XWbeLBaHsvgNDFQoBqfUetyBJjmPOMADemYavBVAqr30pxq8tZxBFZts7XvIwY BZ/w== 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=46CcDyGe2FSWmxepIMuyUVh6pMllwJnfiubr246nvuQ=; b=A2qJHkockohPJl/YevXIGkZa48q7Q7eMWeeqSPmy7JzNH5wrE5FpjjrVCOJxxGiTcl ZgYxdLSZY5dG9cP1deJ22vZmb3/DqUcASz112+BEOAC4w5eATD85wsQBxGhz3fZUKfT0 YO/UBsFIGLG8nzTcD99v+S8d/fwHXlG9q3JHAep8pznBPff3+BF9RoakolJSuLQuV1w8 7JnLwllXz/3vMzwhdvz7QUbVOVgu9xbyfzjozlfjd1De3wRQWTxoUQA939DiwkKC/gnF mw+Mb+jXQhINb1U23JzbiHkRio0n0Vrmv4kBv2vOtooKs7KCn1czg6b00yGuZxvYJo/4 Fy0Q== 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=BMklp9Us; 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 134si529694wmn.155.2017.09.25.17.44.44; Mon, 25 Sep 2017 17:44:45 -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=BMklp9Us; 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 7D890689B23; Tue, 26 Sep 2017 03:44:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EB3C689B05 for ; Tue, 26 Sep 2017 03:44:31 +0300 (EEST) Received: by mail-pf0-f194.google.com with SMTP id g65so4308548pfe.1 for ; Mon, 25 Sep 2017 17:44:43 -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=tRMjxnoaEoIQo86QM4wO/j2lAy+i03G7/rVMTjfbuys=; b=BMklp9Usd73XTt2eRqOeMRArG8sVbSQ2xDwXtgK0IfjumUVHOg3FbEMb4cauwhXibw 6J3UE4ifbeqQE9uobm2/2Gk78nka3GZpwyg8iSKLfLzxsvUuL2l77GSKm2hHwFU4ctNn owaoFiUdLOMYjiJoC1gsT/LaxJ+aIhO8shMHPgELv5RKeHe4Mnaz0GDAB2x19Dtjl7tT vGfckox44qQWB1gzEKqAMGsEngG/e7hkazmX6fJVvdy8E/BwOeouysJdbVCJbASW/4nJ ly0Hz/ncNTAaBdX2o6QnQH1PPDTw31iuTAvMSAqdvXvHX8vUa2vVEZ1Wc7jMZqCihv4f BfBQ== 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=tRMjxnoaEoIQo86QM4wO/j2lAy+i03G7/rVMTjfbuys=; b=gxL+1HRXpl1g+lTqg0uSijBHDw4waA8zQXPYnIImlyUy+uMzbiTtyqmMgMsvoozZ59 PWzCkB7+ZvtXvdpxeWJzE1DNMZBLxKEmYduqLqEFq4GYUX8Y47E3CMtWTmKPNa/MGA+T 24XzibPNG9b9/OmmrS32hycMmq/mNVLuvX/lCacAt+wXMNmw7PzgGhLhABocqeNMpYux 1/PwPViLHImVVoK1QBDMPyEm95g0hueSPfHUbGU9Z5I9dXdxzFSrsziGTRHvriAK/RGt ppVKKaCp6twU36onh0OaCMxFWucYO9+CI9mCJB45V8NpeqUJT1YZ81KtS2R7qbmxAQhJ P+EA== X-Gm-Message-State: AHPjjUgspBE2vJg4YkXQ51X9opEKWheYaMkmWMd/+AVFp33StzVBpXKA GCBiLl3AruCGYH8htU3aRGTSAqAK X-Google-Smtp-Source: AOwi7QCouCLM5mmt27Y98qQsqlcZYn8nEdZR6EOiWrvW56+i7f/fvtGzKblbRa+bEMzioT09MtGbAQ== X-Received: by 10.84.131.101 with SMTP id 92mr8953373pld.97.1506386208517; Mon, 25 Sep 2017 17:36:48 -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.47 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Sep 2017 17:36:48 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Sep 2017 17:36:28 -0700 Message-Id: <20170926003631.55571-6-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 6/9] avcodec/h264, videotoolbox: return AVERROR_INVALIDDATA when no frames are produced 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 The only reason videotoolbox wouldn't produce frames is if the data fed to it was invalid, so returning AVERROR_INVALIDDATA makes sense here. Further, it means AVERROR_EXTERNAL can be used in further commits to signal fatal VideoToolbox errors, letting the user know that they need to fallback to another decoder. --- libavcodec/h264dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 49ebeca6d8..a8263f2e19 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -849,7 +849,7 @@ static int output_frame(H264Context *h, AVFrame *dst, H264Picture *srcp) int ret; if (src->format == AV_PIX_FMT_VIDEOTOOLBOX && src->buf[0]->size == 1) - return AVERROR_EXTERNAL; + return AVERROR_INVALIDDATA; ret = av_frame_ref(dst, src); if (ret < 0)