From patchwork Wed Aug 24 08:43:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 37448 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2371878pzh; Wed, 24 Aug 2022 01:46:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR6nZ9lXSpmBZxQ3+8E/NYbibXbMzpNZO+q5rF7kkt/ouZEMRhcvDQKwPVAIOZzw4eWh65iw X-Received: by 2002:a05:6402:34d5:b0:446:d2e8:3a3b with SMTP id w21-20020a05640234d500b00446d2e83a3bmr6785078edc.297.1661330767044; Wed, 24 Aug 2022 01:46:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661330767; cv=none; d=google.com; s=arc-20160816; b=p1AUOavWATG4zxhNHTCJUpgYxHjUcHj193Iklnjaof+ENifNjpH+pnxleWakhQVkVh sZRkpxbxd/Ex4geKtLaeUOi4WrJAnL/sYnZ7LIE0KjM6dGTLRnVwO2o4+Rf+gjHW3pDw b6ilcvw8rZBwDJIZDRfPw1KoAQu8KguBNFFjI7Al6jvZibk34ripxe6rqP71lJ5owt7H M1ccczUZUMXDUEL9IcM+6dg97OCIMNodyJOMkdoLCe2p0tWPyx+jq0v8v1aitDdgFRlK kwlS5EOkQRNTE6lQmvqRuL5lbDRwBisQeftxvdOyKbR109OpEh7+IeSI+Gi+aDfnfeNB RKqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=rXQ8NWpoKk+RAVTxv1jsOl8laKPaxcxvDzjbY9omco4=; b=j4iQh9F7HaQAIswp0ieTkcDFyHGWIM/dhsLuG7caKK3tRdyJotgl3JfRBLf251xplX 7ILA5hP6YFghbKazbzliTlrMzl7Rtj/i68LOwTqa2npLutvzdgw2Lx/cvHnOi++qPgcJ SJe5WfeZt9RolEgJ4N/UcLPLlj/CW0QWvWcHSfdObnwZorpSmZ2+Qoik70hm8Kmsp9Tc 1T+AFb4NtyHjcOf2Sznuu5wNnlZSTP4tAg56N2GHxKq2tkaYI0U4VnEyglEz8VBKyx9H KheaRiackWBUffEPGxvjDuxTsIMXLRXIPMhiKnM1Ss1d3MvvXwlnfrcmO12wzXfoHqtJ 30dw== ARC-Authentication-Results: i=1; mx.google.com; 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 gt17-20020a1709072d9100b0073860fb87ddsi1730324ejc.487.2022.08.24.01.46.06; Wed, 24 Aug 2022 01:46:07 -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; 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 4A0E268BA61; Wed, 24 Aug 2022 11:44:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4B4868BA0E for ; Wed, 24 Aug 2022 11:43:48 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 8F2FF240D20 for ; Wed, 24 Aug 2022 10:43:45 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id AjA_dwMUAMrL for ; Wed, 24 Aug 2022 10:43:45 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id B8325240D1F for ; Wed, 24 Aug 2022 10:43:41 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id A7C273A25BE; Wed, 24 Aug 2022 10:43:35 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Aug 2022 10:43:13 +0200 Message-Id: <20220824084318.333-13-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220824084318.333-1-anton@khirnov.net> References: <20220824084318.333-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/18] lavf/dv: return a meaningful error code from avpriv_dv_produce_packet() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9bkrGyqClNWG --- libavdevice/iec61883.c | 2 +- libavformat/dv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavdevice/iec61883.c b/libavdevice/iec61883.c index 7223ba2e64..a4b4ce2ef8 100644 --- a/libavdevice/iec61883.c +++ b/libavdevice/iec61883.c @@ -209,7 +209,7 @@ static int iec61883_parse_queue_dv(struct iec61883_data *dv, AVPacket *pkt) dv->packets--; if (size < 0) - return -1; + return size; if (av_packet_from_data(pkt, pkt->data, pkt->size) < 0) { av_freep(&pkt->data); diff --git a/libavformat/dv.c b/libavformat/dv.c index f88fe62349..c888111789 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -404,7 +404,7 @@ int avpriv_dv_produce_packet(DVDemuxContext *c, AVPacket *pkt, if (buf_size < DV_PROFILE_BYTES || !(c->sys = av_dv_frame_profile(c->sys, buf, buf_size)) || buf_size < c->sys->frame_size) { - return -1; /* Broken frame, or not enough data */ + return AVERROR_INVALIDDATA; } /* Queueing audio packet */