From 343680ffea0328c8ec5ca7109858327fa2a63d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com>
Date: Thu, 13 Jun 2024 15:09:01 +0300
Subject: [PATCH] rtp: av1depay: Don't return an error if parsing a packet
 fails

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/merge_requests/1612>
---
 net/rtp/src/av1/depay/imp.rs | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/net/rtp/src/av1/depay/imp.rs b/net/rtp/src/av1/depay/imp.rs
index 2d10188c..8c7d7ceb 100644
--- a/net/rtp/src/av1/depay/imp.rs
+++ b/net/rtp/src/av1/depay/imp.rs
@@ -12,6 +12,7 @@ use gst::{glib, prelude::*, subclass::prelude::*};
 use std::{
     cmp::Ordering,
     io::{Cursor, Read, Seek, SeekFrom},
+    ops::RangeInclusive,
 };
 
 use bitstream_io::{BitReader, BitWriter};
@@ -170,14 +171,18 @@ impl crate::basedepay::RtpBaseDepay2Impl for RTPAv1Depay {
         &self,
         packet: &crate::basedepay::Packet,
     ) -> Result<gst::FlowSuccess, gst::FlowError> {
-        let res = self.handle_rtp_packet(packet);
-
-        if let Err(err) = res {
-            gst::warning!(CAT, imp: self, "Failed to handle RTP packet: {err:?}");
-            self.reset(&mut self.state.borrow_mut());
+        match self.handle_rtp_packet(packet) {
+            Ok(Some((seqnums, buffer))) => self
+                .obj()
+                .queue_buffer(PacketToBufferRelation::Seqnums(seqnums), buffer),
+            Ok(None) => Ok(gst::FlowSuccess::Ok),
+            Err(err) => {
+                gst::warning!(CAT, imp: self, "Failed to handle RTP packet: {err:?}");
+                self.reset(&mut self.state.borrow_mut());
+                self.obj().drop_packets(..=packet.ext_seqnum());
+                Ok(gst::FlowSuccess::Ok)
+            }
         }
-
-        res
     }
 }
 
@@ -185,7 +190,7 @@ impl RTPAv1Depay {
     fn handle_rtp_packet(
         &self,
         packet: &crate::basedepay::Packet,
-    ) -> Result<gst::FlowSuccess, gst::FlowError> {
+    ) -> Result<Option<(RangeInclusive<u64>, gst::Buffer)>, gst::FlowError> {
         gst::trace!(
             CAT,
             imp: self,
@@ -390,15 +395,11 @@ impl RTPAv1Depay {
                 self.obj().drop_packets(..=packet.ext_seqnum());
             }
         }
-        drop(state);
 
         if let Some(buffer) = buffer {
-            self.obj().queue_buffer(
-                PacketToBufferRelation::Seqnums(start_ext_seqnum..=packet.ext_seqnum()),
-                buffer,
-            )
+            Ok(Some((start_ext_seqnum..=packet.ext_seqnum(), buffer)))
         } else {
-            Ok(gst::FlowSuccess::Ok)
+            Ok(None)
         }
     }