X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvideo.h;h=2e5e50a15954e5c1c4eec9f212339069c4a12b85;hb=15d59e21b5d3118204e451d220f4d77541980823;hp=c9f865b45685e5b0a0b4d5b09144a5ba9791cba0;hpb=aa79cd1104f75aa27f621a2b26675b6f55a60332;p=vlc diff --git a/include/video.h b/include/video.h index c9f865b456..2e5e50a159 100644 --- a/include/video.h +++ b/include/video.h @@ -4,23 +4,23 @@ * includes all common video types and constants. ***************************************************************************** * Copyright (C) 1999, 2000 VideoLAN + * $Id: video.h,v 1.32 2001/08/22 17:21:45 massiot Exp $ * - * Authors: + * Authors: Vincent Seguin * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * 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-1307, USA. + * 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. *****************************************************************************/ /***************************************************************************** @@ -30,11 +30,6 @@ * "mtime.h" *****************************************************************************/ -/***************************************************************************** - * yuv_data_t: type for storing one Y, U or V sample. - *****************************************************************************/ -typedef u8 yuv_data_t; - /***************************************************************************** * picture_t: video picture ***************************************************************************** @@ -58,8 +53,10 @@ typedef struct picture_s /* Picture static properties - those properties are fixed at initialization * and should NOT be modified */ int i_width; /* picture width */ - int i_height; /* picture height */ int i_chroma_width; /* chroma width */ + int i_height; /* picture height */ + int i_size; /* number of pels */ + int i_chroma_size; /* number of chroma pels */ /* Picture dynamic properties - those properties can be changed by the * decoder */ @@ -69,11 +66,6 @@ typedef struct picture_s int i_display_height; /* useful picture height */ int i_aspect_ratio; /* aspect ratio */ - /* Macroblock counter - the decoder use it to verify if it has - * decoded all the macroblocks of the picture */ - int i_deccount; - vlc_mutex_t lock_deccount; - /* Picture data - data can always be freely modified. p_data itself * (the pointer) should NEVER be modified. In YUV format, the p_y, p_u and * p_v data pointers refers to different areas of p_data, and should not @@ -91,13 +83,13 @@ typedef struct picture_s #define YUV_444_PICTURE 102 /* 4:4:4 YUV picture */ /* Pictures status */ -#define FREE_PICTURE 0 /* picture is free and not allocated */ -#define RESERVED_PICTURE 1 /* picture is allocated and reserved */ -#define RESERVED_DATED_PICTURE 2 /* picture is waiting for DisplayPicture */ -#define RESERVED_DISP_PICTURE 3 /* picture is waiting for a DatePixture */ -#define READY_PICTURE 4 /* picture is ready for display */ -#define DISPLAYED_PICTURE 5/* picture has been displayed but is linked */ -#define DESTROYED_PICTURE 6 /* picture is allocated but no more used */ +#define FREE_PICTURE 0 /* free and not allocated */ +#define RESERVED_PICTURE 1 /* allocated and reserved */ +#define RESERVED_DATED_PICTURE 2 /* waiting for DisplayPicture */ +#define RESERVED_DISP_PICTURE 3 /* waiting for a DatePicture */ +#define READY_PICTURE 4 /* ready for display */ +#define DISPLAYED_PICTURE 5 /* been displayed but is linked */ +#define DESTROYED_PICTURE 6 /* allocated but no more used */ /* Aspect ratios (ISO/IEC 13818-2 section 6.3.3, table 6-3) */ #define AR_SQUARE_PICTURE 1 /* square pixels */ @@ -106,9 +98,9 @@ typedef struct picture_s #define AR_221_1_PICTURE 4 /* 2.21:1 picture (movie) */ /***************************************************************************** - * subpicture_t: video sub picture unit + * subpicture_t: video subtitle ***************************************************************************** - * Any sub picture unit destined to be displayed by a video output thread should + * Any subtitle destined to be displayed by a video output thread should * be stored in this structure from it's creation to it's effective display. * Subtitle type and flags should only be modified by the output thread. Note * that an empty subtitle MUST have its flags set to 0. @@ -119,14 +111,16 @@ typedef struct subpicture_s int i_type; /* type */ int i_status; /* flags */ int i_size; /* data size */ + struct subpicture_s * p_next; /* next subtitle to be displayed */ - /* Other properties */ - mtime_t begin_date; /* beginning of display date */ - mtime_t end_date; /* end of display date */ + /* Date properties */ + mtime_t i_start; /* beginning of display date */ + mtime_t i_stop; /* end of display date */ + boolean_t b_ephemer; /* does the subtitle have a TTL ? */ /* Display properties - these properties are only indicative and may be * changed by the video output thread, or simply ignored depending of the - * subpicture type. */ + * subtitle type. */ int i_x; /* offset from alignment position */ int i_y; /* offset from alignment position */ int i_width; /* picture width */ @@ -151,8 +145,6 @@ typedef struct subpicture_s struct { int i_offset[2]; /* byte offsets to data */ - int i_x1, i_x2; /* X coordinates */ - int i_y1, i_y2; /* Y coordinates */ } spu; } type; @@ -162,29 +154,29 @@ typedef struct subpicture_s } subpicture_t; /* Subpicture type */ -#define EMPTY_SUBPICTURE 0 /* subtitle slot is empty and available */ -#define DVD_SUBPICTURE 100 /* DVD subpicture unit */ -#define TEXT_SUBPICTURE 200 /* single line text */ +#define EMPTY_SUBPICTURE 0 /* subtitle slot is empty and available */ +#define DVD_SUBPICTURE 100 /* DVD subpicture unit */ +#define TEXT_SUBPICTURE 200 /* single line text */ /* Subpicture status */ -#define FREE_SUBPICTURE 0 /* subpicture is free and not allocated */ -#define RESERVED_SUBPICTURE 1 /* subpicture is allocated and reserved */ -#define READY_SUBPICTURE 2 /* subpicture is ready for display */ -#define DESTROYED_SUBPICTURE 3/* subpicture is allocated but no more used */ +#define FREE_SUBPICTURE 0 /* free and not allocated */ +#define RESERVED_SUBPICTURE 1 /* allocated and reserved */ +#define READY_SUBPICTURE 2 /* ready for display */ +#define DESTROYED_SUBPICTURE 3 /* allocated but not used anymore */ /* Alignment types */ -#define RIGHT_ALIGN 10 /* x is absolute for right */ -#define LEFT_ALIGN 11 /* x is absolute for left */ -#define RIGHT_RALIGN 12 /* x is relative for right from right */ -#define LEFT_RALIGN 13 /* x is relative for left from left */ - -#define CENTER_ALIGN 20 /* x, y are absolute for center */ -#define CENTER_RALIGN 21 /* x, y are relative for center from center */ - -#define BOTTOM_ALIGN 30 /* y is absolute for bottom */ -#define TOP_ALIGN 31 /* y is absolute for top */ -#define BOTTOM_RALIGN 32 /* y is relative for bottom from bottom */ -#define TOP_RALIGN 33 /* y is relative for top from top */ -#define SUBTITLE_RALIGN 34 /* y is relative for center from subtitle */ +#define RIGHT_ALIGN 10 /* x is absolute for right */ +#define LEFT_ALIGN 11 /* x is absolute for left */ +#define RIGHT_RALIGN 12 /* x is relative for right from right */ +#define LEFT_RALIGN 13 /* x is relative for left from left */ + +#define CENTER_ALIGN 20 /* x, y are absolute for center */ +#define CENTER_RALIGN 21 /* x,y are relative for center from center */ + +#define BOTTOM_ALIGN 30 /* y is absolute for bottom */ +#define TOP_ALIGN 31 /* y is absolute for top */ +#define BOTTOM_RALIGN 32 /* y is relative for bottom from bottom */ +#define TOP_RALIGN 33 /* y is relative for top from top */ +#define SUBTITLE_RALIGN 34 /* y is relative for center from subtitle */