Changeset c1993b6231c7b60f79fbac60215c9d1e3dd2edd9

Timestamp:

25/02/07 12:39:42 (2 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[e732cff5c58c4ef4df7f7869405f7002aed94036]

git-author:

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

Message:

Added vlc_b64_encode_binary (include/vlc_strings.h is not that a good place).
Use vlc_b64_encode_binary and remove ap_* in rtp.c
Fixed 2 invalid memory access and 1 stack corruption in rtp.c (Fixed
the report of rtp segfault with gcc 4.1 by xxcv)

Files:

• include/vlc_strings.h (modified) (1 diff)
• modules/stream_out/rtp.c (modified) (4 diffs)
• src/text/strings.c (modified) (2 diffs)

include/vlc_strings.h

@@ -39 +39 @@
-VLC_EXPORT( char *, convert_xml_special_chars, ( const char *psz_content ) );
-
+VLC_EXPORT( char *, vlc_b64_encode_binary, ( const uint8_t *, size_t ) );
-VLC_EXPORT( char *, vlc_b64_encode, ( const char * ) );
-

modules/stream_out/rtp.c

@@ -437 +437 @@
-    {
-        sout_access_out_t *p_grab;
-
+
+
-
-        if( b_rtsp )
@@ -937 +938 @@
-    }
-    s[2*i_data] = '\0';
-}
-
-static const char basis_64[] =
-    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-int ap_base64encode_len(int len)
-{
-    return ((len + 2) / 3 * 4) + 1;
-}
-
-int ap_base64encode_binary(char *encoded,
-                                       const unsigned char *string, int len)
-{
-    int i;
-    char *p;
-
-    p = encoded;
-    for (i = 0; i < len - 2; i += 3) {
-        *p++ = basis_64[(string[i] >> 2) & 0x3F];
-        *p++ = basis_64[((string[i] & 0x3) << 4) |
-                        ((int) (string[i + 1] & 0xF0) >> 4)];
-        *p++ = basis_64[((string[i + 1] & 0xF) << 2) |
-                        ((int) (string[i + 2] & 0xC0) >> 6)];
-        *p++ = basis_64[string[i + 2] & 0x3F];
-    }
-    if (i < len) {
-        *p++ = basis_64[(string[i] >> 2) & 0x3F];
-        if (i == (len - 1)) {
-            *p++ = basis_64[((string[i] & 0x3) << 4)];
-            *p++ = '=';
-        }
-        else {
-            *p++ = basis_64[((string[i] & 0x3) << 4) |
-                            ((int) (string[i + 1] & 0xF0) >> 4)];
-            *p++ = basis_64[((string[i + 1] & 0xF) << 2)];
-        }
-        *p++ = '=';
-    }
-
-    *p++ = '\0';
-    return p - encoded;
-}
-
-int ap_base64encode(char *encoded, const char *string, int len)
-{
-    return ap_base64encode_binary(encoded, (const unsigned char *) string, len);
-}
-
-char *b64_encode(char *buf, int len)
-{
-    int elen;
-    char *out;
-
-    if(len == 0)
-        len = strlen(buf);
-
-    elen = ap_base64encode_len(len);
-    out = (char *) malloc(sizeof(char) * (elen + 1));
-
-    ap_base64encode(out, buf, len);
-
-    return out;
-}
-
@@ -1156 +1095 @@
-            id->psz_rtpmap = strdup( "H264/90000" );
-            id->pf_packetize = rtp_packetize_h264;
+            id->psz_fmtp = NULL;
+
-            if( p_fmt->i_extra > 0 )
-            {
@@ -1162 +1103 @@
-                char    *p_64_sps = NULL;
-                char    *p_64_pps = NULL;
-
++1
-
-                while( i_buffer > 4 && 
-
-
+   
+   
-                {
-                    const int i_nal_type = p_buffer[4]&0x1f;
-    = 1
+
-                    int i_size      = 0;
-                    int i_startcode = 0;
-                    int i_encoded   = 0;
-
-                    msg_Dbg( p_stream, "we found a startcode for NAL with TYPE:%d", i_nal_type );
-
-
+
+
-                    {
-                        if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 )
-                        {
-                            /* we found another startcode */
-tartcod
+iz
-                            break;
-                        } 
-                    }
-                    i_size = i_startcode ? i_startcode : i_buffer;
-                    if( i_nal_type == 7 )
-                    {
-
-
-
+
-                        sprintf_hexa( hexa, &p_buffer[5], 3 );
-                        hexa[6] = '\0'; 
-                    }
-
+else 
-                    {
-
-
-
+
-                    }
-                    i_buffer -= i_size;
-                    p_buffer += i_size;
-                }
-
-
-
-
+
+
+
+
+
+
+
-            }
-else
+if( !id->psz_fmtp )
-                id->psz_fmtp = strdup( "packetization-mode=1" );
-if( p_fmt->i_extra > 0 )
-msg_Dbg( p_stream, "WE HAVE %d bytes extra data", p_fmt->i_extra );
-            break;
-

src/text/strings.c

@@ -330 +330 @@
-
-/* Base64 encoding */
-( const char *
+_binary( const uint8_t *src, size_t i_
-{
-    static const char b64[] =
-           "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-
-
-
-
+
+
+
+
-    if( dst == NULL )
-        return NULL;
-
-
-
-
+
-    {
-        /* pops (up to) 3 bytes of input, push 4 bytes */
-
-
+
+
+
+
+
-        v = v << 6;
-
-
-
-
+
+
+
+
-        v = v << 6;
-
-
-
-
+
+
+
+
-        v = v << 6;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-
@@ -375 +374 @@
-
-    return ret;
+}
+
+char *vlc_b64_encode( const char *src )
+{
+    if( src )
+        return vlc_b64_encode_binary( (const uint8_t*)src, strlen(src) );
+    else
+        return vlc_b64_encode_binary( (const uint8_t*)"", 0 );
-}
-