Changeset 21a37621e4bf8618698805af3d19baa3b6cbdd98

Timestamp:

26/04/05 09:21:31 (4 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[ec88aa0533f9caca8642199025869b1ec3c0f803]

git-author:

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

Message:

• asf, b4s: warning fixes.
  
• ts: - set BLOCK_FLAG_CORRUPTED on transport_error_indicator.
  
  • better support of EIT + VLC_META_NOW_PLAYING.
    

Files:

• modules/demux/asf/libasf.c (modified) (1 diff)
• modules/demux/playlist/b4s.c (modified) (2 diffs)
• modules/demux/ts.c (modified) (8 diffs)

modules/demux/asf/libasf.c

@@ -905 +905 @@
-        {
-            /* This p_sp will be inserted by ReadRoot later */
-
+(asf_object_stream_properties_t*)
-        }
-    }

modules/demux/playlist/b4s.c

@@ -115 +115 @@
-    demux_sys_t *p_sys = p_demux->p_sys;
-    playlist_t *p_playlist;
-
+
+
-
-    vlc_bool_t b_play;
@@ -126 +127 @@
-    char *psz_mrl = NULL, *psz_name = NULL, *psz_genre = NULL;
-    char *psz_now = NULL, *psz_listeners = NULL, *psz_bitrate = NULL;
-
+
-
-    b_shoutcast = p_sys->b_shout;
-
+
-    p_playlist = (playlist_t *) vlc_object_find( p_demux, VLC_OBJECT_PLAYLIST,
-                                                 FIND_PARENT );

modules/demux/ts.c

@@ -26 +26 @@
- *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
+#include <ctype.h>
-
-#include <vlc/vlc.h>
@@ -1403 +1404 @@
-        msg_Dbg( p_demux, "transport_error_indicator set (pid=%d)",
-                 pid->i_pid );
+        if( pid->es->p_pes ) //&& pid->es->fmt.i_cat == VIDEO_ES )
+            pid->es->p_pes->i_flags |= BLOCK_FLAG_CORRUPTED;
-    }
-
@@ -2112 +2115 @@
-}
-#endif
-
+
+
+
+
+
+
+
+
+
+
-static void EITCallBack( demux_t *p_demux, dvbpsi_eit_t *p_eit )
-{
-    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" );
@@ -2131 +2145 @@
-             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 )
-    {
-        vlc_meta_t          *p_meta = vlc_meta_New();
-        dvbpsi_descriptor_t *p_dr;
-        char                *psz_cat = malloc( strlen("Event")+10 );
@@ -2177 +2191 @@
-                    psz_text[pE->i_text_length] = '\0';
-
+                    EITEventFixString(psz_name);
+                    EITEventFixString(psz_text);
-                    msg_Dbg( p_demux, "    - short event lang=%3.3s '%s' : '%s'",
-                             pE->i_iso_639_code, psz_name, psz_text );
@@ -2197 +2213 @@
-                                pE->i_item_description_length[i] );
-                        str1[pE->i_item_description_length[i]] = '\0';
-
-
+
+
+
-                                pE->i_item_length[i] );
-                        str2[pE->i_item_length[i]] = '\0';
+                        EITEventFixString(str2);
-
-                        msg_Dbg( p_demux, "       - desc='%s' item='%s'", str1, str2 );
@@ -2214 +2232 @@
-                    memcpy( str1, pE->i_text, pE->i_text_length );
-                    str1[pE->i_text_length] = '\0';
+                    EITEventFixString(str1);
+
-                    msg_Dbg( p_demux, "       - text='%s'", str1 );
-                    psz_extra = realloc( psz_extra,
@@ -2235 +2255 @@
-        free( psz_value );
-
-
-
-
+
+
+
+
+
-
-        free( psz_cat );
-        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 );
-}