Commit 7a497c95 authored by Francois Cartegnie's avatar Francois Cartegnie

demux: ts: name registration type

parent 1702e77a
...@@ -237,6 +237,12 @@ typedef enum ...@@ -237,6 +237,12 @@ typedef enum
TS_ES_DATA_TABLE_SECTION TS_ES_DATA_TABLE_SECTION
} ts_es_data_type_t; } ts_es_data_type_t;
typedef enum
{
TS_REGISTRATION_OTHER = 0,
TS_REGISTRATION_HDMV
} ts_registration_type_t;
typedef struct typedef struct
{ {
es_format_t fmt; es_format_t fmt;
...@@ -3999,7 +4005,7 @@ static void PMTCallBack( void *data, dvbpsi_pmt_t *p_pmt ) ...@@ -3999,7 +4005,7 @@ static void PMTCallBack( void *data, dvbpsi_pmt_t *p_pmt )
SetPIDFilter( p_demux, prg->i_pid_pcr, true ); /* Set demux filter */ SetPIDFilter( p_demux, prg->i_pid_pcr, true ); /* Set demux filter */
/* Parse descriptor */ /* Parse descriptor */
bool b_hdmv = false; ts_registration_type_t registration_type = TS_REGISTRATION_OTHER;
dvbpsi_descriptor_t *p_dr; dvbpsi_descriptor_t *p_dr;
for( p_dr = p_pmt->p_first_descriptor; p_dr != NULL; p_dr = p_dr->p_next ) for( p_dr = p_pmt->p_first_descriptor; p_dr != NULL; p_dr = p_dr->p_next )
switch(p_dr->i_tag) switch(p_dr->i_tag)
...@@ -4023,7 +4029,7 @@ static void PMTCallBack( void *data, dvbpsi_pmt_t *p_pmt ) ...@@ -4023,7 +4029,7 @@ static void PMTCallBack( void *data, dvbpsi_pmt_t *p_pmt )
{ {
msg_Dbg( p_demux, " * descriptor : registration %4.4s", p_dr->p_data ); msg_Dbg( p_demux, " * descriptor : registration %4.4s", p_dr->p_data );
if( !memcmp( p_dr->p_data, "HDMV", 4 ) || !memcmp( p_dr->p_data, "HDPR", 4 ) ) if( !memcmp( p_dr->p_data, "HDMV", 4 ) || !memcmp( p_dr->p_data, "HDPR", 4 ) )
b_hdmv = true; /* Blu-Ray */ registration_type = TS_REGISTRATION_HDMV; /* Blu-Ray */
} }
break; break;
...@@ -4088,7 +4094,7 @@ static void PMTCallBack( void *data, dvbpsi_pmt_t *p_pmt ) ...@@ -4088,7 +4094,7 @@ static void PMTCallBack( void *data, dvbpsi_pmt_t *p_pmt )
{ {
PMTSetupEs0xA0( p_demux, pid, p_es ); PMTSetupEs0xA0( p_demux, pid, p_es );
} }
else if( b_hdmv ) else if( registration_type == TS_REGISTRATION_HDMV )
{ {
PMTSetupEsHDMV( pid, p_es ); PMTSetupEsHDMV( pid, p_es );
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment