*
* 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.
*****************************************************************************/
#include <stdlib.h>
#include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <assert.h>
#include "input_internal.h"
+#undef STREAM_DEBUG
+
/* TODO:
* - tune the 2 methods
* - compute cost for seek
****************************************************************************/
stream_t *__stream_UrlNew( vlc_object_t *p_parent, const char *psz_url )
{
- char *psz_access, *psz_demux, *psz_path, *psz_dup;
+ const char *psz_access, *psz_demux;
+ char *psz_path;
access_t *p_access;
stream_t *p_res;
if( !psz_url ) return 0;
- psz_dup = strdup( psz_url );
+ char psz_dup[strlen (psz_url) + 1];
+ strcpy (psz_dup, psz_url);;
MRLSplit( p_parent, psz_dup, &psz_access, &psz_demux, &psz_path );
/* Now try a real access */
p_access = access2_New( p_parent, psz_access, psz_demux, psz_path, 0 );
- free( psz_dup );
if( p_access == NULL )
{
s->pf_block = NULL;
s->pf_read = NULL; /* Set up later */
s->pf_peek = NULL;
- s->pf_control= AStreamControl;
+ s->pf_control = AStreamControl;
s->pf_destroy = AStreamDestroy;
s->p_sys = p_sys = malloc( sizeof( stream_sys_t ) );
/* UTF16 and UTF32 text file conversion */
s->i_char_width = 1;
s->b_little_endian = VLC_FALSE;
+ s->conv = (vlc_iconv_t)(-1);
/* Common field */
p_sys->p_access = p_access;
b = b->p_next;
}
- if( p_access->info.b_prebuffered )
+ if( p_access->info.b_prebuffered )
{
/* Access has already prebufferred - update stats and exit */
p_sys->stat.i_bytes = p_sys->block.i_size;
if( !b_aseek )
{
- msg_Err( s, "backward seek impossible (access non seekable)" );
+ msg_Err( s, "backward seeking impossible (access not seekable)" );
return VLC_EGENERIC;
}
}
else
{
- /* Read enought data */
+ /* Read enough data */
while( p_sys->block.i_start + p_sys->block.i_size < i_pos )
{
if( AStreamRefillBlock( s ) )
return AStreamSeekStream( s, p_sys->i_pos + i_read ) ? 0 : i_read;
}
-#if 0
+#ifdef STREAM_DEBUG
msg_Dbg( s, "AStreamReadStream: %d pos="I64Fd" tk=%d start="I64Fd
" offset=%d end="I64Fd,
i_read, p_sys->i_pos, p_sys->stream.i_tk,
if( tk->i_start >= tk->i_end ) return 0; /* EOF */
-#if 0
+#ifdef STREAM_DEBUG
msg_Dbg( s, "AStreamPeekStream: %d pos="I64Fd" tk=%d "
"start="I64Fd" offset=%d end="I64Fd,
i_read, p_sys->i_pos, p_sys->stream.i_tk,
int i_new;
int i;
-#if 0
+#ifdef STREAM_DEBUG
msg_Dbg( s, "AStreamSeekStream: to "I64Fd" pos="I64Fd
- "tk=%d start="I64Fd" offset=%d end="I64Fd,
+ " tk=%d start="I64Fd" offset=%d end="I64Fd,
i_pos, p_sys->i_pos, p_sys->stream.i_tk,
p_sys->stream.tk[p_sys->stream.i_tk].i_start,
p_sys->stream.i_offset,
if( i_pos >= p_sys->stream.tk[p_sys->stream.i_tk].i_start &&
i_pos < p_sys->stream.tk[p_sys->stream.i_tk].i_end )
{
- //msg_Dbg( s, "AStreamSeekStream: current track" );
+ stream_track_t *tk = &p_sys->stream.tk[p_sys->stream.i_tk];
+#ifdef STREAM_DEBUG
+ msg_Dbg( s, "AStreamSeekStream: current track" );
+#endif
p_sys->i_pos = i_pos;
- p_sys->stream.i_offset = i_pos - p_sys->stream.tk[p_sys->stream.i_tk].i_start;
+ p_sys->stream.i_offset = i_pos - tk->i_start;
+
+ /* If there is not enough data left in the track, refill */
+ /* \todo How to get a correct value for
+ * - refilling threshold
+ * - how much to refill
+ */
+ if( (tk->i_end - tk->i_start ) - p_sys->stream.i_offset <
+ p_sys->stream.i_read_size )
+ {
+ if( p_sys->stream.i_used < STREAM_READ_ATONCE / 2 )
+ {
+ p_sys->stream.i_used = STREAM_READ_ATONCE / 2 ;
+ AStreamRefillStream( s );
+ }
+ }
return VLC_SUCCESS;
}
if( i_pos >= tk->i_start && i_pos <= tk->i_end )
{
-#if 0
+#ifdef STREAM_DEBUG
msg_Dbg( s, "AStreamSeekStream: reusing %d start="I64Fd
" end="I64Fd, i, tk->i_start, tk->i_end );
#endif
+
/* Seek at the end of the buffer */
if( ASeek( s, tk->i_end ) ) return VLC_EGENERIC;
if( i_toread <= 0 ) return VLC_EGENERIC; /* EOF */
- /* msg_Dbg( s, "AStreamRefillStream: toread=%d", i_toread ); */
+#ifdef STREAM_DEBUG
+ msg_Dbg( s, "AStreamRefillStream: used=%d toread=%d",
+ p_sys->stream.i_used, i_toread );
+#endif
i_start = mdate();
while( i_toread > 0 )
( (p_access->info.i_title > 1 || p_access->info.i_seekpoint > 1) ?
STREAM_CACHE_PREBUFFER_SIZE : STREAM_CACHE_TRACK_SIZE / 3 );
- msg_Dbg( s, "pre buffering" );
+ msg_Dbg( s, "pre-buffering..." );
i_start = mdate();
for( ;; )
{
i_byterate = ( I64C(1000000) * p_sys->stat.i_bytes ) /
(p_sys->stat.i_read_time+1);
- msg_Dbg( s, "prebuffering done "I64Fd" bytes in "I64Fd"s - "
+ msg_Dbg( s, "pre-buffering done "I64Fd" bytes in "I64Fd"s - "
I64Fd" kbytes/s",
p_sys->stat.i_bytes,
p_sys->stat.i_read_time / I64C(1000000),
{
int i_bom_size = 0;
char *psz_encoding = NULL;
-
+
if( p_data[0] == 0xEF && p_data[1] == 0xBB && p_data[2] == 0xBF )
{
psz_encoding = strdup( "UTF-8" );
s->i_char_width = 2;
i_bom_size = 2;
}
- /* Seek past the offset */
- stream_Seek( s, i_bom_size );
- p_data += i_bom_size;
- i_data -= i_bom_size;
+
+ /* Seek past the BOM */
+ if( i_bom_size )
+ {
+ stream_Seek( s, i_bom_size );
+ p_data += i_bom_size;
+ i_data -= i_bom_size;
+ }
/* Open the converter if we need it */
if( psz_encoding != NULL )
{
+ input_thread_t *p_input;
msg_Dbg( s, "%s BOM detected", psz_encoding );
- s->conv = vlc_iconv_open( "UTF-8", psz_encoding );
- if( s->conv == (vlc_iconv_t)-1 )
+ p_input = (input_thread_t *)vlc_object_find( s, VLC_OBJECT_INPUT, FIND_PARENT );
+ if( s->i_char_width > 1 )
+ {
+ s->conv = vlc_iconv_open( "UTF-8", psz_encoding );
+ if( s->conv == (vlc_iconv_t)-1 )
+ {
+ msg_Err( s, "iconv_open failed" );
+ }
+ }
+ if( p_input != NULL)
{
- msg_Err( s, "iconv_open failed" );
+ var_Create( p_input, "subsdec-encoding", VLC_VAR_STRING | VLC_VAR_DOINHERIT );
+ var_SetString( p_input, "subsdec-encoding", "UTF-8" );
+ vlc_object_release( p_input );
}
if( psz_encoding ) free( psz_encoding );
}
if( i_data % s->i_char_width )
{
+ /* keep i_char_width boundary */
+ i_data = i_data - ( i_data % s->i_char_width );
msg_Warn( s, "the read is not i_char_width compatible");
}
+ if( i_data == 0 )
+ break;
+
/* Check if there is an EOL */
- if( ( psz_eol = memchr( p_data, '\n', i_data ) ) )
+ if( s->i_char_width == 1 )
+ {
+ /* UTF-8: 0A <LF> */
+ psz_eol = memchr( p_data, '\n', i_data );
+ }
+ else
{
- if( s->b_little_endian == VLC_TRUE && s->i_char_width > 1 )
+ uint8_t *p = p_data;
+ uint8_t *p_last = p + i_data - s->i_char_width;
+
+ if( s->i_char_width == 2 )
+ {
+ if( s->b_little_endian == VLC_TRUE)
+ {
+ /* UTF-16LE: 0A 00 <LF> */
+ while( p <= p_last && ( p[0] != 0x0A || p[1] != 0x00 ) )
+ p += 2;
+ }
+ else
+ {
+ /* UTF-16BE: 00 0A <LF> */
+ while( p <= p_last && ( p[1] != 0x0A || p[0] != 0x00 ) )
+ p += 2;
+ }
+ }
+ else if( s->i_char_width == 4 )
+ {
+ if( s->b_little_endian == VLC_TRUE)
+ {
+ /* UTF-32LE: 0A 00 00 00 <LF> */
+ while( p <= p_last && ( p[0] != 0x0A || p[1] != 0x00 ||
+ p[2] != 0x00 || p[3] != 0x00 ) )
+ p += 4;
+ }
+ else
+ {
+ /* UTF-32BE: 00 00 00 0A <LF> */
+ while( p <= p_last && ( p[3] != 0x0A || p[2] != 0x00 ||
+ p[1] != 0x00 || p[0] != 0x00 ) )
+ p += 4;
+ }
+ }
+
+ if( p > p_last )
+ {
+ psz_eol = NULL;
+ }
+ else
{
- psz_eol += ( s->i_char_width - 1 );
+ psz_eol = (char *)p + ( s->i_char_width - 1 );
}
+ }
+
+ if(psz_eol)
+ {
i_data = (psz_eol - (char *)p_data) + 1;
p_line = realloc( p_line, i_line + i_data + s->i_char_width ); /* add \0 */
i_data = stream_Read( s, &p_line[i_line], i_data );
if( s->i_char_width > 1 )
{
size_t i_in = 0, i_out = 0;
- char * p_in = NULL;
+ const char * p_in = NULL;
char * p_out = NULL;
char * psz_new_line = NULL;
-
+
/* iconv */
psz_new_line = malloc( i_line );
-
+
i_in = i_out = (size_t)i_line;
p_in = p_line;
p_out = psz_new_line;
-
+
if( vlc_iconv( s->conv, &p_in, &i_in, &p_out, &i_out ) == (size_t)-1 )
{
msg_Err( s, "iconv failed" );
}
/* Remove trailing LF/CR */
- while( i_line > 0 && ( p_line[i_line-2] == '\r' ||
+ while( i_line >= 2 && ( p_line[i_line-2] == '\r' ||
p_line[i_line-2] == '\n') ) i_line--;
/* Make sure the \0 is there */
/* We failed to read any data, probably EOF */
if( p_line ) free( p_line );
- vlc_iconv_close( s->conv );
+ if( s->conv != (vlc_iconv_t)(-1) ) vlc_iconv_close( s->conv );
return NULL;
}
{
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
+ input_thread_t *p_input = NULL;
int i_read_orig = i_read;
+ int i_total = 0;
+
+ if( s->p_parent && s->p_parent->p_parent &&
+ s->p_parent->p_parent->i_object_type == VLC_OBJECT_INPUT )
+ p_input = (input_thread_t *)s->p_parent->p_parent;
if( !p_sys->i_list )
{
i_read = p_access->pf_read( p_access, p_read, i_read );
+ if( p_input )
+ {
+ vlc_object_yield( p_input );
+ vlc_mutex_lock( &p_input->p->counters.counters_lock );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_bytes, i_read,
+ &i_total );
+ stats_UpdateFloat( s, p_input->p->counters.p_input_bitrate,
+ (float)i_total, NULL );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_packets, 1, NULL );
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock );
+ vlc_object_release( p_input );
+ }
return i_read;
}
return AReadStream( s, p_read, i_read_orig );
}
+ /* Update read bytes in input */
+ if( p_input )
+ {
+ vlc_object_yield( p_input );
+ vlc_mutex_lock( &p_input->p->counters.counters_lock );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_bytes, i_read, &i_total );
+ stats_UpdateFloat( s, p_input->p->counters.p_input_bitrate,
+ (float)i_total, NULL );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_packets, 1, NULL );
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock );
+ vlc_object_release( p_input );
+ }
return i_read;
}
{
stream_sys_t *p_sys = s->p_sys;
access_t *p_access = p_sys->p_access;
+ input_thread_t *p_input = NULL;
block_t *p_block;
vlc_bool_t b_eof;
+ int i_total = 0;
+
+ if( s->p_parent && s->p_parent->p_parent &&
+ s->p_parent->p_parent->i_object_type == VLC_OBJECT_INPUT )
+ p_input = (input_thread_t *)s->p_parent->p_parent;
if( !p_sys->i_list )
{
p_block = p_access->pf_block( p_access );
if( pb_eof ) *pb_eof = p_access->info.b_eof;
+ if( p_input && p_block && p_access->p_libvlc->b_stats )
+ {
+ vlc_object_yield( p_input );
+ vlc_mutex_lock( &p_input->p->counters.counters_lock );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_bytes,
+ p_block->i_buffer, &i_total );
+ stats_UpdateFloat( s, p_input->p->counters.p_input_bitrate,
+ (float)i_total, NULL );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_packets, 1, NULL );
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock );
+ vlc_object_release( p_input );
+ }
return p_block;
}
/* We have to read some data */
return AReadBlock( s, pb_eof );
}
-
+ if( p_block )
+ {
+ if( p_input )
+ {
+ vlc_object_yield( p_input );
+ vlc_mutex_lock( &p_input->p->counters.counters_lock );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_bytes,
+ p_block->i_buffer, &i_total );
+ stats_UpdateFloat( s, p_input->p->counters.p_input_bitrate,
+ (float)i_total, NULL );
+ stats_UpdateInteger( s, p_input->p->counters.p_read_packets,
+ 1 , NULL);
+ vlc_mutex_unlock( &p_input->p->counters.counters_lock );
+ vlc_object_release( p_input );
+ }
+ }
return p_block;
}
projects / vlc / blobdiff