mirror
/
kierank-libmpegts
kopia lustrzana https://github.com/kierank/libmpegts
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix E-AC3 and VBI issues.

sdt
Kieran Kunhya 2011-06-17 15:04:21 +01:00
rodzic f7be618845
commit fa9f763364
2 zmienionych plików z 6 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
codecs.h
Wyświetl plik

@ -101,7 +101,6 @@ const aac_buffer_t aac_buffers[] =
{ 0 }, { 0 },
}; };
/** 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

12
libmpegts.c
Wyświetl plik

@ -243,6 +243,8 @@ int ts_setup_transport_stream( ts_writer_t *w, ts_main_t *params )
else if( cur_stream->stream_format == LIBMPEGTS_AUDIO_AC3 || cur_stream->stream_format == LIBMPEGTS_AUDIO_EAC3 ) else if( cur_stream->stream_format == LIBMPEGTS_AUDIO_AC3 || cur_stream->stream_format == LIBMPEGTS_AUDIO_EAC3 )
{ {
cur_stream->rx = MISC_AUDIO_RXN; cur_stream->rx = MISC_AUDIO_RXN;
/* The spec is not at all clear whether E-AC3 uses these models as well.
* Let's assume nobody will send ultra high bitrate E-AC3 */
cur_stream->mb.buf_size = w->ts_type == TS_TYPE_ATSC || w->ts_type == TS_TYPE_CABLELABS ? AC3_BS_ATSC : AC3_BS_DVB; cur_stream->mb.buf_size = w->ts_type == TS_TYPE_ATSC || w->ts_type == TS_TYPE_CABLELABS ? AC3_BS_ATSC : AC3_BS_DVB;
} }
@ -685,6 +687,8 @@ int ts_setup_dvb_vbi( ts_writer_t *w, int pid, int num_vbis, ts_dvb_vbi_t *vbis
fail: fail:
fprintf( stderr, "Malloc failed\n" );
for( int i = 0; i < stream->num_dvb_vbi; i++ ) for( int i = 0; i < stream->num_dvb_vbi; i++ )
{ {
if( stream->dvb_vbi_ctx[i].lines ) if( stream->dvb_vbi_ctx[i].lines )
@ -693,7 +697,7 @@ fail:
free( stream->dvb_vbi_ctx ); free( stream->dvb_vbi_ctx );
return 0; return -1;
} }
int ts_write_frames( ts_writer_t *w, ts_frame_t *frames, int num_frames, uint8_t **out, int *len, int64_t **pcr_list ) int ts_write_frames( ts_writer_t *w, ts_frame_t *frames, int num_frames, uint8_t **out, int *len, int64_t **pcr_list )
@ -1688,12 +1692,8 @@ static int write_pmt( ts_writer_t *w, ts_int_program_t *program )
else else
write_ac3_descriptor( w, &q, 0 ); write_ac3_descriptor( w, &q, 0 );
} }
else if( stream->stream_format == LIBMPEGTS_AUDIO_EAC3 || else if( stream->stream_format == LIBMPEGTS_AUDIO_EAC3 || stream->stream_format == LIBMPEGTS_AUDIO_EAC3_SECONDARY )
stream->stream_format == LIBMPEGTS_AUDIO_EAC3_SECONDARY )
{
write_registration_descriptor( &q, REGISTRATION_DESCRIPTOR_TAG, 4, "AC-3" );
write_ac3_descriptor( w, &q, 1 ); write_ac3_descriptor( w, &q, 1 );
}
else if( stream->stream_format == LIBMPEGTS_AUDIO_DTS ) else if( stream->stream_format == LIBMPEGTS_AUDIO_DTS )
{ {
// TODO // TODO