#include <vlc/vlc.h>
-#include <stdio.h>
-#include <stdlib.h> /* malloc(), free() */
#include <ctype.h>
#include <vlc_access.h> /* DVB-specific things */
# include "tables/eit.h"
# endif
#endif
-
+#ifdef HAVE_TIME_H
+# include <time.h>
+#endif
#undef TS_DEBUG
/* TODO:
* - ...
*/
-#define vlc_meta_Add(a,b,c) fprintf(stderr, "FIXME: TS demuxer meta is broken\n" )
/*****************************************************************************
* Module descriptor
*****************************************************************************/
add_string( "ts-extra-pmt", NULL, NULL, PMT_TEXT, PMT_LONGTEXT, VLC_TRUE );
add_bool( "ts-es-id-pid", 1, NULL, PID_TEXT, PID_LONGTEXT, VLC_TRUE );
add_string( "ts-out", NULL, NULL, TSOUT_TEXT, TSOUT_LONGTEXT, VLC_TRUE );
- add_integer( "ts-out-mtu", 1500, NULL, MTUOUT_TEXT,
+ add_integer( "ts-out-mtu", 1400, NULL, MTUOUT_TEXT,
MTUOUT_LONGTEXT, VLC_TRUE );
add_string( "ts-csa-ck", NULL, NULL, CSA_TEXT, CSA_LONGTEXT, VLC_TRUE );
add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, VLC_TRUE );
vlc_bool_t b_dvb_control;
int i_dvb_program;
+ int64_t i_dvb_start;
+ int64_t i_dvb_length;
vlc_list_t *p_programs_list;
/* TS dump */
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- uint8_t *p_peek;
+ const uint8_t *p_peek;
int i_sync, i_peek, i;
int i_packet_size;
if( stream_Peek( p_demux->s, &p_peek, TS_PACKET_SIZE_MAX ) <
TS_PACKET_SIZE_MAX ) return VLC_EGENERIC;
- if( p_peek[0] == 'T' && p_peek[1] == 'F' &&
- p_peek[2] == 'r' && p_peek[3] == 'c' )
+ if( memcmp( p_peek, "TFrc", 4 ) == 0 )
{
b_topfield = VLC_TRUE;
msg_Dbg( p_demux, "this is a topfield file" );
/* Check next 3 sync bytes */
i_peek = TS_PACKET_SIZE_MAX * 3 + i_sync + 1;
}
-
+
if( ( stream_Peek( p_demux->s, &p_peek, i_peek ) ) < i_peek )
{
msg_Err( p_demux, "cannot peek" );
{
i_packet_size = TS_PACKET_SIZE_188;
#if 0
- /* I used the TF5000PVR 2004 Firmware .doc header documentation,
+ /* I used the TF5000PVR 2004 Firmware .doc header documentation,
* http://www.i-topfield.com/data/product/firmware/Structure%20of%20Recorded%20File%20in%20TF5000PVR%20(Feb%2021%202004).doc
* but after the filename the offsets seem to be incorrect. - DJ */
int i_duration, i_name;
// 4 bytes of freq. Uimsbf (56,57,58,59)
// 2 bytes of symbol rate Uimsbf (60,61)
// 2 bytes of TS stream ID Uimsbf (62,63)
- // 4 bytes reserved
+ // 4 bytes reserved
// 2 bytes reserved
// 2 bytes duration Uimsbf (70,71)
//i_duration = (int) (p_peek[70] << 8) | p_peek[71];
p_sys->b_meta = VLC_TRUE;
p_sys->b_dvb_control = VLC_TRUE;
p_sys->i_dvb_program = 0;
+ p_sys->i_dvb_start = 0;;
+ p_sys->i_dvb_length = 0;
+
for( i = 0; i < 8192; i++ )
{
ts_pid_t *pid = &p_sys->pid[i];
p_demux );
if( p_sys->b_dvb_control )
{
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE, 0x11, VLC_TRUE );
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
- ACCESS_SET_PRIVATE_ID_STATE, 0x12, VLC_TRUE );
+ if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_PRIVATE_ID_STATE, 0x11, VLC_TRUE ) ||
+ stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_PRIVATE_ID_STATE, 0x12, VLC_TRUE ) )
+ p_sys->b_dvb_control = VLC_FALSE;
}
}
#endif
if( p_sys->b_dvb_control && pid->i_pid > 0 )
{
/* too much */
- stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid, VLC_FALSE );
+ stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_PRIVATE_ID_STATE, pid->i_pid,
+ VLC_FALSE );
}
}
/* If in dump mode, then close the file */
if( p_sys->b_file_out )
{
- msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)", p_sys->psz_file,
- p_sys->i_write / 1024 );
+ msg_Info( p_demux ,"closing %s ("I64Fd" Kbytes dumped)",
+ p_sys->psz_file, p_sys->i_write / 1024 );
if( p_sys->p_file != stdout )
{
while( !p_demux->b_die )
{
- uint8_t *p_peek;
+ const uint8_t *p_peek;
int i_peek, i_skip = 0;
i_peek = stream_Peek( p_demux->s, &p_peek,
/*****************************************************************************
* Control:
*****************************************************************************/
+static int DVBEventInformation( demux_t *p_demux, int64_t *pi_time, int64_t *pi_length )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ if( pi_length )
+ *pi_length = 0;
+ if( pi_time )
+ *pi_time = 0;
+
+#ifdef HAVE_TIME_H
+ if( p_sys->b_dvb_control && p_sys->i_dvb_length > 0 )
+ {
+ /* FIXME we should not use time() but read the date from the tdt */
+ const time_t t = time( NULL );
+ if( p_sys->i_dvb_start <= t && t < p_sys->i_dvb_start + p_sys->i_dvb_length )
+ {
+ if( pi_length )
+ *pi_length = p_sys->i_dvb_length * I64C(1000000);
+ if( pi_time )
+ *pi_time = (t - p_sys->i_dvb_start) * I64C(1000000);
+ return VLC_SUCCESS;
+ }
+ }
+#endif
+ return VLC_EGENERIC;
+}
+
static int Control( demux_t *p_demux, int i_query, va_list args )
{
demux_sys_t *p_sys = p_demux->p_sys;
}
else
{
- *pf = 0.0;
+ int64_t i_time, i_length;
+ if( !DVBEventInformation( p_demux, &i_time, &i_length ) && i_length > 0 )
+ *pf = (double)i_time/(double)i_length;
+ else
+ *pf = 0.0;
}
return VLC_SUCCESS;
case DEMUX_SET_POSITION:
return VLC_EGENERIC;
#else
case DEMUX_GET_TIME:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ if( DVBEventInformation( p_demux, pi64, NULL ) )
+ *pi64 = 0;
+ return VLC_SUCCESS;
+
case DEMUX_GET_LENGTH:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = 0;
+ if( DVBEventInformation( p_demux, NULL, pi64 ) )
+ *pi64 = 0;
return VLC_SUCCESS;
#endif
case DEMUX_SET_GROUP:
/* */
i_skip += 2;
}
-
+#ifdef ZVBI_COMPILED
+ else if( pid->es->fmt.i_codec == VLC_FOURCC( 't', 'e', 'l', 'x' ) )
+ i_skip = 0; /*hack for zvbi support */
+#endif
/* skip header */
while( p_pes && i_skip > 0 )
{
const vlc_bool_t b_adaptation = p[3]&0x20;
const vlc_bool_t b_payload = p[3]&0x10;
const int i_cc = p[3]&0x0f; /* continuity counter */
- vlc_bool_t b_discontinuity = VLC_FALSE;/* discontinuity */
+ vlc_bool_t b_discontinuity = VLC_FALSE;/* discontinuity */
/* transport_scrambling_control is ignored */
int i_skip = 0;
return( i_len );
}
+
static int IODGetByte( int *pi_data, uint8_t **pp_data )
{
if( *pi_data > 0 )
}
return( 0 );
}
+
static int IODGetWord( int *pi_data, uint8_t **pp_data )
{
const int i1 = IODGetByte( pi_data, pp_data );
const int i2 = IODGetByte( pi_data, pp_data );
return( ( i1 << 8 ) | i2 );
}
+
static int IODGet3Bytes( int *pi_data, uint8_t **pp_data )
{
const int i1 = IODGetByte( pi_data, pp_data );
}
static int EITConvertDuration( uint32_t i_duration )
{
- return CVT_FROM_BCD(i_duration >> 16) * 3600 +
+ return CVT_FROM_BCD(i_duration >> 16) * 3600 +
CVT_FROM_BCD(i_duration >> 8 ) * 60 +
CVT_FROM_BCD(i_duration );
}
#undef CVT_FROM_BCD
-static inline char *FixUTF8( char *p )
-{
- EnsureUTF8( p );
- return p;
-}
/* FIXME same than dvbsi_to_utf8 from dvb access */
-static char *EITConvertToUTF8( unsigned char *psz_instring, size_t i_length )
+static char *
+EITConvertToUTF8( const unsigned char *psz_instring, size_t i_length )
{
const char *psz_encoding;
- const unsigned char *psz_stringstart, *psz_outstring;
- char *psz_tmp;
- char psz_encbuf[12];
- size_t i_in, i_out;
+ char *psz_outstring;
+ char psz_encbuf[sizeof( "ISO_8859-123" )];
+ size_t i_in, i_out, offset = 1;
vlc_iconv_t iconv_handle;
+
if( i_length < 1 ) return NULL;
if( psz_instring[0] >= 0x20 )
{
- psz_stringstart = psz_instring;
- psz_encoding = "ISO_8859-1"; /* should be ISO6937 according to spec, but this seems to be the one used */
+ psz_encoding = "ISO_8859-1";
+ /* According to the specification, this should be ISO6937,
+ * but it seems Latin-1 is used instead. */
+ offset = 0;
}
else switch( psz_instring[0] )
{
case 0x01:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-5";
break;
case 0x02:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-6";
break;
case 0x03:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-7";
break;
case 0x04:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-8";
break;
case 0x05:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-9";
break;
case 0x06:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-10";
break;
case 0x07:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-11";
break;
case 0x08:
- psz_stringstart = &psz_instring[1]; /*possibly reserved?*/
psz_encoding = "ISO_8859-12";
break;
case 0x09:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-13";
break;
case 0x0a:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-14";
break;
case 0x0b:
- psz_stringstart = &psz_instring[1];
psz_encoding = "ISO_8859-15";
break;
case 0x10:
- if( i_length < 3 || psz_instring[1] != '\0' || psz_instring[2] > 0x0f
- || psz_instring[2] == 0 )
- return FixUTF8(strndup(psz_instring,i_length));
- sprintf( psz_encbuf, "ISO_8859-%d", psz_instring[2] );
- psz_stringstart = &psz_instring[3];
- psz_encoding = psz_encbuf;
+#warning Is Latin-10 (psz_instring[2] == 16) really illegal?
+ if( i_length < 3 || psz_instring[1] != 0x00 || psz_instring[2] > 15
+ || psz_instring[2] == 0 )
+ {
+ psz_encoding = "UTF-8";
+ offset = 0;
+ }
+ else
+ {
+ sprintf( psz_encbuf, "ISO_8859-%u", psz_instring[2] );
+ psz_encoding = psz_encbuf;
+ offset = 3;
+ }
break;
case 0x11:
- psz_stringstart = &psz_instring[1];
+#warning Is there a BOM or do we use a fixed endianess?
psz_encoding = "UTF-16";
break;
case 0x12:
- psz_stringstart = &psz_instring[1];
psz_encoding = "KSC5601-1987";
break;
case 0x13:
- psz_stringstart = &psz_instring[1];
- psz_encoding = "GB2312";/*GB-2312-1980 */
+ psz_encoding = "GB2312"; /* GB-2312-1980 */
break;
case 0x14:
- psz_stringstart = &psz_instring[1];
psz_encoding = "BIG-5";
break;
case 0x15:
- return FixUTF8(strndup(&psz_instring[1],i_length-1));
+ psz_encoding = "UTF-8";
break;
default:
/* invalid */
- return FixUTF8(strndup(psz_instring,i_length));
+ psz_encoding = "UTF-8";
+ offset = 0;
}
+
+ i_in = i_length - offset;
+ i_out = i_in * 6 + 1;
+
+ psz_outstring = malloc( i_out );
+
iconv_handle = vlc_iconv_open( "UTF-8", psz_encoding );
- i_in = i_length - (psz_stringstart - psz_instring );
- i_out = i_in * 6;
- psz_outstring = psz_tmp = (char*)malloc( i_out * sizeof(char) + 1 );
- vlc_iconv( iconv_handle, &psz_stringstart, &i_in, &psz_tmp, &i_out );
- vlc_iconv_close( iconv_handle );
- *psz_tmp = '\0';
+ if( iconv_handle == (vlc_iconv_t)(-1) )
+ {
+ /* Invalid character set (e.g. ISO_8859-12) */
+ memcpy( psz_outstring, psz_instring, i_in );
+ psz_outstring[i_in] = '\0';
+ EnsureUTF8( psz_outstring );
+ }
+ else
+ {
+ const char *psz_in = (const char *)psz_instring;
+ char *psz_out = psz_outstring;
+
+ while( vlc_iconv( iconv_handle, &psz_in, &i_in,
+ &psz_out, &i_out ) == (size_t)(-1) )
+ {
+ /* skip naughty byte. This may fail terribly for multibyte stuff,
+ * but what can we do anyway? */
+ psz_in++;
+ i_in--;
+ vlc_iconv( iconv_handle, NULL, NULL, NULL, NULL ); /* reset */
+ }
+ vlc_iconv_close( iconv_handle );
+
+ *psz_out = '\0';
+ }
return psz_outstring;
}
for( i = 0; i < pE->i_entry_count; i++ )
{
- char *psz_dsc = EITConvertToUTF8( pE->i_item_description[i], pE->i_item_description_length[i] );
+ char *psz_dsc = EITConvertToUTF8( pE->i_item_description[i],
+ pE->i_item_description_length[i] );
char *psz_itm = EITConvertToUTF8( pE->i_item[i], pE->i_item_length[i] );
if( psz_dsc && psz_itm )
free( psz_extra );
}
if( p_epg->i_event > 0 )
+ {
+ if( p_eit->i_service_id == p_sys->i_dvb_program )
+ {
+ p_sys->i_dvb_length = 0;
+ p_sys->i_dvb_start = 0;
+
+ if( p_epg->p_current )
+ {
+ p_sys->i_dvb_start = p_epg->p_current->i_start;
+ p_sys->i_dvb_length = p_epg->p_current->i_duration;
+ }
+ }
es_out_Control( p_demux->out, ES_OUT_SET_GROUP_EPG, p_eit->i_service_id, p_epg );
+ }
vlc_epg_Delete( p_epg );
dvbpsi_DeleteEIT( p_eit );
else
{
p_es = malloc( sizeof( ts_es_t ) );
-
+
es_format_Copy( &p_es->fmt, &pid->es->fmt );
free( p_es->fmt.psz_language ); p_es->fmt.psz_language = NULL;
free( p_es->fmt.psz_description ); p_es->fmt.psz_description = NULL;
{
case 0x2:
p_es->fmt.psz_description =
- strdup(_("subtitles"));
+ strdup(_("Teletext subtitles"));
msg_Dbg( p_demux,
" * sub lan=%s page=%d%x",
p_es->fmt.psz_language,
case 0x5:
p_es->fmt.psz_description =
- strdup(_("hearing impaired"));
+ strdup(_("Teletext hearing impaired subtitles"));
msg_Dbg( p_demux,
" * hearing impaired lan=%s page=%d%x",
p_es->fmt.psz_language,
( p_dr->p_data[4] << 8 ) | p_dr->p_data[5];
pid->es->fmt.video.i_height =
( p_dr->p_data[6] << 8 ) | p_dr->p_data[7];
- pid->es->fmt.i_extra =
+ pid->es->fmt.i_extra =
(p_dr->p_data[8] << 8) | p_dr->p_data[9];
if( pid->es->fmt.i_extra > 0 )
dvbpsi_DeletePAT( p_pat );
}
-
projects / vlc / blobdiff