fix clippy

Author: HITGIF

rtp/src/codecs/av1/av1_test.rs

@@ -6,7 +6,7 @@ use crate::error::Result;
 
 use super::*;
 
-const OBU_EXTENSION_S1T1: u8 = 0b001_01_000;
+const OBU_EXTENSION_S1T1: u8 = 0b0010_1000;
 const NEW_CODED_VIDEO_SEQUENCE_BIT: u8 = 0b00_00_1000;
 
 struct Av1Obu {
@@ -395,8 +395,8 @@ fn test_split_single_obu_into_many_packets() -> Result<()> {
         ret.extend(vec![27; 98]);
         ret
     });
-    for i in 1..12 {
-        assert_eq!(result[i], {
+    for packet in result.iter().take(12).skip(1) {
+        assert_eq!(packet.to_vec(), {
             let mut ret = vec![
                 0b11_01_0000, // aggregation header
             ];

rtp/src/codecs/av1/obu.rs

@@ -7,9 +7,9 @@ use crate::codecs::av1::leb128::read_leb128;
 use crate::error::Result;
 use crate::Error::{ErrPayloadTooSmallForObuExtensionHeader, ErrPayloadTooSmallForObuPayloadSize};
 
-pub const OBU_HAS_EXTENSION_BIT: u8 = 0b0_0000_100;
-pub const OBU_HAS_SIZE_BIT: u8 = 0b0_0000_010;
-pub const OBU_TYPE_MASK: u8 = 0b0_1111_000;
+pub const OBU_HAS_EXTENSION_BIT: u8 = 0b0000_0100;
+pub const OBU_HAS_SIZE_BIT: u8 = 0b0000_0010;
+pub const OBU_TYPE_MASK: u8 = 0b0111_1000;
 
 pub const OBU_TYPE_SEQUENCE_HEADER: u8 = 1;
 pub const OBU_TYPE_TEMPORAL_DELIMITER: u8 = 2;

rtp/src/codecs/av1/packetizer.rs

@@ -176,11 +176,7 @@ pub fn packetize(obus: &Vec<Obu>, mtu: usize) -> Vec<PacketMetadata> {
 
 /// Returns the aggregation header for the packet.
 /// Reference: https://aomediacodec.github.io/av1-rtp-spec/#44-av1-aggregation-header
-pub fn get_aggregation_header(
-    obus: &Vec<Obu>,
-    packets: &Vec<PacketMetadata>,
-    packet_index: usize,
-) -> u8 {
+pub fn get_aggregation_header(obus: &[Obu], packets: &[PacketMetadata], packet_index: usize) -> u8 {
     let packet = &packets[packet_index];
     let mut header: u8 = 0;
 
@@ -233,11 +229,9 @@ pub fn get_aggregation_header(
 /// Returns the number of additional bytes needed to store the previous OBU
 /// element if an additional OBU element is added to the packet.
 fn additional_bytes_for_previous_obu_element(packet: &PacketMetadata) -> usize {
-    if packet.packet_size == 0 {
-        // Packet is still empty => no last OBU element, no need to reserve space
-        // for it.
-        0
-    } else if packet.num_obu_elements > MAX_NUM_OBUS_TO_OMIT_SIZE {
+    if packet.packet_size == 0 || packet.num_obu_elements > MAX_NUM_OBUS_TO_OMIT_SIZE {
+        // Packet is still empty => no last OBU element, no need to reserve space for it.
+        //  OR
         // There are so many obu elements in the packet, all of them must be
         // prepended with the length field. That imply space for the length of the
         // last obu element is already reserved.
@@ -256,7 +250,7 @@ fn max_fragment_size(remaining_bytes: usize) -> usize {
     }
     let mut i = 1;
     loop {
-        if remaining_bytes < (1 << 7 * i) + i {
+        if remaining_bytes < (1 << (7 * i)) + i {
             return remaining_bytes - i;
         }
         i += 1;