[vlc-commits] vlc_es: rename NAV_ES to DATA_ES

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Jun 23 15:24:49 2017 +0200| [9babbce902ec36c6b555d7b2fbf0ce302c3cb99e] | committer: Francois 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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9babbce902ec36c6b555d7b2fbf0ce302c3cb99e
---

 include/vlc_es.h                             | 4 ++--
 modules/demux/avi/avi.c                      | 2 +-
 modules/demux/mkv/matroska_segment_parse.cpp | 2 +-
 modules/demux/mkv/mkv.cpp                    | 6 +++---
 modules/stream_out/transcode/transcode.c     | 3 +--
 src/input/es_out.c                           | 2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/include/vlc_es.h b/include/vlc_es.h
index d7d5a7ea2b..0617bb72fe 100644
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -560,9 +560,9 @@ enum es_format_category_e
     VIDEO_ES,
     AUDIO_ES,
     SPU_ES,
-    NAV_ES,
+    DATA_ES,
 };
-#define ES_CATEGORY_COUNT (NAV_ES + 1)
+#define ES_CATEGORY_COUNT (DATA_ES + 1)
 
 /**
  * ES format definition
diff --git a/modules/demux/avi/avi.c b/modules/demux/avi/avi.c
index fbf62fe1f2..53196ed0b9 100644
--- a/modules/demux/avi/avi.c
+++ b/modules/demux/avi/avi.c
@@ -100,7 +100,7 @@ static char *FromACP( const char *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_NONINTERLEAVED (CLOCK_FREQ * 3 / 2)
 
diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
index 846e4d436e..edc7c9880a 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -2038,7 +2038,7 @@ bool matroska_segment_c::TrackInit( mkv_track_t * p_tk )
             vars.p_fmt->subs.psz_encoding = strdup( "UTF-8");
         }
         S_CASE("B_VOBBTN") {
-            vars.p_fmt->i_cat = NAV_ES;
+            vars.p_fmt->i_cat = DATA_ES;
         }
         S_CASE_DEFAULT(str) {
             msg_Err( vars.p_demuxer, "unknown codec id=`%s'", str );
diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index 544f42568f..4fe1559059 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -510,7 +510,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
 
     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" );
         return;
@@ -518,7 +518,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
 
     i_pts -= track.i_codec_delay;
 
-    if ( track.fmt.i_cat != NAV_ES )
+    if ( track.fmt.i_cat != DATA_ES )
     {
         bool 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
 
         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
                 p_sys->p_ev->SetPci( (const pci_t *)&p_block->p_buffer[1]);
diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c
index 8f0708523b..96baf8064a 100644
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -568,8 +568,7 @@ static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
         case SPU_ES:
             transcode_spu_close( p_stream, id );
             break;
-        case UNKNOWN_ES:
-        case NAV_ES:
+        default:
             break;
         }
     }
diff --git a/src/input/es_out.c b/src/input/es_out.c
index e954843943..0ec29b25a9 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -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_RESTART_ES:
     {
-#define IGNORE_ES NAV_ES
+#define IGNORE_ES DATA_ES
         es_out_id_t *es = va_arg( args, es_out_id_t * );
 
         enum es_format_category_e i_cat;