update nack and tests

Author: Rain Liu

Cargo.toml

@@ -13,3 +13,7 @@ repository = "https://github.com/webrtc-rs/rtcp"
 util = { package = "webrtc-util", version = "0.5.0", default-features = false, features = ["marshal"] }
 bytes = "1.1.0"
 thiserror = "1.0"
+
+[dev-dependencies]
+tokio = { version = "1.12.0", features = ["sync"] }
+tokio-test = "0.4.2"

src/transport_feedbacks/transport_layer_cc/mod.rs

@@ -499,20 +499,10 @@ impl Packet for TransportLayerCc {
     fn raw_size(&self) -> usize {
         let mut n = HEADER_LENGTH + PACKET_CHUNK_OFFSET + self.packet_chunks.len() * 2;
         for d in &self.recv_deltas {
-            let delta = d.delta / TYPE_TCC_DELTA_SCALE_FACTOR;
-
             // small delta
-            if d.type_tcc_packet == SymbolTypeTcc::PacketReceivedSmallDelta
-                && delta >= 0
-                && delta <= u8::MAX as i64
-            {
+            if d.type_tcc_packet == SymbolTypeTcc::PacketReceivedSmallDelta {
                 n += 1;
-            }
-
-            if d.type_tcc_packet == SymbolTypeTcc::PacketReceivedLargeDelta
-                && delta >= i16::MIN as i64
-                && delta <= i16::MAX as i64
-            {
+            } else {
                 n += 2
             }
         }

src/transport_feedbacks/transport_layer_nack/transport_layer_nack_test.rs

@@ -1,5 +1,7 @@
 use super::*;
 use bytes::Bytes;
+use std::sync::Arc;
+use tokio::sync::Mutex;
 
 #[test]
 fn test_transport_layer_nack_unmarshal() {
@@ -190,6 +192,52 @@ fn test_nack_pair() {
     );
 }
 
+#[tokio::test]
+async fn test_nack_pair_range() {
+    let n = NackPair {
+        packet_id: 42,
+        lost_packets: 2,
+    };
+
+    let out = Arc::new(Mutex::new(vec![]));
+    let out1 = Arc::clone(&out);
+    n.range(Box::new(
+        move |s: u16| -> Pin<Box<dyn Future<Output = bool> + Send + 'static>> {
+            let out2 = Arc::clone(&out1);
+            Box::pin(async move {
+                let mut o = out2.lock().await;
+                o.push(s);
+                true
+            })
+        },
+    ))
+    .await;
+
+    {
+        let o = out.lock().await;
+        assert_eq!(*o, &[42, 44]);
+    }
+
+    let out = Arc::new(Mutex::new(vec![]));
+    let out1 = Arc::clone(&out);
+    n.range(Box::new(
+        move |s: u16| -> Pin<Box<dyn Future<Output = bool> + Send + 'static>> {
+            let out2 = Arc::clone(&out1);
+            Box::pin(async move {
+                let mut o = out2.lock().await;
+                o.push(s);
+                false
+            })
+        },
+    ))
+    .await;
+
+    {
+        let o = out.lock().await;
+        assert_eq!(*o, &[42]);
+    }
+}
+
 #[test]
 fn test_transport_layer_nack_pair_generation() {
     let test = vec![