static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-vlc_module_begin();
- set_shortname( N_("TY") );
- set_description(N_("TY Stream audio/video demux"));
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- set_capability("demux", 6);
+vlc_module_begin ()
+ set_shortname( N_("TY") )
+ set_description(N_("TY Stream audio/video demux"))
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
+ set_capability("demux", 6)
/* FIXME: there seems to be a segfault when using PVR access
* and TY demux has a bigger priority than PS
* Something must be wrong.
*/
- set_callbacks( Open, Close );
- add_shortcut("ty");
- add_shortcut("tivo");
-vlc_module_end();
+ set_callbacks( Open, Close )
+ add_shortcut("ty")
+ add_shortcut("tivo")
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
typedef struct
{
long l_rec_size;
- uint8_t ex1, ex2;
+ uint8_t ex[2];
uint8_t rec_type;
uint8_t subrec_type;
bool b_ext;
//mtime_t l_last_ty_pts_sync; /* audio PTS at time of last TY PTS */
uint64_t l_first_ty_pts; /* first TY PTS in this master chunk */
uint64_t l_final_ty_pts; /* final TY PTS in this master chunk */
- int i_seq_table_size; /* number of entries in SEQ table */
- int i_bits_per_seq_entry; /* # of bits in SEQ table bitmask */
+ unsigned i_seq_table_size; /* number of entries in SEQ table */
+ unsigned i_bits_per_seq_entry; /* # of bits in SEQ table bitmask */
mtime_t firstAudioPTS;
mtime_t lastAudioPTS;
/* register the proper audio codec */
if (p_sys->audio_type == TIVO_AUDIO_MPEG) {
- es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'm', 'p', 'g', 'a' ) );
+ es_format_Init( &fmt, AUDIO_ES, VLC_CODEC_MPGA );
} else {
- es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'a', '5', '2', ' ' ) );
+ es_format_Init( &fmt, AUDIO_ES, VLC_CODEC_A52 );
}
fmt.i_group = TY_ES_GROUP;
p_sys->p_audio = es_out_Add( p_demux->out, &fmt );
/* register the video stream */
- es_format_Init( &fmt, VIDEO_ES, VLC_FOURCC( 'm', 'p', 'g', 'v' ) );
+ es_format_Init( &fmt, VIDEO_ES, VLC_CODEC_MPGV );
fmt.i_group = TY_ES_GROUP;
p_sys->p_video = es_out_Add( p_demux->out, &fmt );
continue;
es_format_Init( &fmt, SPU_ES, fcc[i] );
- fmt.psz_description = strdup( _(ppsz_description[i]) );
+ fmt.psz_description = strdup( vlc_gettext(ppsz_description[i]) );
fmt.i_group = TY_ES_GROUP;
p_sys->p_cc[i] = es_out_Add( p_demux->out, &fmt );
es_format_Clean( &fmt );
{
demux_sys_t *p_sys = p_demux->p_sys;
int i_field;
- int i_channel;
if( p_block_in )
block_Release(p_block_in);
/* XDS data (extract programs infos) transmitted on field 2 only */
if( i_field == 1 )
- DemuxDecodeXds( p_demux, rec_hdr->ex1, rec_hdr->ex2 );
+ DemuxDecodeXds( p_demux, rec_hdr->ex[0], rec_hdr->ex[1] );
if( p_sys->cc.i_data + 3 > CC_MAX_DATA_SIZE )
return 0;
- p_sys->cc.p_data[p_sys->cc.i_data+0] = i_field;
- p_sys->cc.p_data[p_sys->cc.i_data+1] = rec_hdr->ex1;
- p_sys->cc.p_data[p_sys->cc.i_data+2] = rec_hdr->ex2;
- p_sys->cc.i_data += 3;
-
- i_channel = cc_Channel( i_field, &p_sys->cc.p_data[p_sys->cc.i_data-3 + 1] );
- if( i_channel >= 0 && i_channel < 4 )
- p_sys->cc.pb_present[i_channel] = true;
+ cc_AppendData( &p_sys->cc, i_field, rec_hdr->ex );
return 0;
}
{
demux_sys_t *p_sys = p_demux->p_sys;
int64_t seek_pos = p_sys->i_stream_size * seek_pct;
- int i, i_cur_part;
long l_skip_amt;
+ int i;
+ unsigned i_cur_part;
/* if we're not seekable, there's nothing to do */
if (!p_sys->b_seekable)
static int ty_stream_seek_time(demux_t *p_demux, uint64_t l_seek_time)
{
demux_sys_t *p_sys = p_demux->p_sys;
- int i, i_seq_entry = 0;
+ int i_seq_entry = 0;
int i_skip_cnt;
+ unsigned i;
long l_cur_pos = stream_Tell(p_demux->s);
- int i_cur_part = l_cur_pos / TIVO_PART_LENGTH;
+ unsigned i_cur_part = l_cur_pos / TIVO_PART_LENGTH;
long l_seek_secs = l_seek_time / 1000000000;
uint64_t l_fwd_stamp = 1;
so we need to skip past any stream data prior to the seq_rec
in this chunk */
i_skip_cnt = 0;
- for (i=0; i<p_sys->i_seq_rec; i++)
- i_skip_cnt += p_sys->rec_hdrs[i].l_rec_size;
+ for (int j=0; j<p_sys->i_seq_rec; j++)
+ i_skip_cnt += p_sys->rec_hdrs[j].l_rec_size;
stream_Read(p_demux->s, NULL, i_skip_cnt);
p_sys->i_cur_rec = p_sys->i_seq_rec;
//p_sys->l_last_ty_pts = p_sys->rec_hdrs[p_sys->i_seq_rec].l_ty_pts;
{
demux_sys_t *p_sys = p_demux->p_sys;
uint8_t mst_buf[32];
- int i, i_map_size;
+ uint32_t i, i_map_size;
int64_t i_save_pos = stream_Tell(p_demux->s);
int64_t i_pts_secs;
p_sys->i_seq_table_size = i / (8 + i_map_size);
/* parse all the entries */
- p_sys->seq_table = malloc(p_sys->i_seq_table_size * sizeof(ty_seq_table_t));
- for (i=0; i<p_sys->i_seq_table_size; i++) {
+ p_sys->seq_table = calloc(p_sys->i_seq_table_size, sizeof(ty_seq_table_t));
+ if (p_sys->seq_table == NULL)
+ {
+ p_sys->i_seq_table_size = 0;
+ return;
+ }
+ for (unsigned i=0; i<p_sys->i_seq_table_size; i++) {
stream_Read(p_demux->s, mst_buf, 8);
p_sys->seq_table[i].l_timestamp = U64_AT(&mst_buf[0]);
if (i_map_size > 8) {
msg_Err(p_demux, "Unsupported SEQ bitmap size in master chunk");
stream_Read(p_demux->s, NULL, i_map_size);
- memset(p_sys->seq_table[i].chunk_bitmask, i_map_size, 0);
} else {
stream_Read(p_demux->s, mst_buf + 8, i_map_size);
memcpy(p_sys->seq_table[i].chunk_bitmask, &mst_buf[8], i_map_size);
p_sys->b_have_master = true;
i_pts_secs = p_sys->l_first_ty_pts / 1000000000;
- msg_Dbg( p_demux, "first TY pts in master is %02d:%02d:%02d",
- (int)(i_pts_secs / 3600), (int)((i_pts_secs / 60) % 60), (int)(i_pts_secs % 60) );
+ msg_Dbg( p_demux,
+ "first TY pts in master is %02"PRId64":%02"PRId64":%02"PRId64,
+ i_pts_secs / 3600, (i_pts_secs / 60) % 60, i_pts_secs % 60 );
i_pts_secs = p_sys->l_final_ty_pts / 1000000000;
- msg_Dbg( p_demux, "final TY pts in master is %02d:%02d:%02d",
- (int)(i_pts_secs / 3600), (int)((i_pts_secs / 60) % 60), (int)(i_pts_secs % 60) );
+ msg_Dbg( p_demux,
+ "final TY pts in master is %02"PRId64":%02"PRId64":%02"PRId64,
+ i_pts_secs / 3600, (i_pts_secs / 60) % 60, i_pts_secs % 60 );
/* seek past this chunk */
stream_Seek(p_demux->s, i_save_pos + CHUNK_SIZE);
/* marker bit 2 set, so read extended data */
b1 = ( ( ( record_header[ 0 ] & 0x0f ) << 4 ) |
( ( record_header[ 1 ] & 0xf0 ) >> 4 ) );
- b1 &= 0x7f;
b2 = ( ( ( record_header[ 1 ] & 0x0f ) << 4 ) |
( ( record_header[ 2 ] & 0xf0 ) >> 4 ) );
- b2 &= 0x7f;
- p_rec_hdr->ex1 = b1;
- p_rec_hdr->ex2 = b2;
+ p_rec_hdr->ex[0] = b1;
+ p_rec_hdr->ex[1] = b2;
p_rec_hdr->l_rec_size = 0;
p_rec_hdr->l_ty_pts = 0;
p_rec_hdr->b_ext = true;
projects / vlc / blobdiff