summaryrefslogtreecommitdiff
path: root/apps/plugins/mpegplayer/mpeg2.h
diff options
context:
space:
mode:
Diffstat (limited to 'apps/plugins/mpegplayer/mpeg2.h')
-rw-r--r--apps/plugins/mpegplayer/mpeg2.h29
1 files changed, 19 insertions, 10 deletions
diff --git a/apps/plugins/mpegplayer/mpeg2.h b/apps/plugins/mpegplayer/mpeg2.h
index 48e4aab66a..2a63f399f9 100644
--- a/apps/plugins/mpegplayer/mpeg2.h
+++ b/apps/plugins/mpegplayer/mpeg2.h
@@ -1,6 +1,6 @@
1/* 1/*
2 * mpeg2.h 2 * mpeg2.h
3 * Copyright (C) 2000-2003 Michel Lespinasse <walken@zoy.org> 3 * Copyright (C) 2000-2004 Michel Lespinasse <walken@zoy.org>
4 * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca> 4 * Copyright (C) 1999-2000 Aaron Holtzman <aholtzma@ess.engr.uvic.ca>
5 * 5 *
6 * This file is part of mpeg2dec, a free MPEG-2 video stream decoder. 6 * This file is part of mpeg2dec, a free MPEG-2 video stream decoder.
@@ -19,6 +19,10 @@
19 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software 20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 21 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22 *
23 * $Id$
24 * libmpeg2 sync history:
25 * 2008-07-01 - CVS revision 1.67
22 */ 26 */
23 27
24#ifndef MPEG2_H 28#ifndef MPEG2_H
@@ -27,7 +31,7 @@
27#include "mpeg2dec_config.h" 31#include "mpeg2dec_config.h"
28 32
29#define MPEG2_VERSION(a,b,c) (((a)<<16)|((b)<<8)|(c)) 33#define MPEG2_VERSION(a,b,c) (((a)<<16)|((b)<<8)|(c))
30#define MPEG2_RELEASE MPEG2_VERSION (0, 4, 0) /* 0.4.0 */ 34#define MPEG2_RELEASE MPEG2_VERSION (0, 5, 0) /* 0.5.0 */
31 35
32#define SEQ_FLAG_MPEG2 1 36#define SEQ_FLAG_MPEG2 1
33#define SEQ_FLAG_CONSTRAINED_PARAMETERS 2 37#define SEQ_FLAG_CONSTRAINED_PARAMETERS 2
@@ -129,14 +133,15 @@ typedef enum
129 STATE_BUFFER = 0, 133 STATE_BUFFER = 0,
130 STATE_SEQUENCE = 1, 134 STATE_SEQUENCE = 1,
131 STATE_SEQUENCE_REPEATED = 2, 135 STATE_SEQUENCE_REPEATED = 2,
132 STATE_GOP = 3, 136 STATE_SEQUENCE_MODIFIED = 3,
133 STATE_PICTURE = 4, 137 STATE_GOP = 4,
134 STATE_SLICE_1ST = 5, 138 STATE_PICTURE = 5,
135 STATE_PICTURE_2ND = 6, 139 STATE_SLICE_1ST = 6,
136 STATE_SLICE = 7, 140 STATE_PICTURE_2ND = 7,
137 STATE_END = 8, 141 STATE_SLICE = 8,
138 STATE_INVALID = 9, 142 STATE_END = 9,
139 STATE_INVALID_END = 10 143 STATE_INVALID = 10,
144 STATE_INVALID_END = 11,
140} mpeg2_state_t; 145} mpeg2_state_t;
141 146
142typedef struct mpeg2_convert_init_s 147typedef struct mpeg2_convert_init_s
@@ -184,6 +189,10 @@ void mpeg2_init_fbuf (mpeg2_decoder_t * decoder,
184 uint8_t * backward_fbuf[MPEG2_COMPONENTS]); 189 uint8_t * backward_fbuf[MPEG2_COMPONENTS]);
185void mpeg2_slice (mpeg2_decoder_t * decoder, int code, const uint8_t * buffer); 190void mpeg2_slice (mpeg2_decoder_t * decoder, int code, const uint8_t * buffer);
186 191
192int mpeg2_guess_aspect (const mpeg2_sequence_t * sequence,
193 unsigned int * pixel_width,
194 unsigned int * pixel_height);
195
187typedef enum 196typedef enum
188{ 197{
189 MPEG2_ALLOC_MPEG2DEC = 0, 198 MPEG2_ALLOC_MPEG2DEC = 0,