Changeset 12659dbfad0e0eaeee78aeb91416fcf3732beea6

Timestamp:

27/02/07 21:02:15 (2 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1172606535 +0000

git-parent:

[b160af605b251682ad86348cc4e07287084e891c]

git-author:

Laurent Aimar <fenrir@videolan.org> 1172606535 +0000

Message:

Fixed H264 rtp packetization.
Force a TTL value of 1 if not defined instead of refusing to start.
(Any suggestion about a better failsafe value ?)

Files:

• modules/stream_out/rtp.c (modified) (2 diffs)

modules/stream_out/rtp.c

@@ -392 +392 @@
-    if( val.i_int < 0 )
-    {
-
-
-
+
+
-    }
-    p_sys->i_ttl = val.i_int;
@@ -2414 +2413 @@
-
-/* rfc3984 */
+static int rtp_packetize_h264_nal( sout_stream_t *p_stream, sout_stream_id_t *id,
+                                   const uint8_t *p_data, int i_data, int64_t i_pts, int64_t i_dts, vlc_bool_t b_last, int64_t i_length )
+{
+    const int i_max = id->i_mtu - 12; /* payload max in one packet */
+    int i_nal_hdr;
+    int i_nal_type;
+
+    if( i_data < 5 )
+        return VLC_SUCCESS;
+
+    i_nal_hdr = p_data[3];
+    i_nal_type = i_nal_hdr&0x1f;
+    if( i_nal_type == 7 || i_nal_type == 8 )
+    {
+        /* XXX Why do you want to remove them ? It will break streaming with 
+         * SPS/PPS change (broadcast) ? */
+        return VLC_SUCCESS;
+    }
+
+    /* Skip start code */
+    p_data += 3;
+    i_data -= 3;
+
+    /* */
+    if( i_data <= i_max )
+    {
+        /* Single NAL unit packet */
+        block_t *out = block_New( p_stream, 12 + i_data );
+        out->i_dts    = i_dts;
+        out->i_length = i_length;
+
+        /* */
+        rtp_packetize_common( id, out, b_last, i_pts );
+        out->i_buffer = 12 + i_data;
+
+        memcpy( &out->p_buffer[12], p_data, i_data );
+
+        rtp_packetize_send( id, out );
+    }
+    else
+    {
+        /* FU-A Fragmentation Unit without interleaving */
+        const int i_count = ( i_data-1 + i_max-2 - 1 ) / (i_max-2);
+        int i;
+
+        p_data++;
+        i_data--;
+
+        for( i = 0; i < i_count; i++ )
+        {
+            const int i_payload = __MIN( i_data, i_max-2 );
+            block_t *out = block_New( p_stream, 12 + 2 + i_payload );
+            out->i_dts    = i_dts + i * i_length / i_count;
+            out->i_length = i_length / i_count;
+
+            fprintf( stderr, "FU-A: payload=%d hdr=0x%x\n", i_payload, i_nal_hdr);
+
+            /* */
+            rtp_packetize_common( id, out, (b_last && i_payload == i_data), i_pts );
+            out->i_buffer = 14 + i_payload;
+
+            /* FU indicator */
+            out->p_buffer[12] = 0x00 | (i_nal_hdr & 0x60) | 28;
+            /* FU header */
+            out->p_buffer[13] = ( i == 0 ? 0x80 : 0x00 ) | ( (i == i_count-1) ? 0x40 : 0x00 )  | i_nal_type;
+            memcpy( &out->p_buffer[14], p_data, i_payload );
+
+            rtp_packetize_send( id, out );
+
+            i_data -= i_payload;
+            p_data += i_payload;
+        }
+    }
+    return VLC_SUCCESS;
+}
+
-static int rtp_packetize_h264( sout_stream_t *p_stream, sout_stream_id_t *id,
-                               block_t *in )
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    return VLC_SUCCESS;