Commit d8fc2357 authored by Steve Lhomme's avatar Steve Lhomme Committed by Rémi Denis-Courmont

vlc_es: store the category as an enum es_format_category_e

Signed-off-by: Rémi Denis-Courmont's avatarRémi Denis-Courmont <remi@remlab.net>
parent 1e82b512
......@@ -543,6 +543,17 @@ typedef struct extra_languages_t
char *psz_description;
} extra_languages_t;
/** ES Categories */
enum es_format_category_e
{
UNKNOWN_ES = 0x00,
VIDEO_ES,
AUDIO_ES,
SPU_ES,
NAV_ES,
};
#define ES_CATEGORY_COUNT (NAV_ES + 1)
/**
* ES format definition
*/
......@@ -552,7 +563,7 @@ typedef struct extra_languages_t
#define ES_PRIORITY_MIN ES_PRIORITY_NOT_SELECTABLE
struct es_format_t
{
int i_cat; /**< ES category @see es_format_category_e */
enum es_format_category_e i_cat; /**< ES category */
vlc_fourcc_t i_codec; /**< FOURCC value as used in vlc */
vlc_fourcc_t i_original_fourcc; /**< original FOURCC from the container */
......@@ -593,17 +604,6 @@ struct es_format_t
};
/** ES Categories */
enum es_format_category_e
{
UNKNOWN_ES = 0x00,
VIDEO_ES,
AUDIO_ES,
SPU_ES,
NAV_ES,
};
#define ES_CATEGORY_COUNT (NAV_ES + 1)
/**
* This function will fill all RGB shift from RGB masks.
*/
......
......@@ -23,6 +23,7 @@
#include "../adaptive/playlist/Segment.h"
#include "../adaptive/playlist/Inheritables.hpp"
#include <vlc_es.h>
#include <vlc_codecs.h>
namespace smooth
......@@ -64,7 +65,7 @@ namespace smooth
WAVEFORMATEX formatex;
unsigned width, height;
vlc_fourcc_t fourcc;
int es_type;
enum es_format_category_e es_type;
unsigned track_id;
};
}
......
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