Commit 21a37621 authored by Laurent Aimar's avatar Laurent Aimar
Browse files

* asf, b4s: warning fixes.

 * ts: - set BLOCK_FLAG_CORRUPTED on transport_error_indicator.
       - better support of EIT + VLC_META_NOW_PLAYING.
parent ec88aa05
...@@ -904,7 +904,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s, ...@@ -904,7 +904,7 @@ static int ASF_ReadObject_extended_stream_properties( stream_t *s,
else else
{ {
/* This p_sp will be inserted by ReadRoot later */ /* This p_sp will be inserted by ReadRoot later */
p_esp->p_sp = p_sp; p_esp->p_sp = (asf_object_stream_properties_t*)p_sp;
} }
} }
......
...@@ -114,7 +114,8 @@ static int Demux( demux_t *p_demux ) ...@@ -114,7 +114,8 @@ static int Demux( demux_t *p_demux )
{ {
demux_sys_t *p_sys = p_demux->p_sys; demux_sys_t *p_sys = p_demux->p_sys;
playlist_t *p_playlist; playlist_t *p_playlist;
playlist_item_t *p_item, *p_current, *p_bitrate, *p_genre; playlist_item_t *p_item, *p_current;
playlist_item_t *p_bitrate = NULL, *p_genre = NULL;
vlc_bool_t b_play; vlc_bool_t b_play;
int i_ret; int i_ret;
...@@ -125,10 +126,10 @@ static int Demux( demux_t *p_demux ) ...@@ -125,10 +126,10 @@ static int Demux( demux_t *p_demux )
int i_type, b_shoutcast; int i_type, b_shoutcast;
char *psz_mrl = NULL, *psz_name = NULL, *psz_genre = NULL; char *psz_mrl = NULL, *psz_name = NULL, *psz_genre = NULL;
char *psz_now = NULL, *psz_listeners = NULL, *psz_bitrate = NULL; char *psz_now = NULL, *psz_listeners = NULL, *psz_bitrate = NULL;
b_shoutcast = p_sys->b_shout; b_shoutcast = p_sys->b_shout;
p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST, p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
FIND_PARENT ); FIND_PARENT );
if( !p_playlist ) if( !p_playlist )
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
* Preamble * Preamble
*****************************************************************************/ *****************************************************************************/
#include <stdlib.h> /* malloc(), free() */ #include <stdlib.h> /* malloc(), free() */
#include <ctype.h>
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/input.h> #include <vlc/input.h>
...@@ -1402,6 +1403,8 @@ static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk ) ...@@ -1402,6 +1403,8 @@ static vlc_bool_t GatherPES( demux_t *p_demux, ts_pid_t *pid, block_t *p_bk )
{ {
msg_Dbg( p_demux, "transport_error_indicator set (pid=%d)", msg_Dbg( p_demux, "transport_error_indicator set (pid=%d)",
pid->i_pid ); pid->i_pid );
if( pid->es->p_pes ) //&& pid->es->fmt.i_cat == VIDEO_ES )
pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED;
} }
if( p_demux->p_sys->csa ) if( p_demux->p_sys->csa )
...@@ -2111,10 +2114,21 @@ static void DecodeMjd( int i_mjd, int *p_y, int *p_m, int *p_d ) ...@@ -2111,10 +2114,21 @@ static void DecodeMjd( int i_mjd, int *p_y, int *p_m, int *p_d )
} }
} }
#endif #endif
static void EITEventFixString( char *psz )
{
int i_len;
/* Sometimes the first char isn't a normal char but designed
* caracters encoding, for now lets skip it */
if( isalnum(psz[0]) )
return;
if( ( i_len = strlen( psz ) ) > 0 )
memmove( &psz[0], &psz[1], i_len ); /* Copy the \0 too */
}
static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
{ {
dvbpsi_eit_event_t *p_evt; dvbpsi_eit_event_t *p_evt;
vlc_meta_t *p_meta;
vlc_bool_t b_event_active = VLC_FALSE;
msg_Dbg( p_demux, "EITCallBack called" ); msg_Dbg( p_demux, "EITCallBack called" );
if( !p_eit->b_current_next ) if( !p_eit->b_current_next )
...@@ -2130,9 +2144,9 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) ...@@ -2130,9 +2144,9 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
p_eit->i_ts_id, p_eit->i_network_id, p_eit->i_ts_id, p_eit->i_network_id,
p_eit->i_segment_last_section_number, p_eit->i_last_table_id ); p_eit->i_segment_last_section_number, p_eit->i_last_table_id );
p_meta = vlc_meta_New();
for( p_evt = p_eit->p_first_event; p_evt; p_evt = p_evt->p_next ) for( p_evt = p_eit->p_first_event; p_evt; p_evt = p_evt->p_next )
{ {
vlc_meta_t *p_meta = vlc_meta_New();
dvbpsi_descriptor_t *p_dr; dvbpsi_descriptor_t *p_dr;
char *psz_cat = malloc( strlen("Event")+10 ); char *psz_cat = malloc( strlen("Event")+10 );
char psz_start[15]; char psz_start[15];
...@@ -2176,6 +2190,8 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) ...@@ -2176,6 +2190,8 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
memcpy( psz_text, pE->i_text, pE->i_text_length ); memcpy( psz_text, pE->i_text, pE->i_text_length );
psz_text[pE->i_text_length] = '\0'; psz_text[pE->i_text_length] = '\0';
EITEventFixString(psz_name);
EITEventFixString(psz_text);
msg_Dbg( p_demux, " - short event lang=%3.3s '%s' : '%s'", msg_Dbg( p_demux, " - short event lang=%3.3s '%s' : '%s'",
pE->i_iso_639_code, psz_name, psz_text ); pE->i_iso_639_code, psz_name, psz_text );
} }
...@@ -2196,10 +2212,12 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) ...@@ -2196,10 +2212,12 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
memcpy( str1, pE->i_item_description[i], memcpy( str1, pE->i_item_description[i],
pE->i_item_description_length[i] ); pE->i_item_description_length[i] );
str1[pE->i_item_description_length[i]] = '\0'; str1[pE->i_item_description_length[i]] = '\0';
EITEventFixString(str1);
memcpy( str1, pE->i_item[i], memcpy( str2, pE->i_item[i],
pE->i_item_length[i] ); pE->i_item_length[i] );
str2[pE->i_item_length[i]] = '\0'; str2[pE->i_item_length[i]] = '\0';
EITEventFixString(str2);
msg_Dbg( p_demux, " - desc='%s' item='%s'", str1, str2 ); msg_Dbg( p_demux, " - desc='%s' item='%s'", str1, str2 );
psz_extra = realloc( psz_extra, psz_extra = realloc( psz_extra,
...@@ -2213,6 +2231,8 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) ...@@ -2213,6 +2231,8 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
memcpy( str1, pE->i_text, pE->i_text_length ); memcpy( str1, pE->i_text, pE->i_text_length );
str1[pE->i_text_length] = '\0'; str1[pE->i_text_length] = '\0';
EITEventFixString(str1);
msg_Dbg( p_demux, " - text='%s'", str1 ); msg_Dbg( p_demux, " - text='%s'", str1 );
psz_extra = realloc( psz_extra, psz_extra = realloc( psz_extra,
strlen(psz_extra) + strlen(str1) + 2 ); strlen(psz_extra) + strlen(str1) + 2 );
...@@ -2234,13 +2254,22 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit ) ...@@ -2234,13 +2254,22 @@ static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
vlc_meta_Add( p_meta, psz_cat, psz_value ); vlc_meta_Add( p_meta, psz_cat, psz_value );
free( psz_value ); free( psz_value );
es_out_Control( p_demux->out, ES_OUT_SET_GROUP_META, if( p_evt->i_running_status == 0x04 )
p_eit->i_service_id, p_meta ); {
vlc_meta_Delete( p_meta ); vlc_meta_Add( p_meta, VLC_META_NOW_PLAYING, psz_name );
b_event_active = VLC_TRUE;
}
free( psz_cat ); free( psz_cat );
free( psz_extra ); free( psz_extra );
} }
if( !b_event_active )
vlc_meta_Add( p_meta, VLC_META_NOW_PLAYING, "" );
es_out_Control( p_demux->out, ES_OUT_SET_GROUP_META,
p_eit->i_service_id, p_meta );
vlc_meta_Delete( p_meta );
dvbpsi_DeleteEIT( p_eit ); dvbpsi_DeleteEIT( p_eit );
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment