From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id AC7924E310 for ; Tue, 6 May 2025 14:20:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B8C2368B5C9; Tue, 6 May 2025 17:19:46 +0300 (EEST) Received: from mail-oa1-f44.google.com (mail-oa1-f44.google.com [209.85.160.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BAE968B277 for ; Tue, 6 May 2025 17:19:39 +0300 (EEST) Received: by mail-oa1-f44.google.com with SMTP id 586e51a60fabf-2d5e5e21b92so3759665fac.0 for ; Tue, 06 May 2025 07:19:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746541178; x=1747145978; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=2ebKfhrN4UyZ4rYzlKAkpHC3JzTRiUDcwqKW29KBXE8=; b=LyJq+vH2mhhsVkJ1++ACNJuOeN4YXbcwxWqcPLVMEFv2MJMd+CkX49OUk4SdmtXarf 4rN4tCjoIH7bM7Esimc7tEGdHktBPqw1lLs9UMN/VAunFqqZvhwTfppVR/NTCorXGbHB tUhKDG0pOKqA81nxV9zaGUBnbc3nYyQXeM83sp+mb9CAtSBbldHAa1OknUmzb0xUNWry 7jUi1J/YkA0VxXe+h7aiKfcROGRC8td0q5WQ5LDkz8u1p/rePOFY/1DXUOIWonHz6HIl oTT0lKXH2dDMeaokRBRfQKK3y+wPEfMg6UUK+7pHYVJ03knBqJAHy1JA7VviBHrPspGS UwFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746541178; x=1747145978; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2ebKfhrN4UyZ4rYzlKAkpHC3JzTRiUDcwqKW29KBXE8=; b=Bp1ezJc2RGvjJ4Y40yfcJKz+cLowJRH4Hx25+cga2SfxLQwhDnEAPboKFZ6APMt3f5 44FnGVT9MUKtGktsV4xKWzAlpGB7V7yY8AqzKM2LcPq9nMOYtMoAkQLcOLanAhH6N3PX PgPkxl3rASQZPS25y4xh6R3sKgEd4GcpTqOhu5xNYvYhOWQ7b0mmPPac2Pm04R5wY/gh HPDRhlQNsk0tRezQRic36gLbW6MoCVojeYrvSk85wpclijAX1+XxRHzYieo9iuP+wCSy tDRQmXqd2EDtpqi9YXq7dnRcxn6RVwl+blSiZLyoO5cPsT2JjbmewrcAcKNRz4hN8X6P fKOg== X-Gm-Message-State: AOJu0Yx8PSExXdsydzWeQMNWVzMWdsOa9+Hm1FQGZAwMk7whZXaYnrlc 3pOU2Stk25r6F7X3qw8z/yc2KIUso736FIS2n0sUrfTs/s1tOVP/mgPrHLxG X-Gm-Gg: ASbGnctInwSB5ZHhV2pt9MYqg5KW9IEBvfYca/ywkG6RSqa6/t7O0eoY2Xi/kwzKfgR kJYP9mkX+BNh8SRMow+XI7il2awelrC37pU2gv7yJwWvWT24Npu1btYVN+VunXwKnyZ1x4xI4TO vMv9XcE7I58JulA8ew6WDEKmsIub1NDqGRwzQrZFoJe3/ZmC3JfC4hIa1V0zxxaV112XRpda5aI Uz6usoJLUDP5vG7OfHbYaUK+FgkwNJsaULUASa6abKdWPNPjWr4SiqNUsiAVzUqDa/mVeBFZi41 hTCpBTASrvtvTeTpHhQT6mqCR+C65iYL4b1F4LzIIJTf4sPrGEDRpLO/Ln/TxBdOYnqCqy2tBky txlxYbKD8uuz1hpd0Xg== X-Google-Smtp-Source: AGHT+IGgskw8Kq6ACPgznnDmaxWKb4kq3R9SXja84jb9TtpcDK8nbKpKJa0M4CaN5E9A6vvvnshk5g== X-Received: by 2002:a05:6871:2b0e:b0:2c2:2d0f:40a3 with SMTP id 586e51a60fabf-2dae861ab65mr6624489fac.31.1746541177745; Tue, 06 May 2025 07:19:37 -0700 (PDT) Received: from macbookpro.lan (ip72-211-125-114.no.no.cox.net. [72.211.125.114]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-2daa12508ccsm2713442fac.43.2025.05.06.07.19.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:19:37 -0700 (PDT) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 May 2025 09:19:28 -0500 Message-Id: <20250506141932.73142-3-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250506141932.73142-1-romain.beauxis@gmail.com> References: <20250506141932.73142-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 2/6] libavformat/oggdec.{c, h}: Implement packet skip on packet return value of 1 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 Cc: Romain Beauxis Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavformat/oggdec.c | 22 ++++++++++++++-------- libavformat/oggdec.h | 1 + 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 5339fdd32c..9baf8040a9 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -605,20 +605,26 @@ static int ogg_packet(AVFormatContext *s, int *sid, int *dstart, int *dsize, } else { os->pflags = 0; os->pduration = 0; + + ret = 0; if (os->codec && os->codec->packet) { if ((ret = os->codec->packet(s, idx)) < 0) { av_log(s, AV_LOG_ERROR, "Packet processing failed: %s\n", av_err2str(ret)); return ret; } } - if (sid) - *sid = idx; - if (dstart) - *dstart = os->pstart; - if (dsize) - *dsize = os->psize; - if (fpos) - *fpos = os->sync_pos; + + if (!ret) { + if (sid) + *sid = idx; + if (dstart) + *dstart = os->pstart; + if (dsize) + *dsize = os->psize; + if (fpos) + *fpos = os->sync_pos; + } + os->pstart += os->psize; os->psize = 0; if(os->pstart == os->bufpos) diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h index 5225b77a07..bc670d0f1e 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -43,6 +43,7 @@ struct ogg_codec { * @return < 0 (AVERROR) code or -1 on error * == 0 if the packet was a regular data packet. * == 0 or 1 if the packet was a header from a chained bitstream. + * (1 will cause the packet to be skiped in calling code (ogg_packet()) */ int (*packet)(AVFormatContext *, int); /** -- 2.39.5 (Apple Git-154) _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".