/*****************************************************************************
* vlc_es.h: Elementary stream formats descriptions
*****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
+ * Copyright (C) 1999-2001 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#if !defined( __LIBVLC__ )
+ #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
#ifndef _VLC_ES_H
#define _VLC_ES_H 1
unsigned int i_bytes_per_frame;
/* Number of sampleframes contained in one compressed frame. */
- unsigned int i_frame_length;
+ unsigned int i_frame_length;
/* Please note that it may be completely arbitrary - buffers are not
* obliged to contain a integral number of so-called "frames". It's
* just here for the division :
*/
/* FIXME ? (used by the codecs) */
- int i_channels;
- int i_blockalign;
- int i_bitspersample;
+ unsigned i_bitspersample;
+ unsigned i_blockalign;
+ uint8_t i_channels; /* must be <32 */
};
+#ifdef WORDS_BIGENDIAN
+# define AUDIO_FMT_S16_NE VLC_FOURCC('s','1','6','b')
+# define AUDIO_FMT_U16_NE VLC_FOURCC('u','1','6','b')
+#else
+# define AUDIO_FMT_S16_NE VLC_FOURCC('s','1','6','l')
+# define AUDIO_FMT_U16_NE VLC_FOURCC('u','1','6','l')
+#endif
+
/**
* video format description
*/
unsigned int i_bits_per_pixel; /**< number of bits per pixel */
+ unsigned int i_sar_num; /**< sample/pixel aspect ratio */
+ unsigned int i_sar_den;
+
unsigned int i_frame_rate; /**< frame rate numerator */
unsigned int i_frame_rate_base; /**< frame rate denominator */
- int i_rmask, i_rgmask, i_bmask; /**< color masks for RGB chroma */
+ int i_rmask, i_gmask, i_bmask; /**< color masks for RGB chroma */
video_palette_t *p_palette; /**< video palette from demuxer */
};
*/
struct subs_format_t
{
+ /* the character encoding of the text of the subtitle.
+ * all gettext recognized shorts can be used */
char *psz_encoding;
+
+ int i_x_origin; /**< x coordinate of the subtitle. 0 = left */
+ int i_y_origin; /**< y coordinate of the subtitle. 0 = top */
+
struct
{
- /* FIXME */
+ /* */
uint32_t palette[16+1];
+
+ /* the width of the original movie the spu was extracted from */
+ int i_original_frame_width;
+ /* the height of the original movie the spu was extracted from */
+ int i_original_frame_height;
} spu;
struct
/**
* ES definition
*/
+typedef struct extra_languages_t
+{
+ char *psz_language;
+ char *psz_description;
+} extra_languages_t;
+
+
struct es_format_t
{
int i_cat;
-1 : mean not selected by default even
when no other stream
>=0: priority */
+
char *psz_language;
char *psz_description;
+ int i_extra_languages;
+ extra_languages_t *p_extra_languages;
audio_format_t audio;
video_format_t video;
subs_format_t subs;
- int i_bitrate;
+ unsigned int i_bitrate;
vlc_bool_t b_packetized; /* wether the data is packetized
(ie. not truncated) */
fmt->psz_language = NULL;
fmt->psz_description = NULL;
+ fmt->i_extra_languages = 0;
+ fmt->p_extra_languages = NULL;
+
memset( &fmt->audio, 0, sizeof(audio_format_t) );
memset( &fmt->video, 0, sizeof(video_format_t) );
memset( &fmt->subs, 0, sizeof(subs_format_t) );
static inline void es_format_Copy( es_format_t *dst, es_format_t *src )
{
+ int i;
memcpy( dst, src, sizeof( es_format_t ) );
if( src->psz_language )
dst->psz_language = strdup( src->psz_language );
if( src->video.p_palette )
{
- dst->video.p_palette = (video_palette_t*)malloc( sizeof( video_palette_t ) );
- memcpy( dst->video.p_palette, src->video.p_palette, sizeof( video_palette_t ) );
+ dst->video.p_palette =
+ (video_palette_t*)malloc( sizeof( video_palette_t ) );
+ memcpy( dst->video.p_palette, src->video.p_palette,
+ sizeof( video_palette_t ) );
+ }
+
+ dst->i_extra_languages = src->i_extra_languages;
+ if( dst->i_extra_languages )
+ dst->p_extra_languages = (extra_languages_t*)
+ malloc(dst->i_extra_languages * sizeof(*dst->p_extra_languages ));
+ for( i = 0; i < dst->i_extra_languages; i++ ) {
+ if( src->p_extra_languages[i].psz_language )
+ dst->p_extra_languages[i].psz_language = strdup(src->p_extra_languages[i].psz_language);
+ else
+ dst->p_extra_languages[i].psz_language = NULL;
+ if( src->p_extra_languages[i].psz_description )
+ dst->p_extra_languages[i].psz_description = strdup(src->p_extra_languages[i].psz_description);
+ else
+ dst->p_extra_languages[i].psz_description = NULL;
}
}
fmt->psz_description = NULL;
if( fmt->i_extra > 0 ) free( fmt->p_extra );
- fmt->i_extra = 0; fmt->p_extra = NULL;
+ fmt->i_extra = 0;
+ fmt->p_extra = NULL;
- if( fmt->video.p_palette ) free( fmt->video.p_palette );
+ if( fmt->video.p_palette )
+ free( fmt->video.p_palette );
fmt->video.p_palette = NULL;
if( fmt->subs.psz_encoding ) free( fmt->subs.psz_encoding );
fmt->subs.psz_encoding = NULL;
-}
+ if( fmt->i_extra_languages && fmt->p_extra_languages ) {
+ int i = 0;
+ while( i < fmt->i_extra_languages ) {
+ if( fmt->p_extra_languages[i].psz_language )
+ free( fmt->p_extra_languages[i].psz_language );
+ if( fmt->p_extra_languages[i].psz_description )
+ free( fmt->p_extra_languages[i].psz_description );
+ i++;
+ }
+ free(fmt->p_extra_languages);
+ }
+ fmt->i_extra_languages = 0;
+ fmt->p_extra_languages = NULL;
+}
#endif