Add the SCTE T-STD model for VBI data.

sdt
Kieran Kunhya 2011-05-14 00:17:25 +01:00
rodzic 717199bf6e
commit e5b45dcad2
2 zmienionych plików z 23 dodań i 11 usunięć

Wyświetl plik

@ -103,16 +103,16 @@ const aac_buffer_t aac_buffers[] =
/** AC3 **/ /** AC3 **/
/* AC3 buffer sizes */ /* AC3 buffer sizes */
#define AC3_BS_ATSC 2592*8 #define AC3_BS_ATSC 2592*8
#define AC3_BS_DVB 5696*8 #define AC3_BS_DVB 5696*8
/* SMPTE 302M */ /* SMPTE 302M */
#define SMPTE_302M_AUDIO_BS 65024*8 #define SMPTE_302M_AUDIO_BS 65024*8
#define SMPTE_302M_AUDIO_SR 48000 #define SMPTE_302M_AUDIO_SR 48000
/* Misc Audio */ /* Misc Audio */
#define MISC_AUDIO_BS 3584*8 #define MISC_AUDIO_BS 3584*8
#define MISC_AUDIO_RXN 2000000 #define MISC_AUDIO_RXN 2000000
/* DVB Subtitles */ /* DVB Subtitles */
#define DVB_SUB_RXN 192000 #define DVB_SUB_RXN 192000
@ -122,8 +122,12 @@ const aac_buffer_t aac_buffers[] =
#define DVB_SUB_DDS_MB_SIZE 100000 #define DVB_SUB_DDS_MB_SIZE 100000
/* Teletext */ /* Teletext */
#define TELETEXT_T_BS 480*8 /* Seems to have an odd Transport Buffer size */ #define TELETEXT_T_BS 480*8 /* Seems to have an odd Transport Buffer size */
#define TELETEXT_RXN 6750000 #define TELETEXT_RXN 6750000
#define TELETEXT_BTTX 1504*8 #define TELETEXT_BTTX 1504*8
/* SCTE VBI */
#define SCTE_VBI_RXN 324539
#define SCTE_VBI_MB_SIZE 2256*8
#endif #endif

Wyświetl plik

@ -668,10 +668,18 @@ int ts_setup_dvb_vbi( ts_writer_t *w, int pid, int num_vbis, ts_dvb_vbi_t *vbis
memcpy( stream->dvb_vbi_ctx[i].lines, vbis[i].lines, vbis[i].num_lines * sizeof(ts_dvb_vbi_line_t) ); memcpy( stream->dvb_vbi_ctx[i].lines, vbis[i].lines, vbis[i].num_lines * sizeof(ts_dvb_vbi_line_t) );
} }
/* VBI uses teletext T-STD */ if( w->ts_type == TS_TYPE_CABLELABS || w->ts_type == TS_TYPE_ATSC )
stream->tb.buf_size = TELETEXT_T_BS; {
stream->rx = TELETEXT_RXN; stream->rx = SCTE_VBI_RXN;
stream->mb.buf_size = TELETEXT_BTTX; stream->mb.buf_size = SCTE_VBI_MB_SIZE;
}
else
{
/* DVB-VBI uses teletext T-STD */
stream->tb.buf_size = TELETEXT_T_BS;
stream->rx = TELETEXT_RXN;
stream->mb.buf_size = TELETEXT_BTTX;
}
return 0; return 0;