X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_es.h;h=424313a920f0d3565ab79a789fc223c666139661;hb=49cafbcc92c99d70c8203565ca36684ce4d9446a;hp=622726d1e725aa8581e9a4334b47f8ef1c798bf6;hpb=8ca6f29c3aa74031f4e7626637942df6ac519502;p=vlc diff --git a/include/vlc_es.h b/include/vlc_es.h index 622726d1e7..424313a920 100644 --- a/include/vlc_es.h +++ b/include/vlc_es.h @@ -1,7 +1,7 @@ /***************************************************************************** * vlc_es.h: Elementary stream formats descriptions ***************************************************************************** - * Copyright (C) 1999-2001 VideoLAN + * Copyright (C) 1999-2001 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -18,9 +18,13 @@ * * 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 @@ -61,7 +65,7 @@ struct audio_format_t 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 : @@ -99,6 +103,9 @@ struct video_format_t 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 */ @@ -111,12 +118,23 @@ struct video_format_t */ 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 @@ -128,6 +146,13 @@ struct subs_format_t /** * ES definition */ +typedef struct extra_languages_t +{ + char *psz_language; + char *psz_description; +} extra_languages_t; + + struct es_format_t { int i_cat; @@ -142,14 +167,17 @@ struct es_format_t -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) */ @@ -176,6 +204,9 @@ static inline void es_format_Init( es_format_t *fmt, 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) ); @@ -188,6 +219,7 @@ static inline void es_format_Init( es_format_t *fmt, 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 ); @@ -215,6 +247,21 @@ static inline void es_format_Copy( es_format_t *dst, es_format_t *src ) 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; + } } static inline void es_format_Clean( es_format_t *fmt ) @@ -226,13 +273,28 @@ static inline void es_format_Clean( es_format_t *fmt ) 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