/*****************************************************************************
* ts.c: Transport Stream input module for VLC.
*****************************************************************************
- * Copyright (C) 2004-2005 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2004-2005 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <ctype.h>
#include <vlc/vlc.h>
-#include <vlc/input.h>
+
+#include <ctype.h>
+
+#include <vlc_access.h> /* DVB-specific things */
+#include <vlc_demux.h>
+#include <vlc_meta.h>
+#include <vlc_epg.h>
#include "iso_lang.h"
-#include "network.h"
+#include <vlc_network.h>
+#include <vlc_charset.h>
#include "../mux/mpeg/csa.h"
# include "tables/eit.h"
# endif
#endif
+#ifdef HAVE_TIME_H
+# include <time.h>
+#endif
+#undef TS_DEBUG
/* TODO:
* - XXX: do not mark options message to be translated, they are too osbcure for now ...
#define PMT_TEXT N_("Extra PMT")
#define PMT_LONGTEXT N_( \
- "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])" )
+ "Allows a user to specify an extra pmt (pmt_pid=pid:stream_type[,...])." )
#define PID_TEXT N_("Set id of ES to PID")
-#define PID_LONGTEXT N_("set id of es to pid")
+#define PID_LONGTEXT N_("Set the internal ID of each elementary stream" \
+ " handled by VLC to the same value as the PID in" \
+ " the TS stream, instead of 1, 2, 3, etc. Useful to" \
+ " do \'#duplicate{..., select=\"es=<pid>\"}\'.")
#define TSOUT_TEXT N_("Fast udp streaming")
#define TSOUT_LONGTEXT N_( \
- "Sends TS to specific ip:port by udp (you must know what you are doing)")
+ "Sends TS to specific ip:port by udp (you must know what you are doing).")
#define MTUOUT_TEXT N_("MTU for out mode")
-#define MTUOUT_LONGTEXT N_("MTU for out mode")
+#define MTUOUT_LONGTEXT N_("MTU for out mode.")
#define CSA_TEXT N_("CSA ck")
-#define CSA_LONGTEXT N_("CSA ck")
+#define CSA_LONGTEXT N_("Control word for the CSA encryption algorithm")
#define SILENT_TEXT N_("Silent mode")
-#define SILENT_LONGTEXT N_("do not complain on encrypted PES")
+#define SILENT_LONGTEXT N_("Do not complain on encrypted PES.")
#define CAPMT_SYSID_TEXT N_("CAPMT System ID")
-#define CAPMT_SYSID_LONGTEXT N_("only forward descriptors from this SysID to the CAM")
+#define CAPMT_SYSID_LONGTEXT N_("Only forward descriptors from this SysID to the CAM.")
#define CPKT_TEXT N_("Packet size in bytes to decrypt")
#define CPKT_LONGTEXT N_("Specify the size of the TS packet to decrypt. " \
"decrypting. " )
#define TSDUMP_TEXT N_("Filename of dump")
-#define TSDUMP_LONGTEXT N_("Specify a filename where to dump the TS in")
+#define TSDUMP_LONGTEXT N_("Specify a filename where to dump the TS in.")
#define APPEND_TEXT N_("Append")
#define APPEND_LONGTEXT N_( \
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 );
+ add_integer( "ts-csa-pkt", 188, NULL, CPKT_TEXT, CPKT_LONGTEXT, VLC_TRUE );
add_bool( "ts-silent", 0, NULL, SILENT_TEXT, SILENT_LONGTEXT, VLC_TRUE );
add_file( "ts-dump-file", NULL, NULL, TSDUMP_TEXT, TSDUMP_LONGTEXT, VLC_FALSE );
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 */
FILE *p_file; /* filehandle */
uint64_t i_write; /* bytes written */
vlc_bool_t b_file_out; /* dump mode enabled */
-
+
/* */
vlc_bool_t b_meta;
};
#define TS_PACKET_SIZE_192 192
#define TS_PACKET_SIZE_204 204
#define TS_PACKET_SIZE_MAX 204
+#define TS_TOPFIELD_HEADER 1320
/*****************************************************************************
* Open
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;
ts_pid_t *pat;
- char *psz_mode;
+ const char *psz_mode;
vlc_bool_t b_append;
+ vlc_bool_t b_topfield = VLC_FALSE;
vlc_value_t val;
if( stream_Peek( p_demux->s, &p_peek, TS_PACKET_SIZE_MAX ) <
TS_PACKET_SIZE_MAX ) return VLC_EGENERIC;
+ if( memcmp( p_peek, "TFrc", 4 ) == 0 )
+ {
+ b_topfield = VLC_TRUE;
+ msg_Dbg( p_demux, "this is a topfield file" );
+ }
+
/* Search first sync byte */
for( i_sync = 0; i_sync < TS_PACKET_SIZE_MAX; i_sync++ )
{
if( p_peek[i_sync] == 0x47 ) break;
}
- if( i_sync >= TS_PACKET_SIZE_MAX )
+ if( i_sync >= TS_PACKET_SIZE_MAX && !b_topfield )
{
if( strcmp( p_demux->psz_demux, "ts" ) ) return VLC_EGENERIC;
msg_Warn( p_demux, "this does not look like a TS stream, continuing" );
}
- /* Check next 3 sync bytes */
- i_peek = TS_PACKET_SIZE_MAX * 3 + i_sync + 1;
+ if( b_topfield )
+ {
+ /* Read the entire Topfield header */
+ i_peek = TS_TOPFIELD_HEADER;
+ }
+ else
+ {
+ /* 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;
}
+ else if( b_topfield )
+ {
+ i_packet_size = TS_PACKET_SIZE_188;
+#if 0
+ /* 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;
+ char *psz_name = malloc(25);
+ char *psz_event_name;
+ char *psz_event_text = malloc(130);
+ char *psz_ext_text = malloc(1025);
+
+ // 2 bytes version Uimsbf (4,5)
+ // 2 bytes reserved (6,7)
+ // 2 bytes duration in minutes Uimsbf (8,9(
+ i_duration = (int) (p_peek[8] << 8) | p_peek[9];
+ msg_Dbg( p_demux, "Topfield recording length: +/- %d minutes", i_duration);
+ // 2 bytes service number in channel list (10, 11)
+ // 2 bytes service type Bslbf 0=TV 1=Radio Bslb (12, 13)
+ // 4 bytes of reserved + tuner info (14,15,16,17)
+ // 2 bytes of Service ID Bslbf (18,19)
+ // 2 bytes of PMT PID Uimsbf (20,21)
+ // 2 bytes of PCR PID Uimsbf (22,23)
+ // 2 bytes of Video PID Uimsbf (24,25)
+ // 2 bytes of Audio PID Uimsbf (26,27)
+ // 24 bytes filename Bslbf
+ memcpy( psz_name, &p_peek[28], 24 );
+ psz_name[24] = '\0';
+ msg_Dbg( p_demux, "recordingname=%s", psz_name );
+ // 1 byte of sat index Uimsbf (52)
+ // 3 bytes (1 bit of polarity Bslbf +23 bits reserved)
+ // 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
+ // 2 bytes reserved
+ // 2 bytes duration Uimsbf (70,71)
+ //i_duration = (int) (p_peek[70] << 8) | p_peek[71];
+ //msg_Dbg( p_demux, "Topfield 2nd duration field: +/- %d minutes", i_duration);
+ // 4 bytes EventID Uimsbf (72-75)
+ // 8 bytes of Start and End time info (76-83)
+ // 1 byte reserved (84)
+ // 1 byte event name length Uimsbf (89)
+ i_name = (int)(p_peek[89]&~0x81);
+ msg_Dbg( p_demux, "event name length = %d", i_name);
+ psz_event_name = malloc( i_name+1 );
+ // 1 byte parental rating (90)
+ // 129 bytes of event text
+ memcpy( psz_event_name, &p_peek[91], i_name );
+ psz_event_name[i_name] = '\0';
+ memcpy( psz_event_text, &p_peek[91+i_name], 129-i_name );
+ psz_event_text[129-i_name] = '\0';
+ msg_Dbg( p_demux, "event name=%s", psz_event_name );
+ msg_Dbg( p_demux, "event text=%s", psz_event_text );
+ // 12 bytes reserved (220)
+ // 6 bytes reserved
+ // 2 bytes Event Text Length Uimsbf
+ // 4 bytes EventID Uimsbf
+ // FIXME We just have 613 bytes. not enough for this entire text
+ // 1024 bytes Extended Event Text Bslbf
+ memcpy( psz_ext_text, p_peek+372, 1024 );
+ psz_ext_text[1024] = '\0';
+ msg_Dbg( p_demux, "extended event text=%s", psz_ext_text );
+ // 52 bytes reserved Bslbf
+#endif
+ }
else
{
msg_Warn( p_demux, "TS module discarded (lost sync)" );
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( i_port <= 0 ) i_port = 1234;
msg_Dbg( p_demux, "resend ts to '%s:%d'", val.psz_string, i_port );
- p_sys->fd = net_ConnectUDP( p_demux, val.psz_string, i_port, 0 );
+ p_sys->fd = net_ConnectUDP( VLC_OBJECT(p_demux), val.psz_string, i_port, 0 );
if( p_sys->fd < 0 )
{
msg_Err( p_demux, "failed to open udp socket, send disabled" );
if( i_pid >= 2 && i_pid < 8192 )
{
ts_pid_t *pmt = &p_sys->pid[i_pid];
+ ts_prg_psi_t *prg;
msg_Dbg( p_demux, "extra pmt specified (pid=%d)", i_pid );
PIDInit( pmt, VLC_TRUE, NULL );
- pmt->psi->i_prg = 1;
- pmt->psi->prg = malloc( sizeof(ts_prg_psi_t) );
- /* FIXME we should also ask for a number */
- pmt->psi->prg[0]->handle =
- dvbpsi_AttachPMT( 1, (dvbpsi_pmt_callback)PMTCallBack,
- p_demux );
- pmt->psi->prg[0]->i_number = 0; /* special one */
+
+ /* Dummy PMT */
+ prg = malloc( sizeof( ts_prg_psi_t ) );
+ memset( prg, 0, sizeof( ts_prg_psi_t ) );
+ prg->i_pid_pcr = -1;
+ prg->i_pid_pmt = -1;
+ prg->i_number = 0; /* special */
+ prg->handle = dvbpsi_AttachPMT( 1, (dvbpsi_pmt_callback)PMTCallBack, p_demux );
+ TAB_APPEND( pmt->psi->i_prg, pmt->psi->prg, prg );
psz = strchr( psz, '=' ) + 1; /* can't failed */
while( psz && *psz )
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 )
{
i_data = stream_Read( p_demux->s, p_sys->buffer, i_bufsize );
if( (i_data <= 0) && (i_data < p_sys->i_packet_size) )
{
- msg_Dbg( p_demux, "Error reading malformed packets" );
+ msg_Dbg( p_demux, "error reading malformed packets" );
return i_data;
}
p_pid = &p_sys->pid[ ((p_buffer[i_pos+1]&0x1f)<<8)|p_buffer[i_pos+2] ];
/* Detect discontinuity indicator in adaptation field */
- if( b_adaptation )
+ if( b_adaptation && p_buffer[i_pos + 4] > 0 )
{
if( p_buffer[i_pos+5]&0x80 )
msg_Warn( p_demux, "discontinuity indicator (pid=%d) ", p_pid->i_pid );
i_diff = ( i_cc - p_pid->i_cc )&0x0f;
if( b_payload && i_diff == 1 )
{
- p_pid->i_cc++;
+ p_pid->i_cc = ( p_pid->i_cc + 1 ) & 0xf;
}
else
{
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:
pid->p_owner = p_owner;
pid->i_owner_number = 0;
- pid->extra_es = NULL;
- pid->i_extra_es = 0;
+ TAB_INIT( pid->i_extra_es, pid->extra_es );
if( b_psi )
{
/* */
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;
i_diff = ( i_cc - pid->i_cc )&0x0f;
if( b_payload && i_diff == 1 )
{
- pid->i_cc++;
+ pid->i_cc = ( pid->i_cc + 1 ) & 0xf;
}
else
{
case 0x92: /* DVD_SPU vls (sub) */
es_format_Init( fmt, SPU_ES, VLC_FOURCC( 's', 'p', 'u', 'b' ) );
break;
- case 0x93: /* LPCM vls (audio) */
- es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 'l', 'p', 'c', 'b' ) );
- break;
+
case 0x94: /* SDDS (audio) */
es_format_Init( fmt, AUDIO_ES, VLC_FOURCC( 's', 'd', 'd', 'b' ) );
break;
case 0x06: /* PES_PRIVATE (fixed later) */
case 0x12: /* MPEG-4 generic (sub/scene/...) (fixed later) */
+ case 0xEA: /* Privately managed ES (VC-1) (fixed later */
default:
es_format_Init( fmt, UNKNOWN_ES, 0 );
break;
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 );
p_iod = malloc( sizeof( iod_descriptor_t ) );
memset( p_iod, 0, sizeof( iod_descriptor_t ) );
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n************ IOD ************" );
#endif
for( i = 0; i < 255; i++ )
byte1 = IODGetByte( &i_data, &p_data );
byte2 = IODGetByte( &i_data, &p_data );
byte3 = IODGetByte( &i_data, &p_data );
- if( byte2 == 0x02 ) //old vlc's buggy implementation of the IOD_descriptor
+ if( byte2 == 0x02 ) //old vlc's buggy implementation of the IOD_descriptor
{
p_iod->i_iod_label_scope = 0x11;
p_iod->i_iod_label = byte1;
i_iod_tag = byte2;
}
- else //correct implementation of the IOD_descriptor
+ else //correct implementation of the IOD_descriptor
{
p_iod->i_iod_label_scope = byte1;
p_iod->i_iod_label = byte2;
i_iod_tag = byte3;
}
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* iod_label:%d", p_iod->i_iod_label );
fprintf( stderr, "\n* ===========" );
fprintf( stderr, "\n* tag:0x%x", i_iod_tag );
#endif
if( i_iod_tag != 0x02 )
{
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n ERR: tag %02x != 0x02", i_iod_tag );
#endif
return p_iod;
}
i_iod_length = IODDescriptorLength( &i_data, &p_data );
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* length:%d", i_iod_length );
#endif
if( i_iod_length > i_data )
i_flags = IODGetByte( &i_data, &p_data );
p_iod->i_od_id |= i_flags >> 6;
b_url = ( i_flags >> 5 )&0x01;
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* od_id:%d", p_iod->i_od_id );
fprintf( stderr, "\n* url flag:%d", b_url );
fprintf( stderr, "\n* includeInlineProfileLevel flag:%d", ( i_flags >> 4 )&0x01 );
if( b_url )
{
p_iod->psz_url = IODGetURL( &i_data, &p_data );
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* url string:%s", p_iod->psz_url );
fprintf( stderr, "\n*****************************\n" );
#endif
p_iod->i_audioProfileLevelIndication = IODGetByte( &i_data, &p_data );
p_iod->i_visualProfileLevelIndication = IODGetByte( &i_data, &p_data );
p_iod->i_graphicsProfileLevelIndication = IODGetByte( &i_data, &p_data );
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* ODProfileLevelIndication:%d", p_iod->i_ODProfileLevelIndication );
fprintf( stderr, "\n* sceneProfileLevelIndication:%d", p_iod->i_sceneProfileLevelIndication );
fprintf( stderr, "\n* audioProfileLevelIndication:%d", p_iod->i_audioProfileLevelIndication );
{
#define es_descr p_iod->es_descr[i_es_index]
int i_decoderConfigDescr_length;
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* - ES_Descriptor length:%d", i_length );
#endif
es_descr.b_ok = 1;
b_url = ( i_flags >> 6 )&0x01;
es_descr.b_OCRStreamFlag = ( i_flags >> 5 )&0x01;
es_descr.i_streamPriority = i_flags & 0x1f;
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* * streamDependenceFlag:%d", es_descr.b_streamDependenceFlag );
fprintf( stderr, "\n* * OCRStreamFlag:%d", es_descr.b_OCRStreamFlag );
fprintf( stderr, "\n* * streamPriority:%d", es_descr.i_streamPriority );
if( es_descr.b_streamDependenceFlag )
{
es_descr.i_dependOn_es_id = IODGetWord( &i_data, &p_data );
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* * dependOn_es_id:%d", es_descr.i_dependOn_es_id );
#endif
}
if( b_url )
{
es_descr.psz_url = IODGetURL( &i_data, &p_data );
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* url string:%s", es_descr.psz_url );
#endif
}
if( es_descr.b_OCRStreamFlag )
{
es_descr.i_OCR_es_id = IODGetWord( &i_data, &p_data );
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* * OCR_es_id:%d", es_descr.i_OCR_es_id );
#endif
}
if( IODGetByte( &i_data, &p_data ) != 0x04 )
{
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* ERR missing DecoderConfigDescr" );
#endif
es_descr.b_ok = 0;
break;
}
i_decoderConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* - DecoderConfigDesc length:%d", i_decoderConfigDescr_length );
#endif
#define dec_descr es_descr.dec_descr
dec_descr.i_bufferSizeDB = IODGet3Bytes( &i_data, &p_data );
dec_descr.i_maxBitrate = IODGetDWord( &i_data, &p_data );
dec_descr.i_avgBitrate = IODGetDWord( &i_data, &p_data );
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* * objectTypeIndication:0x%x", dec_descr.i_objectTypeIndication );
fprintf( stderr, "\n* * streamType:0x%x", dec_descr.i_streamType );
fprintf( stderr, "\n* * upStream:%d", dec_descr.b_upStream );
if( IODGetByte( &i_data, &p_data ) != 0x06 )
{
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* ERR missing SLConfigDescr" );
#endif
es_descr.b_ok = 0;
break;
}
i_SLConfigDescr_length = IODDescriptorLength( &i_data, &p_data );
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* - SLConfigDescr length:%d", i_SLConfigDescr_length );
#endif
i_predefined = IODGetByte( &i_data, &p_data );
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* * i_predefined:0x%x", i_predefined );
#endif
switch( i_predefined )
}
break;
default:
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* ERR unsupported SLConfigDescr predefined" );
#endif
es_descr.b_ok = 0;
#undef sl_descr
#undef es_descr
default:
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n* - OD tag:0x%x length:%d (Unsupported)", i_tag, i_length );
#endif
break;
i_data = i_data_sav - i_length;
i_es_index++;
}
-#ifdef DEBUG
+#ifdef TS_DEBUG
fprintf( stderr, "\n*****************************\n" );
#endif
return p_iod;
for( p_srv = p_sdt->p_first_service; p_srv; p_srv = p_srv->p_next )
{
- vlc_meta_t *p_meta = vlc_meta_New();
+ vlc_meta_t *p_meta;
dvbpsi_descriptor_t *p_dr;
+ const char *psz_type = NULL;
+ const char *psz_status = NULL;
+
msg_Dbg( p_demux, " * service id=%d eit schedule=%d present=%d "
"running=%d free_ca=%d",
p_srv->i_service_id, p_srv->b_eit_schedule,
p_srv->b_eit_present, p_srv->i_running_status,
p_srv->b_free_ca );
+ if( p_sys->i_dvb_program != -1 && p_sys->i_dvb_program != p_srv->i_service_id )
+ continue;
+
+ p_meta = vlc_meta_New();
for( p_dr = p_srv->p_first_descriptor; p_dr; p_dr = p_dr->p_next )
{
if( p_dr->i_tag == 0x48 )
{
- static const char *psz_type[0x11] = {
+ static const char *ppsz_type[17] = {
"Reserved",
"Digital television service",
"Digital radio sound service",
str2[pD->i_service_name_length] = '\0';
msg_Dbg( p_demux, " - type=%d provider=%s name=%s",
- pD->i_service_type, str1, str2 );
+ pD->i_service_type, str1, str2 );
- vlc_meta_Add( p_meta, "Name", str2 );
- vlc_meta_Add( p_meta, "Provider", str1 );
+ vlc_meta_SetTitle( p_meta, str2 );
+ vlc_meta_SetPublisher( p_meta, str1 );
if( pD->i_service_type >= 0x01 && pD->i_service_type <= 0x10 )
- vlc_meta_Add( p_meta, "Type", psz_type[pD->i_service_type] );
+ psz_type = ppsz_type[pD->i_service_type];
}
}
- if( p_srv->i_running_status == 0x01 )
- vlc_meta_Add( p_meta, "Status", "Not running" );
- else if( p_srv->i_running_status == 0x02 )
- vlc_meta_Add( p_meta, "Status", "Starts in a few seconds" );
- else if( p_srv->i_running_status == 0x03 )
- vlc_meta_Add( p_meta, "Status", "Pausing" );
- else if( p_srv->i_running_status == 0x04 )
- vlc_meta_Add( p_meta, "Status", "Running" );
- else
- vlc_meta_Add( p_meta, "Status", "Unknown" );
+ if( p_srv->i_running_status >= 0x01 && p_srv->i_running_status <= 0x04 )
+ {
+ static const char *ppsz_status[5] = {
+ "Unknown",
+ "Not running",
+ "Starts in a few seconds",
+ "Pausing",
+ "Running"
+ };
+ psz_status = ppsz_status[p_srv->i_running_status];
+ }
+ if( psz_type )
+ vlc_meta_AddExtra( p_meta, "Type", psz_type );
+ if( psz_status )
+ vlc_meta_AddExtra( p_meta, "Status", psz_status );
es_out_Control( p_demux->out, ES_OUT_SET_GROUP_META,
p_srv->i_service_id, p_meta );
sdt->psi->i_sdt_version = p_sdt->i_version;
dvbpsi_DeleteSDT( p_sdt );
}
-#if 0
-static void DecodeMjd( int i_mjd, int *p_y, int *p_m, int *p_d )
+
+/* i_year: year - 1900 i_month: 0-11 i_mday: 1-31 i_hour: 0-23 i_minute: 0-59 i_second: 0-59 */
+static int64_t vlc_timegm( int i_year, int i_month, int i_mday, int i_hour, int i_minute, int i_second )
{
- int yp = (int)( ( (double)i_mjd - 15078.2)/365.25 );
- int mp = (int)( ((double)i_mjd - 14956.1 - (int)(yp * 365.25)) / 30.6001 );
+ static const int pn_day[12+1] = { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 };
+ int64_t i_day;
+ int i;
+ if( i_year < 70 ||
+ i_month < 0 || i_month > 11 || i_mday < 1 || i_mday > 31 ||
+ i_hour < 0 || i_hour > 23 || i_minute < 0 || i_minute > 59 || i_second < 0 || i_second > 59 )
+ return -1;
+
+ /* Count the number of days */
+ i_day = 365 * (i_year-70) + pn_day[i_month] + i_mday - 1;
+#define LEAP(y) ( ((y)%4) == 0 && (((y)%100) != 0 || ((y)%400) == 0) ? 1 : 0)
+ for( i = 70; i < i_year; i++ )
+ i_day += LEAP(1900+i);
+ if( i_month > 1 )
+ i_day += LEAP(1900+i_year);
+#undef LEAP
+ /**/
+ return ((24*i_day + i_hour)*60 + i_minute)*60 + i_second;
+}
+
+static void EITDecodeMjd( int i_mjd, int *p_y, int *p_m, int *p_d )
+{
+ const int yp = (int)( ( (double)i_mjd - 15078.2)/365.25 );
+ const int mp = (int)( ((double)i_mjd - 14956.1 - (int)(yp * 365.25)) / 30.6001 );
+ const int c = ( mp == 14 || mp == 15 ) ? 1 : 0;
+
+ *p_y = 1900 + yp + c*1;
+ *p_m = mp - 1 + c*12;
*p_d = i_mjd - 14956 - (int)(yp*365.25) - (int)(mp*30.6001);
+}
+#define CVT_FROM_BCD(v) ((((v) >> 4)&0xf)*10 + ((v)&0xf))
+static int64_t EITConvertStartTime( uint64_t i_date )
+{
+ const int i_mjd = i_date >> 24;
+ const int i_hour = CVT_FROM_BCD(i_date >> 16);
+ const int i_minute = CVT_FROM_BCD(i_date >> 8);
+ const int i_second = CVT_FROM_BCD(i_date );
+ int i_year;
+ int i_month;
+ int i_day;
+
+ /* if all 40 bits are 1, the start is unknown */
+ if( i_date == UINT64_C(0xffffffffff) )
+ return -1;
- if( mp == 14 || mp == 15 )
- {
- *p_y = yp + 1;
- *p_m = mp - 1 + 12;
+ EITDecodeMjd( i_mjd, &i_year, &i_month, &i_day );
+ return vlc_timegm( i_year - 1900, i_month - 1, i_day, i_hour, i_minute, i_second );
+}
+static int EITConvertDuration( uint32_t i_duration )
+{
+ return CVT_FROM_BCD(i_duration >> 16) * 3600 +
+ CVT_FROM_BCD(i_duration >> 8 ) * 60 +
+ CVT_FROM_BCD(i_duration );
+}
+#undef CVT_FROM_BCD
+
+/* FIXME same than dvbsi_to_utf8 from dvb access */
+static char *
+EITConvertToUTF8( const unsigned char *psz_instring, size_t i_length )
+{
+ const char *psz_encoding;
+ 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_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_encoding = "ISO_8859-5";
+ break;
+ case 0x02:
+ psz_encoding = "ISO_8859-6";
+ break;
+ case 0x03:
+ psz_encoding = "ISO_8859-7";
+ break;
+ case 0x04:
+ psz_encoding = "ISO_8859-8";
+ break;
+ case 0x05:
+ psz_encoding = "ISO_8859-9";
+ break;
+ case 0x06:
+ psz_encoding = "ISO_8859-10";
+ break;
+ case 0x07:
+ psz_encoding = "ISO_8859-11";
+ break;
+ case 0x08:
+ psz_encoding = "ISO_8859-12";
+ break;
+ case 0x09:
+ psz_encoding = "ISO_8859-13";
+ break;
+ case 0x0a:
+ psz_encoding = "ISO_8859-14";
+ break;
+ case 0x0b:
+ psz_encoding = "ISO_8859-15";
+ break;
+ case 0x10:
+#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:
+#warning Is there a BOM or do we use a fixed endianess?
+ psz_encoding = "UTF-16";
+ break;
+ case 0x12:
+ psz_encoding = "KSC5601-1987";
+ break;
+ case 0x13:
+ psz_encoding = "GB2312"; /* GB-2312-1980 */
+ break;
+ case 0x14:
+ psz_encoding = "BIG-5";
+ break;
+ case 0x15:
+ psz_encoding = "UTF-8";
+ break;
+ default:
+ /* invalid */
+ 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 );
+ 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
{
- *p_y = yp;
- *p_m = mp - 1;
+ 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;
}
-#endif
-static void EITEventFixString( unsigned char *psz )
-{
- int i_len;
- /* Sometimes the first char isn't a normal char but designed
- * caracters encoding, for now lets skip it */
- if( psz[0] >= 0x20 )
- 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 )
{
+ demux_sys_t *p_sys = p_demux->p_sys;
dvbpsi_eit_event_t *p_evt;
- vlc_meta_t *p_meta;
- vlc_bool_t b_event_active = VLC_FALSE;
+ vlc_epg_t *p_epg;
msg_Dbg( p_demux, "EITCallBack called" );
- if( !p_eit->b_current_next )
+ if( !p_eit->b_current_next || ( p_sys->i_dvb_program != -1 && p_sys->i_dvb_program != p_eit->i_service_id ) )
{
dvbpsi_DeleteEIT( p_eit );
return;
p_eit->i_ts_id, p_eit->i_network_id,
p_eit->i_segment_last_section_number, p_eit->i_last_table_id );
- p_meta = vlc_meta_New();
+ p_epg = vlc_epg_New( NULL );
for( p_evt = p_eit->p_first_event; p_evt; p_evt = p_evt->p_next )
{
dvbpsi_descriptor_t *p_dr;
- char *psz_cat = malloc( strlen("Event")+10 );
- char psz_start[15];
- char psz_duration[15];
- char psz_name[256];
- char psz_text[256];
+ char *psz_name = NULL;
+ char *psz_text = NULL;
char *psz_extra = strdup("");
- char *psz_value;
-
- sprintf( psz_cat, "Event %d", p_evt->i_event_id );
- sprintf( psz_start, "%d%d:%d%d:%d%d",
- (int)(p_evt->i_start_time >> 20)&0xf,
- (int)(p_evt->i_start_time >> 16)&0xf,
- (int)(p_evt->i_start_time >> 12)&0xf,
- (int)(p_evt->i_start_time >> 8)&0xf,
- (int)(p_evt->i_start_time >> 4)&0xf,
- (int)(p_evt->i_start_time )&0xf );
- sprintf( psz_duration, "%d%d:%d%d:%d%d",
- (p_evt->i_duration >> 20)&0xf, (p_evt->i_duration >> 16)&0xf,
- (p_evt->i_duration >> 12)&0xf, (p_evt->i_duration >> 8)&0xf,
- (p_evt->i_duration >> 4)&0xf, (p_evt->i_duration )&0xf );
- psz_name[0] = psz_text[0] = '\0';
-
- msg_Dbg( p_demux, " * event id=%d start_time:mjd=%d %s duration=%s "
+ int64_t i_start;
+ int i_duration;
+
+ i_start = EITConvertStartTime( p_evt->i_start_time );
+ i_duration = EITConvertDuration( p_evt->i_duration );
+
+ msg_Dbg( p_demux, " * event id=%d start_time:%d duration=%d "
"running=%d free_ca=%d",
- p_evt->i_event_id,
- (int)(p_evt->i_start_time >> 24),
- psz_start, psz_duration,
+ p_evt->i_event_id, (int)i_start, (int)i_duration,
p_evt->i_running_status, p_evt->b_free_ca );
for( p_dr = p_evt->p_first_descriptor; p_dr; p_dr = p_dr->p_next )
if( pE )
{
- memcpy( psz_name, pE->i_event_name, pE->i_event_name_length);
- psz_name[pE->i_event_name_length] = '\0';
- memcpy( psz_text, pE->i_text, pE->i_text_length );
- psz_text[pE->i_text_length] = '\0';
-
- EITEventFixString(psz_name);
- EITEventFixString(psz_text);
+ psz_name = EITConvertToUTF8( pE->i_event_name, pE->i_event_name_length);
+ psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length );
msg_Dbg( p_demux, " - short event lang=%3.3s '%s' : '%s'",
pE->i_iso_639_code, psz_name, psz_text );
}
else if( p_dr->i_tag == 0x4e )
{
dvbpsi_extended_event_dr_t *pE = dvbpsi_DecodeExtendedEventDr( p_dr );
- char str1[257];
- char str2[257];
-
if( pE )
{
int i;
- msg_Dbg( p_demux, " - extended event lang=%3.3s",
- pE->i_iso_639_code );
- for( i = 0; i < pE->i_entry_count; i++ )
+ msg_Dbg( p_demux, " - extended event lang=%3.3s [%d/%d]",
+ pE->i_iso_639_code,
+ pE->i_descriptor_number, pE->i_last_descriptor_number );
+
+ if( pE->i_text_length > 0 )
{
- memcpy( str1, pE->i_item_description[i],
- pE->i_item_description_length[i] );
- str1[pE->i_item_description_length[i]] = '\0';
- EITEventFixString(str1);
-
- memcpy( str2, pE->i_item[i],
- pE->i_item_length[i] );
- str2[pE->i_item_length[i]] = '\0';
- EITEventFixString(str2);
-
- msg_Dbg( p_demux, " - desc='%s' item='%s'", str1, str2 );
- psz_extra = realloc( psz_extra,
- strlen(psz_extra) +
- strlen(str1) +strlen(str2) + 1 + 3 );
- strcat( psz_extra, str1 );
- strcat( psz_extra, "(" );
- strcat( psz_extra, str2 );
- strcat( psz_extra, ") " );
+ char *psz_text = EITConvertToUTF8( pE->i_text, pE->i_text_length );
+ msg_Dbg( p_demux, " - text='%s'", psz_text );
+
+ psz_extra = realloc( psz_extra, strlen(psz_extra) + strlen(psz_text) + 1 );
+ strcat( psz_extra, psz_text );
+ free( psz_text );
}
- memcpy( str1, pE->i_text, pE->i_text_length );
- str1[pE->i_text_length] = '\0';
- EITEventFixString(str1);
+ 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_itm = EITConvertToUTF8( pE->i_item[i], pE->i_item_length[i] );
- msg_Dbg( p_demux, " - text='%s'", str1 );
- psz_extra = realloc( psz_extra,
- strlen(psz_extra) + strlen(str1) + 2 );
- strcat( psz_extra, str1 );
- strcat( psz_extra, " " );
+ if( psz_dsc && psz_itm )
+ {
+ msg_Dbg( p_demux, " - desc='%s' item='%s'", psz_dsc, psz_itm );
+
+ psz_extra = realloc( psz_extra, strlen(psz_extra) + strlen(psz_dsc) + strlen(psz_itm) + 3 + 1 );
+ strcat( psz_extra, "(" );
+ strcat( psz_extra, psz_dsc );
+ strcat( psz_extra, " " );
+ strcat( psz_extra, psz_itm );
+ strcat( psz_extra, ")" );
+ }
+ if( psz_dsc )
+ free( psz_dsc );
+ if( psz_itm )
+ free( psz_itm );
+ }
}
}
else
}
}
- asprintf( &psz_value, "%s: %s (+%s) %s (%s)",
- psz_start,
- psz_name,
- psz_duration,
- psz_text, psz_extra );
- vlc_meta_Add( p_meta, psz_cat, psz_value );
- free( psz_value );
+ /* */
+ if( i_start > 0 )
+ vlc_epg_AddEvent( p_epg, i_start, i_duration, psz_name, psz_text, psz_extra );
- if( p_evt->i_running_status == 0x04 )
- {
- vlc_meta_Add( p_meta, VLC_META_NOW_PLAYING, psz_name );
- b_event_active = VLC_TRUE;
- }
+ /* Update "now playing" field */
+ if( p_evt->i_running_status == 0x04 && i_start > 0 )
+ vlc_epg_SetCurrent( p_epg, i_start );
+
+ if( psz_name )
+ free( psz_name );
+ if( psz_text )
+ free( psz_text );
- free( psz_cat );
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( !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 );
+ 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 );
}
msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
i_table_id, i_table_id, i_extension, i_extension );
#endif
-
- if( i_table_id == 0x42 )
+ if( p_demux->p_sys->pid[0].psi->i_pat_version != -1 && i_table_id == 0x42 )
{
msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
i_table_id, i_table_id, i_extension, i_extension );
dvbpsi_AttachSDT( h, i_table_id, i_extension,
(dvbpsi_sdt_callback)SDTCallBack, p_demux );
}
- else if( i_table_id == 0x4e || /* Current/Following */
- ( i_table_id >= 0x50 && i_table_id <= 0x5f ) ) /* Schedule */
+ else if( p_demux->p_sys->pid[0x11].psi->i_sdt_version != -1 &&
+ ( i_table_id == 0x4e || /* Current/Following */
+ (i_table_id >= 0x50 && i_table_id <= 0x5f) ) ) /* Schedule */
{
msg_Dbg( p_demux, "PSINewTableCallBack: table 0x%x(%d) ext=0x%x(%d)",
i_table_id, i_table_id, i_extension, i_extension );
{
dvbpsi_stream_identifier_dr_t *si;
si = dvbpsi_DecodeStreamIdentifierDr( p_dr );
-
+
msg_Dbg( p_demux, " * Stream Component Identifier: %d", si->i_component_tag );
}
#endif
msg_Dbg( p_demux, " * EBU Teletext descriptor" );
pid->es->fmt.i_cat = SPU_ES;
pid->es->fmt.i_codec = VLC_FOURCC( 't', 'e', 'l', 'x' );
- pid->es->fmt.psz_description = strdup( "Teletext" );
pid->es->fmt.i_extra = p_dr->i_length;
pid->es->fmt.p_extra = malloc( p_dr->i_length );
memcpy( pid->es->fmt.p_extra, p_dr->p_data,
p_dr->i_length );
+
+#if defined _DVBPSI_DR_56_H_ && defined DVBPSI_VERSION \
+ && DVBPSI_VERSION_INT > ((0<<16)+(1<<8)+5)
+ pid->es->fmt.i_group = p_pmt->i_program_number;
+
+ /* In stream output mode, only enable descriptor
+ * pass-through. */
+ if( !p_demux->out->b_sout )
+ {
+ uint16_t n, i = 0;
+ dvbpsi_teletext_dr_t *sub;
+
+ sub = dvbpsi_DecodeTeletextDr( p_dr );
+ if( !sub ) continue;
+
+ /* Each subtitle ES contains n languages,
+ * We are going to create n ES for the n tracks */
+ for( n = 0; n < sub->i_pages_number; n++ )
+ {
+ dvbpsi_teletextpage_t *p_page = &sub->p_pages[n];
+ if( p_page->i_teletext_type == 0x2
+ || p_page->i_teletext_type == 0x5 )
+ {
+ ts_es_t *p_es;
+
+ if( i == 0 )
+ {
+ p_es = pid->es;
+ }
+ 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;
+
+ p_es->id = NULL;
+ p_es->p_pes = NULL;
+ p_es->i_pes_size = 0;
+ p_es->i_pes_gathered = 0;
+ p_es->pp_last = &p_es->p_pes;
+ p_es->p_mpeg4desc = NULL;
+
+ TAB_APPEND( pid->i_extra_es, pid->extra_es,
+ p_es );
+ }
+
+ p_es->fmt.psz_language = malloc( 4 );
+ memcpy( p_es->fmt.psz_language,
+ p_page->i_iso6392_language_code, 3 );
+ p_es->fmt.psz_language[3] = 0;
+
+ switch( p_page->i_teletext_type )
+ {
+ case 0x2:
+ p_es->fmt.psz_description =
+ strdup(_("Teletext subtitles"));
+ msg_Dbg( p_demux,
+ " * sub lan=%s page=%d%x",
+ p_es->fmt.psz_language,
+ p_page->i_teletext_magazine_number,
+ p_page->i_teletext_page_number );
+ break;
+
+ case 0x5:
+ p_es->fmt.psz_description =
+ strdup(_("Teletext hearing impaired subtitles"));
+ msg_Dbg( p_demux,
+ " * hearing impaired lan=%s page=%d%x",
+ p_es->fmt.psz_language,
+ p_page->i_teletext_magazine_number,
+ p_page->i_teletext_page_number );
+ break;
+ default:
+ break;
+ }
+
+ p_es->fmt.subs.dvb.i_id =
+ p_page->i_teletext_page_number;
+ /* Hack, FIXME */
+ p_es->fmt.subs.dvb.i_id |=
+ ((int)p_page->i_teletext_magazine_number << 16);
+
+ i++;
+ }
+ }
+
+ if( !i )
+ pid->es->fmt.i_cat = UNKNOWN_ES;
+ }
+ else
+#endif /* defined _DVBPSI_DR_56_H_ && DVBPSI_VERSION(0,1,6) */
+ {
+ pid->es->fmt.subs.dvb.i_id = -1;
+ pid->es->fmt.psz_description = strdup( "Teletext" );
+ }
}
-#ifdef _DVBPSI_DR_59_H_
else if( p_dr->i_tag == 0x59 )
{
- uint16_t n;
- dvbpsi_subtitling_dr_t *sub;
-
/* DVB subtitles */
pid->es->fmt.i_cat = SPU_ES;
pid->es->fmt.i_codec = VLC_FOURCC( 'd', 'v', 'b', 's' );
+ pid->es->fmt.i_extra = p_dr->i_length;
+ pid->es->fmt.p_extra = malloc( p_dr->i_length );
+ memcpy( pid->es->fmt.p_extra, p_dr->p_data,
+ p_dr->i_length );
+
+#ifdef _DVBPSI_DR_59_H_
pid->es->fmt.i_group = p_pmt->i_program_number;
- sub = dvbpsi_DecodeSubtitlingDr( p_dr );
- if( !sub ) continue;
+ /* In stream output mode, only enable descriptor
+ * pass-through. */
+ if( !p_demux->out->b_sout )
+ {
+ uint16_t n, i = 0;
+ dvbpsi_subtitling_dr_t *sub;
+
+ sub = dvbpsi_DecodeSubtitlingDr( p_dr );
+ if( !sub ) continue;
+
+ for( n = 0; n < sub->i_subtitles_number; n++ )
+ {
+ dvbpsi_subtitle_t *p_sub = &sub->p_subtitle[n];
+ ts_es_t *p_es;
+
+ if( i == 0 )
+ {
+ p_es = pid->es;
+ }
+ 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;
+
+ p_es->id = NULL;
+ p_es->p_pes = NULL;
+ p_es->i_pes_size = 0;
+ p_es->i_pes_gathered = 0;
+ p_es->pp_last = &p_es->p_pes;
+ p_es->p_mpeg4desc = NULL;
+
+ TAB_APPEND( pid->i_extra_es, pid->extra_es,
+ p_es );
+ }
+
+ p_es->fmt.psz_language = malloc( 4 );
+ memcpy( p_es->fmt.psz_language,
+ p_sub->i_iso6392_language_code, 3 );
+ p_es->fmt.psz_language[3] = 0;
+
+ switch( p_sub->i_subtitling_type )
+ {
+ case 0x10:
+ p_es->fmt.psz_description =
+ strdup(_("subtitles"));
+ break;
+ case 0x11:
+ p_es->fmt.psz_description =
+ strdup(_("4:3 subtitles"));
+ break;
+ case 0x12:
+ p_es->fmt.psz_description =
+ strdup(_("16:9 subtitles"));
+ break;
+ case 0x13:
+ p_es->fmt.psz_description =
+ strdup(_("2.21:1 subtitles"));
+ break;
+ case 0x20:
+ p_es->fmt.psz_description =
+ strdup(_("hearing impaired"));
+ break;
+ case 0x21:
+ p_es->fmt.psz_description =
+ strdup(_("4:3 hearing impaired"));
+ break;
+ case 0x22:
+ p_es->fmt.psz_description =
+ strdup(_("16:9 hearing impaired"));
+ break;
+ case 0x23:
+ p_es->fmt.psz_description =
+ strdup(_("2.21:1 hearing impaired"));
+ break;
+ default:
+ break;
+ }
+
+ p_es->fmt.subs.dvb.i_id =
+ p_sub->i_composition_page_id;
+ /* Hack, FIXME */
+ p_es->fmt.subs.dvb.i_id |=
+ ((int)p_sub->i_ancillary_page_id << 16);
+
+ i++;
+ }
- /* Each subtitle ES contains n languages,
- * We are going to create n ES for the n tracks */
- if( sub->i_subtitles_number > 0 )
+ if( !i )
+ pid->es->fmt.i_cat = UNKNOWN_ES;
+ }
+ else
+#endif /* _DVBPSI_DR_59_H_ */
{
- pid->es->fmt.psz_language = malloc( 4 );
- memcpy( pid->es->fmt.psz_language,
- sub->p_subtitle[0].i_iso6392_language_code, 3);
- pid->es->fmt.psz_language[3] = 0;
-
- pid->es->fmt.subs.dvb.i_id =
- sub->p_subtitle[0].i_composition_page_id;
- /* Hack, FIXME */
- pid->es->fmt.subs.dvb.i_id |=
- ((int)sub->p_subtitle[0].i_ancillary_page_id << 16);
+ pid->es->fmt.subs.dvb.i_id = -1;
+ pid->es->fmt.psz_description = strdup( "DVB subtitles" );
}
- else pid->es->fmt.i_cat = UNKNOWN_ES;
+ }
+ }
+ }
+ else if( p_es->i_type == 0xEA )
+ {
+ dvbpsi_descriptor_t *p_dr;
- for( n = 1; n < sub->i_subtitles_number; n++ )
+ for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
+ p_dr = p_dr->p_next )
+ {
+ msg_Dbg( p_demux, " * es pid=%d type=%d dr->i_tag=0x%x",
+ p_es->i_pid, p_es->i_type, p_dr->i_tag );
+
+ if( p_dr->i_tag == 0x05 )
+ {
+ /* Registration Descriptor */
+ if( p_dr->i_length < 4 ) // XXX VC-1 has extended this descriptor with sub-descriptor
{
- ts_es_t *p_es = malloc( sizeof( ts_es_t ) );
- p_es->fmt = pid->es->fmt;
- p_es->id = NULL;
- p_es->p_pes = NULL;
- p_es->i_pes_size = 0;
- p_es->i_pes_gathered = 0;
- p_es->pp_last = &p_es->p_pes;
- p_es->p_mpeg4desc = NULL;
-
- p_es->fmt.psz_language = malloc( 4 );
- memcpy( p_es->fmt.psz_language,
- sub->p_subtitle[n].i_iso6392_language_code, 3);
- p_es->fmt.psz_language[3] = 0;
-
- p_es->fmt.subs.dvb.i_id =
- sub->p_subtitle[n].i_composition_page_id;
- /* Hack, FIXME */
- p_es->fmt.subs.dvb.i_id |=
- ((int)sub->p_subtitle[n].i_ancillary_page_id << 16);
-
- TAB_APPEND( pid->i_extra_es, pid->extra_es, p_es );
+ msg_Warn( p_demux, "invalid Registration Descriptor" );
+ }
+ else
+ {
+ if( !memcmp( p_dr->p_data, "VC-1", 4 ) )
+ {
+ /* registration descriptor for VC-1 (SMPTE rp227) */
+ pid->es->fmt.i_cat = VIDEO_ES;
+ pid->es->fmt.i_codec = VLC_FOURCC('W','V','C','1');
+
+ /* XXX With Simple and Main profile the SEQUENCE
+ * header is modified: video width and height are
+ * inserted just after the start code as 2 int16_t
+ * The packetizer will take care of that. */
+ }
+ else
+ {
+ msg_Warn( p_demux,
+ "unknown Registration Descriptor (%4.4s)",
+ p_dr->p_data );
+ }
}
}
-#endif /* _DVBPSI_DR_59_H_ */
}
}
else if( p_es->i_type == 0xa0 )
( 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 )
if( pid->es->fmt.i_cat == AUDIO_ES ||
( pid->es->fmt.i_cat == SPU_ES &&
- pid->es->fmt.i_codec != VLC_FOURCC('d','v','b','s') ) )
+ pid->es->fmt.i_codec != VLC_FOURCC('d','v','b','s') &&
+ pid->es->fmt.i_codec != VLC_FOURCC('t','e','l','x') ) )
{
/* get language descriptor */
dvbpsi_descriptor_t *p_dr = p_es->p_first_descriptor;
if( p_decoded )
{
+#if defined(DR_0A_API_VER) && (DR_0A_API_VER >= 2)
+ pid->es->fmt.psz_language = malloc( 4 );
+ memcpy( pid->es->fmt.psz_language,
+ p_decoded->code[0].iso_639_code, 3 );
+ pid->es->fmt.psz_language[3] = 0;
+ msg_Dbg( p_demux, "found language: %s", pid->es->fmt.psz_language);
+ switch( p_decoded->code[0].i_audio_type ) {
+ case 0:
+ pid->es->fmt.psz_description = NULL;
+ break;
+ case 1:
+ pid->es->fmt.psz_description =
+ strdup(_("clean effects"));
+ break;
+ case 2:
+ pid->es->fmt.psz_description =
+ strdup(_("hearing impaired"));
+ break;
+ case 3:
+ pid->es->fmt.psz_description =
+ strdup(_("visual impaired commentary"));
+ break;
+ default:
+ msg_Dbg( p_demux, "unknown audio type: %d",
+ p_decoded->code[0].i_audio_type);
+ pid->es->fmt.psz_description = NULL;
+ break;
+ }
+ pid->es->fmt.i_extra_languages = p_decoded->i_code_count-1;
+ if( pid->es->fmt.i_extra_languages > 0 )
+ pid->es->fmt.p_extra_languages =
+ malloc( sizeof(*pid->es->fmt.p_extra_languages) *
+ pid->es->fmt.i_extra_languages );
+ for( i = 0; i < pid->es->fmt.i_extra_languages; i++ ) {
+ msg_Dbg( p_demux, "bang" );
+ pid->es->fmt.p_extra_languages[i].psz_language =
+ malloc(4);
+ memcpy(pid->es->fmt.p_extra_languages[i].psz_language,
+ p_decoded->code[i+1].iso_639_code, 3 );
+ pid->es->fmt.p_extra_languages[i].psz_language[3] = '\0';
+ switch( p_decoded->code[i].i_audio_type ) {
+ case 0:
+ pid->es->fmt.p_extra_languages[i].psz_description =
+ NULL;
+ break;
+ case 1:
+ pid->es->fmt.p_extra_languages[i].psz_description =
+ strdup(_("clean effects"));
+ break;
+ case 2:
+ pid->es->fmt.p_extra_languages[i].psz_description =
+ strdup(_("hearing impaired"));
+ break;
+ case 3:
+ pid->es->fmt.p_extra_languages[i].psz_description =
+ strdup(_("visual impaired commentary"));
+ break;
+ default:
+ msg_Dbg( p_demux, "unknown audio type: %d",
+ p_decoded->code[i].i_audio_type);
+ pid->es->fmt.psz_description = NULL;
+ break;
+ }
+
+ }
+#else
pid->es->fmt.psz_language = malloc( 4 );
memcpy( pid->es->fmt.psz_language,
p_decoded->i_iso_639_code, 3 );
pid->es->fmt.psz_language[3] = 0;
+#endif
}
}
}
}
}
- if( DVBProgramIsSelected( p_demux, prg->i_number ) )
+ if( DVBProgramIsSelected( p_demux, prg->i_number )
+ && (pid->es->id != NULL || p_sys->b_udp_out) )
{
/* Set demux filter */
stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
if( p_sys->i_dvb_program == 0 )
p_sys->i_dvb_program = p_program->i_number;
- if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, p_program->i_pid, VLC_TRUE ) )
+ if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
+ ACCESS_SET_PRIVATE_ID_STATE,
+ p_program->i_pid, VLC_TRUE ) )
p_sys->b_dvb_control = VLC_FALSE;
}
}
dvbpsi_DeletePAT( p_pat );
}
-
projects / vlc / blobdiff