From patchwork Fri Nov 10 21:40:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 5950 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp3884081jah; Fri, 10 Nov 2017 13:41:52 -0800 (PST) X-Google-Smtp-Source: AGs4zMaWqTaVbaenIFlqeVKJKxxbe9aDEW+Y1CgLoo4NlndkWBsRVBhOOnQXveQ7J1bvXIM9A54D X-Received: by 10.28.109.220 with SMTP id b89mr1351276wmi.30.1510350112756; Fri, 10 Nov 2017 13:41:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510350112; cv=none; d=google.com; s=arc-20160816; b=NRyccsHz9SJ7XpUGG0bk+DM1vgTw3CwuZsUIXevnOLAqNF8uywVv2ojuge0zHgANRH Y9MNKi7smYYVrouB5OA9liwTQPKwQ0RhVj62ommPTxtop1segGzFhlcajj/j59bclrvJ TjWlWu/dHybT7DlPCdjF08NGDSouCB5cSBHYyTCx+r+tkFnAZYfMYlF3FOXj5+sbgo1a yuP/Tz/poFBwYlD6Yqf4L6N7F50HurV9eTsQ0XCTfN1kBMypKkYJATcxTtV/HoWuRQ2x qAE3jMk0CdOwZK6BXOkaciqO46nQyi3E2dhyURpqX+uATyhDuwBkSqhmOvyJu8pFTMVS vdlA== 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=E8syU64iHDcJHBM0tzeHyLohU7Phek1N+RTGlsD975Y=; b=QoN/pJtK/qIy9us5O+yUNm7/kG9xoaNAFsTvr4rmJ8XBKQk4bsz57vv2QbVcNhVtkp RRSvAQxzc6LXRi6HOWV1EWq/ckEpIV3NPoUrrGEfHvcpR4aqTXEi8tf7HYmb1/L64hna DR/pp0VQJHuQcBxTO1/SPmsczVCHM2KriFkjBdw/yofCncMvIMe1pzv6xayJTQ7a1eAH hJOY05iilCE/D2kUiesYvmwhaf8AAs3iN3yjxMcU59nnxVijbXsTWDpTkKTeTcx9zlas N1tgomUZFFxPd1NTSLcxCrWxAj58TydWKana/hDAAo1xgAcmSfX7cGe2sZ1UaFu5GeWq O9Nw== 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=uV83e118; 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 i29si2680619wrb.95.2017.11.10.13.41.52; Fri, 10 Nov 2017 13:41:52 -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=uV83e118; 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 ED7A6689EF4; Fri, 10 Nov 2017 23:41:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f49.google.com (mail-pg0-f49.google.com [74.125.83.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4EF6F68043D for ; Fri, 10 Nov 2017 23:40:55 +0200 (EET) Received: by mail-pg0-f49.google.com with SMTP id 207so5519711pgc.12 for ; Fri, 10 Nov 2017 13:41:09 -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=M9fw06i3PuQ+ORKwsKGELaMviGMymb9E2LIyzPNFMA0=; b=uV83e118tb8aBSH82H68fRCZyyKGSH7JwLe/io1oTLbq8Qmv0Z7BI+WzySQYicMtAX emTpqHTrjxfO+56RZ4BtnyXj1TnePLnRq7cfGYGHyhPFDTY2hO517sZXAlh1aVbr47Jy w2u+XxXAaCd1qidtpUOR/4wz89Czp3dFTxgBcOyq79XuvV9iL45RfRxS8Vje4g0UEaPA QoQWLziKJFDegJP+oo+Vm8X8Zrgg1h0Kk1fng1mJ9myAmV2U1c4MvC6O2CiBQ8YhR/lc 21kQCN0EoyxWEj2SZLfardX2adHqA15Ky91+lOf26EZq3MeZjO3H+AHJy3InYVCoWli9 YadA== 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=M9fw06i3PuQ+ORKwsKGELaMviGMymb9E2LIyzPNFMA0=; b=D81kKri5i59Pp2QFRpzdowp9cJrzULrRXAMrPKQneCZeZZEp3g6HA6PkUA69kS9dOy WNlddYx3llzEd+uT6/1H2Hx3madyUf+W27cNUJ+8U2t95GEuz4Gh+oAi9u+o0a9h3/zr a3OzUlRBvZNP28s6y6b75/6fjIOohxKJ5waL7rOcOS3t0TWxxZXFXD+d+cmHGrGNCXbw kKxKvyOyvEcVx3Ie7cXlnYMMgcXDFWUBcQ2hiUTwdQTQro91IDjouIC3nUq9W3Am3NRS CWyrMFpl3z4yzD7z81FFePu2YPAQjbq6gVqwXQH+eBnStPH1ScVBiceVLFKcEhKTSde7 NGSg== X-Gm-Message-State: AJaThX7yyQbfUSiiArk6e/f+B+MuvwtuOrPBXuIpRsU3HxFDI5auOy/g 8FQQJ1oeBrhNnkEClAIth+bZUae1 X-Received: by 10.84.234.197 with SMTP id i5mr1734894plt.316.1510350067377; Fri, 10 Nov 2017 13:41:07 -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.06 (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:50 -0800 Message-Id: <20171110214059.84891-5-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 05/14] 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: nfxjfg@googlemail.com, 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 aed23c4fba..517f6acc13 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -824,7 +824,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)