[vlc-commits] codec:omxil: store the ES category as an enum es_format_category_e

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Wed Jul  5 17:09:21 2017 +0200| [2de84d8f8874c6f50d62175b346a5ea1ab10ba5f] | committer: Rémi Denis-Courmont

codec:omxil: store the ES category as an enum es_format_category_e

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

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

 modules/codec/omxil/mediacodec.h  | 2 +-
 modules/codec/omxil/omxil_utils.h | 5 +++--
 modules/codec/omxil/utils.c       | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/modules/codec/omxil/mediacodec.h b/modules/codec/omxil/mediacodec.h
index ed0eb73c61..ca58c49109 100644
--- a/modules/codec/omxil/mediacodec.h
+++ b/modules/codec/omxil/mediacodec.h
@@ -113,7 +113,7 @@ struct mc_api
     /* Set before init */
     vlc_object_t *  p_obj;
     const char *    psz_mime;
-    int             i_cat;
+    enum es_format_category_e i_cat;
     vlc_fourcc_t    i_codec;
 
     /* Set after configure */
diff --git a/modules/codec/omxil/omxil_utils.h b/modules/codec/omxil/omxil_utils.h
index aebf7c38b1..d5dedd3afc 100644
--- a/modules/codec/omxil/omxil_utils.h
+++ b/modules/codec/omxil/omxil_utils.h
@@ -231,7 +231,7 @@ enum {
     OMXCODEC_VIDEO_QUIRKS_SUPPORT_INTERLACED = 0x4,
     OMXCODEC_AUDIO_QUIRKS_NEED_CHANNELS = 0x8,
 };
-int OMXCodec_GetQuirks( int i_cat, vlc_fourcc_t i_codec,
+int OMXCodec_GetQuirks( enum es_format_category_e i_cat, vlc_fourcc_t i_codec,
                         const char *p_name, unsigned int i_name_len );
 
 /*****************************************************************************
@@ -247,7 +247,8 @@ int GetOmxAudioFormat( vlc_fourcc_t i_fourcc,
                        const char **ppsz_name );
 int OmxToVlcAudioFormat( OMX_AUDIO_CODINGTYPE i_omx_codec,
                        vlc_fourcc_t *pi_fourcc, const char **ppsz_name );
-const char *GetOmxRole( vlc_fourcc_t i_fourcc, int i_cat, bool b_enc );
+const char *GetOmxRole( vlc_fourcc_t i_fourcc, enum es_format_category_e i_cat,
+                        bool b_enc );
 int GetOmxChromaFormat( vlc_fourcc_t i_fourcc,
                         OMX_COLOR_FORMATTYPE *pi_omx_codec,
                         const char **ppsz_name );
diff --git a/modules/codec/omxil/utils.c b/modules/codec/omxil/utils.c
index a7d7ee1abf..2b34c5b9ac 100644
--- a/modules/codec/omxil/utils.c
+++ b/modules/codec/omxil/utils.c
@@ -347,7 +347,7 @@ struct str2quirks {
     int i_quirks;
 };
 
-int OMXCodec_GetQuirks( int i_cat, vlc_fourcc_t i_codec,
+int OMXCodec_GetQuirks( enum es_format_category_e i_cat, vlc_fourcc_t i_codec,
                         const char *p_name, unsigned int i_name_len )
 {
     static const struct str2quirks quirks_prefix[] = {
@@ -720,7 +720,8 @@ static const char *GetOmxAudioEncRole( vlc_fourcc_t i_fourcc )
     return audio_enc_format_table[i].psz_role;
 }
 
-const char *GetOmxRole( vlc_fourcc_t i_fourcc, int i_cat, bool b_enc )
+const char *GetOmxRole( vlc_fourcc_t i_fourcc, enum es_format_category_e i_cat,
+                        bool b_enc )
 {
     if(b_enc)
         return i_cat == VIDEO_ES ?