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 DFDFD4C800 for ; Fri, 9 May 2025 23:44:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B5FA368C74E; Sat, 10 May 2025 02:44:06 +0300 (EEST) Received: from mail-oo1-f52.google.com (mail-oo1-f52.google.com [209.85.161.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0933E68C477 for ; Sat, 10 May 2025 02:43:41 +0300 (EEST) Received: by mail-oo1-f52.google.com with SMTP id 006d021491bc7-601b6146b9cso1421225eaf.0 for ; Fri, 09 May 2025 16:43:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746834219; x=1747439019; 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=PzYXFFx6JMiRU445VwQObddYUw6cQ5lbE0rT9i4kMa2tfDAbrKPFl6a5ld8aCcRrk1 odxzqTA0wWFKQnltdt1X1WLey+J+PENJ/DctcH6JeeCXEU3AccXPv7JcEmfSDXZMqBad Umj8nMF9+wqFVptkjpHFosmbwUQZ4KgCYN0XeL+PR2iDNbBCEA1KU7JRG0mBgkrs1y6l 3r7wnkhPWBEiOBdpxNo11US+8lWp9mCDEaP3ZkUYWa/qshekwDaqhrTcuheL2KI9uItk Fbq/HeBftOabLkc0uiydwff6TcbPZDxbQKfRnB4mJZ+IcQN3Qe4aEl3J7FUPoS9VIkVU 17IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746834219; x=1747439019; 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=Da1RRjeANVuWO6LcgPhkU3AZgTQF9KGmW4eD6nirZQSckESZsLVlIFVITXbJ4p2cv9 VeCBDbceOnhbfEXgf2deSOVeT4F4pgE6tytv0iHO+RPxUw7ses6OWm3fxpMAQ5NwRxXB jrCmIRi3CJHGSSaS5u2BLC4K+nQ6T+d9Ey3oEwtsiI5o79KMRfuz2wCFxv2pkj1uMa+c FkHNgXny9jsJrd+F15k2AK/xQNJY4bn2JIQfQWwFbViKNpr4DIZHEhvUD6uVpQxl25XT uRSZy8RNujEls2jrxwByqxISdZdCtUsKTrXvSFO97E0WadC+/2OjNE5qdNfNgzbgF/mD ZUug== X-Gm-Message-State: AOJu0YxqtUZ/pFor0QYaGvO21YXsFA5iApT0Ap4MbS/ny9uUaztB+FnK z3wB+BB+39+D/iDrIWNLhA3avBUqC/kbvCrZ22PRDL8M3OJv25WVjYCD1GbH X-Gm-Gg: ASbGncucfbwmqdKlLN3AKoH3j4ItlskdTj4Kg+5F+iOU2PGCj/V7GQ7t/xhMBa9OjKv S3pGxMGqOLj6fiYdfIzGf8sUy+x0xB3yFXGOmblw0qjI7M306KWzKyW8T8j92QlYZavsrvMwjJz wLvVdEfk5ZaeobI5CUvGe2tFRuEk6nB9BX6jRu3pIDsmRHIwi7+p8gw4ehVrvfAwXo7W87vSjww 0BYugZ00v5ybWcJQmPMU2pG0Q8MV3hnGlYPzsDVNsE9L/683eq29FDg5gAsKpysna3E4nD73uRK iIfAhu0u92sADC9Hwtwb66TRmTp3GsX3TPtY3HPeRVoKTpDRhW22bMnT2MsYtKVTNI3QR5xsRKu LpG00IE7SsWseeHFXIdNjnWZ3fYg= X-Google-Smtp-Source: AGHT+IHFvYnzjH4Gj93n2iP5SNWNlOySWi/1O2hCyDQFxBqnJr9PPV+gKexdeCv/t5qR24zspsHVdA== X-Received: by 2002:a05:6820:290d:b0:606:293f:d2da with SMTP id 006d021491bc7-6084c0e1f84mr3238635eaf.8.1746834219259; Fri, 09 May 2025 16:43:39 -0700 (PDT) Received: from localhost.localdomain ([2607:fb90:e33e:5272:5990:2d1e:9f2e:c4de]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-6083fe52271sm668499eaf.21.2025.05.09.16.43.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 09 May 2025 16:43:38 -0700 (PDT) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Fri, 9 May 2025 18:43:22 -0500 Message-Id: <20250509234327.71039-3-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250509234327.71039-1-romain.beauxis@gmail.com> References: <20250509234327.71039-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 2/7] 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".