/*****************************************************************************
* buffer.c: MMS access plug-in
*****************************************************************************
- * Copyright (C) 2001, 2002 VideoLAN
- * $Id: buffer.c,v 1.2 2002/11/25 00:22:04 fenrir Exp $
+ * Copyright (C) 2001-2004 the VideoLAN team
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
#include "asf.h"
#include "buffer.h"
/*****************************************************************************
* Buffer management functions
*****************************************************************************/
-
int var_buffer_initwrite( var_buffer_t *p_buf, int i_default_size )
{
p_buf->i_size = ( i_default_size > 0 ) ? i_default_size : 2048;
p_buf->i_data = 0;
- if( !( p_buf->p_data = malloc( p_buf->i_size ) ) )
- {
- return( -1 );
- }
- return( 0 );
+ p_buf->p_data = malloc( p_buf->i_size );
+ return p_buf->p_data ? 0 : -1;
}
int var_buffer_reinitwrite( var_buffer_t *p_buf, int i_default_size )
{
p_buf->i_data = 0;
- if( p_buf->i_size < i_default_size )
+ if( p_buf->i_size < i_default_size )
{
p_buf->i_size = i_default_size;
- if( p_buf->p_data )
- {
- free( p_buf->p_data );
- }
+ free( p_buf->p_data );
p_buf->p_data = malloc( p_buf->i_size );
}
if( !p_buf->p_data )
p_buf->i_size = ( i_default_size > 0 ) ? i_default_size : 2048;
p_buf->p_data = malloc( p_buf->i_size );
}
- if( !p_buf->p_data )
- {
- return( -1 );
- }
- return( 0 );
+ return p_buf->p_data ? 0 : -1;
}
void var_buffer_add8 ( var_buffer_t *p_buf, uint8_t i_byte )
if( p_buf->i_data >= p_buf->i_size )
{
p_buf->i_size += 1024;
- p_buf->p_data = realloc( p_buf->p_data, p_buf->i_size );
+ p_buf->p_data = xrealloc( p_buf->p_data, p_buf->i_size );
}
p_buf->p_data[p_buf->i_data] = i_byte&0xff;
p_buf->i_data++;
var_buffer_add32( p_buf, ( i_long >> 32 )&0xffffffff );
}
-
void var_buffer_addmemory( var_buffer_t *p_buf, void *p_mem, int i_mem )
-{
+{
/* check if there is enough data */
if( p_buf->i_data + i_mem >= p_buf->i_size )
{
p_buf->i_size += i_mem + 1024;
- p_buf->p_data = realloc( p_buf->p_data, p_buf->i_size );
+ p_buf->p_data = xrealloc( p_buf->p_data, p_buf->i_size );
}
-
- memcpy( p_buf->p_data + p_buf->i_data,
- p_mem,
- i_mem );
+
+ memcpy( p_buf->p_data + p_buf->i_data, p_mem, i_mem );
p_buf->i_data += i_mem;
}
-void var_buffer_addUTF16( var_buffer_t *p_buf, char *p_str )
+void var_buffer_addUTF16( var_buffer_t *p_buf, const char *p_str )
{
- int i;
+ unsigned int i;
if( !p_str )
{
var_buffer_add16( p_buf, 0 );
}
else
{
- for( i = 0; i < strlen( p_str ) + 1; i++ ) // and 0
+ vlc_iconv_t iconv_handle;
+ size_t i_in = strlen( p_str );
+ size_t i_out = i_in * 4;
+ char *psz_out, *psz_tmp;
+
+ psz_out = psz_tmp = xmalloc( i_out + 1 );
+ iconv_handle = vlc_iconv_open( "UTF-16LE", "UTF-8" );
+ vlc_iconv( iconv_handle, &p_str, &i_in, &psz_tmp, &i_out );
+ vlc_iconv_close( iconv_handle );
+ psz_tmp[0] = '\0';
+ psz_tmp[1] = '\0';
+
+ for( i = 0; ; i += 2 )
{
- var_buffer_add16( p_buf, p_str[i] );
+ uint16_t v = GetWLE( &psz_out[i] );
+ var_buffer_add16( p_buf, v );
+ if( !v )
+ break;
}
+ free( psz_out );
}
}
void var_buffer_free( var_buffer_t *p_buf )
{
- if( p_buf->p_data )
- {
- free( p_buf->p_data );
- }
+ free( p_buf->p_data );
p_buf->i_data = 0;
p_buf->i_size = 0;
}
return( i_byte );
}
-
uint16_t var_buffer_get16( var_buffer_t *p_buf )
{
uint16_t i_b1, i_b2;
-
+
i_b1 = var_buffer_get8( p_buf );
i_b2 = var_buffer_get8( p_buf );
uint32_t var_buffer_get32( var_buffer_t *p_buf )
{
uint32_t i_w1, i_w2;
-
+
i_w1 = var_buffer_get16( p_buf );
i_w2 = var_buffer_get16( p_buf );
uint64_t var_buffer_get64( var_buffer_t *p_buf )
{
uint64_t i_dw1, i_dw2;
-
+
i_dw1 = var_buffer_get32( p_buf );
i_dw2 = var_buffer_get32( p_buf );
}
if( i_copy < 0 )
{
-// fprintf( stderr, "\n**************arrrrrrggggg\n" );
i_copy = 0;
}
p_buf->i_data += i_copy;
void var_buffer_getguid( var_buffer_t *p_buf, guid_t *p_guid )
{
int i;
-
+
p_guid->v1 = var_buffer_get32( p_buf );
p_guid->v2 = var_buffer_get16( p_buf );
p_guid->v3 = var_buffer_get16( p_buf );
p_guid->v4[i] = var_buffer_get8( p_buf );
}
}
-
projects / vlc / blobdiff