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 B37E84BC2C for ; Sat, 3 May 2025 17:03:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2BB4E68B75A; Sat, 3 May 2025 20:03:43 +0300 (EEST) Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B083468B63D for ; Sat, 3 May 2025 20:03:36 +0300 (EEST) Received: by mail-ot1-f45.google.com with SMTP id 46e09a7af769-72c40235c34so887627a34.3 for ; Sat, 03 May 2025 10:03:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746291815; x=1746896615; 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=aPaIkTzpqB/Cl+iLFqOyTR4xSYy57CanfqIbG6vYV7w=; b=Hppayyb0u7pypXd5Q4CFnT+9JNxyf5a9vr03IIEdkUFKeSu8xILBliZzLWRZXFnGvR m7/6G9VJrEttRAB/SjzXUpzulWcqStzj1E98qa5E/iXQo3ppPqG3FV3Zko0XscYjHNoj 6aTJ0y9XNCijiPqdUVE8nm+2cDkJu8Ed1iqsN/MQXeT7GSYG5agmg3brrbV210CcP6j1 V1lKCaSDPoLbm2ugX7nhmGoaLU/adcXcsJIk7AFxCvfuhewOiXbb5FmGYriZMPw16oke 0t5ngbO/ITYRv8fg6jr5HWLUcRbYPU4KIysJi1UNy9Mk0xC0B8RFpme7UGD4QzBxJQUf bS8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746291815; x=1746896615; 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=aPaIkTzpqB/Cl+iLFqOyTR4xSYy57CanfqIbG6vYV7w=; b=SJ0Q0OBffDcEwaItRhVs0cP/TKwc4B6ytCWIEhFfdWGEYt40/PhaAlMJc7DG4Xon5b 6z/JPaMfhgyBJY0gG8XA6ntToxtoVyjHZCiHJwFRsCyNAnIoTm+sJ4+R22VmlWZESX5f fgtNBN3S77sxrWJrApojNJpjUdrBRYMcx9dS9Bt4qSibg766Ek9rkT9bedQ3oqNkgUL0 GEAEgVVbR7AxjY4aKib2BxvpWoOzQtKXHm2Ewd1yx6Uv3Yx3UfdLgR9MzDZ5DI+zS8sn 1+tDwupvOdta2fMHaHfRw1urHIJo2eO1paNyq58ze8e0aBbIoAS4QGemVExRtzGb5xW+ 8e8w== X-Gm-Message-State: AOJu0YznK+J5mi1dqRbfPXeshAlQ0K5a6K1q1m8ZQelWtj/X022qj3Gx U3RpAyuxVwMpUs6MPTrTGbTIhkRQ45+djSVBJ0gMel7eWIRP8rx1qILeIDhR X-Gm-Gg: ASbGncthOr5HlM3P6pAX5HgeWKgpGa4LSbjR+obTb43T3bcGu7xsNiZCwjMDNl2l5cx WY7971AncruMEffShktRzjvVtRvjfIA8Cim3RLlehD/qyLd4u8qskFUiN0ElC5mbxWvq2Jmp2Ah JnXA0vVUuLS/amzTgovrVzFlKr/o8of7ugj/uvYEkPWURI2QONwSrKZ+s/o1x0OTst+Pvg/3pi3 xxuycgu6htf6euSvF6/hgY8Ck8AnqAEAkNkavlcyjQlPMTxvccPqbEa2sw6syq50ZimffOOWCv2 bt450djSfvBXlAuSqXS7PZJ2C4k9xBIzmwajwFwjiVtRcABK6LcpWEKBgr0snn6+lWcx19s9t3V mOUEKLYRz/NRdNoOAKg== X-Google-Smtp-Source: AGHT+IG9d9izmfpjspHSZKzYVHBEoNHmB51ZmvotLcxQr56taBG7hBtt3RscpbD93sJtwFI6lFeRJQ== X-Received: by 2002:a05:6830:2a8c:b0:727:345d:3b72 with SMTP id 46e09a7af769-731eadb676cmr1007551a34.16.1746291814930; Sat, 03 May 2025 10:03:34 -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 46e09a7af769-731d34daaedsm917311a34.51.2025.05.03.10.03.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sat, 03 May 2025 10:03:34 -0700 (PDT) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 May 2025 12:03:28 -0500 Message-Id: <20250503170329.46135-2-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250503170329.46135-1-romain.beauxis@gmail.com> References: <20250503170329.46135-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 1/2] libavformat/oggdec.c: Changing the packet() callback API/Return value 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 | 6 ++++++ 2 files changed, 20 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 43df23f4cb..09f698f99a 100644 --- a/libavformat/oggdec.h +++ b/libavformat/oggdec.h @@ -38,6 +38,12 @@ struct ogg_codec { * -1 if an error occurred or for unsupported stream */ int (*header)(AVFormatContext *, int); + /** + * Attempt to process a packet as a data packet + * @return 1 if the packet was a header from a chained bitstream. + * 0 if the packet was a regular data packet. + * -1 if an error occurred or for unsupported stream + */ int (*packet)(AVFormatContext *, int); /** * Translate a granule into a timestamp. -- 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".