Commit 9babbce9 authored by François Cartegnie's avatar François Cartegnie 🤞

vlc_es: rename NAV_ES to DATA_ES

Used as private type only with mkv,
is reusable for some non video/audio/spu decs
parent c4b02844
...@@ -560,9 +560,9 @@ enum es_format_category_e ...@@ -560,9 +560,9 @@ enum es_format_category_e
VIDEO_ES, VIDEO_ES,
AUDIO_ES, AUDIO_ES,
SPU_ES, SPU_ES,
NAV_ES, DATA_ES,
}; };
#define ES_CATEGORY_COUNT (NAV_ES + 1) #define ES_CATEGORY_COUNT (DATA_ES + 1)
/** /**
* ES format definition * ES format definition
......
...@@ -100,7 +100,7 @@ static char *FromACP( const char *str ) ...@@ -100,7 +100,7 @@ static char *FromACP( const char *str )
return FromCharset(vlc_pgettext("GetACP", "CP1252"), str, strlen(str)); return FromCharset(vlc_pgettext("GetACP", "CP1252"), str, strlen(str));
} }
#define IGNORE_ES NAV_ES #define IGNORE_ES DATA_ES
#define READ_LENGTH (25 * 1000) // 25ms #define READ_LENGTH (25 * 1000) // 25ms
#define READ_LENGTH_NONINTERLEAVED (CLOCK_FREQ * 3 / 2) #define READ_LENGTH_NONINTERLEAVED (CLOCK_FREQ * 3 / 2)
......
...@@ -2038,7 +2038,7 @@ bool matroska_segment_c::TrackInit( mkv_track_t * p_tk ) ...@@ -2038,7 +2038,7 @@ bool matroska_segment_c::TrackInit( mkv_track_t * p_tk )
vars.p_fmt->subs.psz_encoding = strdup( "UTF-8"); vars.p_fmt->subs.psz_encoding = strdup( "UTF-8");
} }
S_CASE("B_VOBBTN") { S_CASE("B_VOBBTN") {
vars.p_fmt->i_cat = NAV_ES; vars.p_fmt->i_cat = DATA_ES;
} }
S_CASE_DEFAULT(str) { S_CASE_DEFAULT(str) {
msg_Err( vars.p_demuxer, "unknown codec id=`%s'", str ); msg_Err( vars.p_demuxer, "unknown codec id=`%s'", str );
......
...@@ -510,7 +510,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock ...@@ -510,7 +510,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
mkv_track_t &track = *p_track; mkv_track_t &track = *p_track;
if( track.fmt.i_cat != NAV_ES && track.p_es == NULL ) if( track.fmt.i_cat != DATA_ES && track.p_es == NULL )
{ {
msg_Err( p_demux, "unknown track number" ); msg_Err( p_demux, "unknown track number" );
return; return;
...@@ -518,7 +518,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock ...@@ -518,7 +518,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
i_pts -= track.i_codec_delay; i_pts -= track.i_codec_delay;
if ( track.fmt.i_cat != NAV_ES ) if ( track.fmt.i_cat != DATA_ES )
{ {
bool b; bool b;
es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, track.p_es, &b ); es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE, track.p_es, &b );
...@@ -618,7 +618,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock ...@@ -618,7 +618,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
if( track.fmt.i_cat != VIDEO_ES ) if( track.fmt.i_cat != VIDEO_ES )
{ {
if ( track.fmt.i_cat == NAV_ES ) if ( track.fmt.i_cat == DATA_ES )
{ {
// TODO handle the start/stop times of this packet // TODO handle the start/stop times of this packet
p_sys->p_ev->SetPci( (const pci_t *)&p_block->p_buffer[1]); p_sys->p_ev->SetPci( (const pci_t *)&p_block->p_buffer[1]);
......
...@@ -568,8 +568,7 @@ static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id ) ...@@ -568,8 +568,7 @@ static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
case SPU_ES: case SPU_ES:
transcode_spu_close( p_stream, id ); transcode_spu_close( p_stream, id );
break; break;
case UNKNOWN_ES: default:
case NAV_ES:
break; break;
} }
} }
......
...@@ -2282,7 +2282,7 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args ) ...@@ -2282,7 +2282,7 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
case ES_OUT_SET_ES: case ES_OUT_SET_ES:
case ES_OUT_RESTART_ES: case ES_OUT_RESTART_ES:
{ {
#define IGNORE_ES NAV_ES #define IGNORE_ES DATA_ES
es_out_id_t *es = va_arg( args, es_out_id_t * ); es_out_id_t *es = va_arg( args, es_out_id_t * );
enum es_format_category_e i_cat; enum es_format_category_e i_cat;
......
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