diff options
author | Mike Melanson <mike@multimedia.cx> | 2002-07-07 00:43:49 +0000 |
---|---|---|
committer | Mike Melanson <mike@multimedia.cx> | 2002-07-07 00:43:49 +0000 |
commit | 4bd4bf63abc9fb679c7f84bf83ae5275561ed09c (patch) | |
tree | 87c207875a0b2e80bd6dda33c844dbf025e5a9f8 | |
parent | 7f5d9549f1a44900fa9641f642df6c7910475fae (diff) | |
download | xine-lib-4bd4bf63abc9fb679c7f84bf83ae5275561ed09c.tar.gz xine-lib-4bd4bf63abc9fb679c7f84bf83ae5275561ed09c.tar.bz2 |
add buffer support for SMJPEG files and Id CIN files
CVS patchset: 2224
CVS date: 2002/07/07 00:43:49
-rw-r--r-- | src/xine-engine/buffer.h | 14 | ||||
-rw-r--r-- | src/xine-engine/buffer_types.c | 3 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 5d0ec1397..380c8b0e0 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: buffer.h,v 1.55 2002/07/05 20:54:38 miguelfreitas Exp $ + * $Id: buffer.h,v 1.56 2002/07/07 00:43:49 tmmm Exp $ * * * contents: @@ -118,6 +118,7 @@ extern "C" { #define BUF_VIDEO_SORENSON_V3 0x02250000 #define BUF_VIDEO_MSMPEG4_V1 0x02260000 #define BUF_VIDEO_MSS1 0x02270000 +#define BUF_VIDEO_IDCIN 0x02280000 /* audio buffer types: (please keep in sync with buffer_types.c) */ @@ -213,6 +214,17 @@ struct buf_element_s { */ #define BUF_SPECIAL_PALETTE 1 +/* + * In a BUF_SPECIAL_IDCIN_HUFFMAN_TABLE buffer: + * decoder_info[1] = BUF_SPECIAL_IDCIN_HUFFMAN_TABLE + * decoder_info[2] = pointer to a 65536-element byte array containing the + * Huffman tables from an Id CIN file + * A decoder should not count on the byte array to exist for the duration + * of the program's execution and should copy the data into its own + * private structures. + */ +#define BUF_SPECIAL_IDCIN_HUFFMAN_TABLE 2 + typedef struct palette_entry_s palette_entry_t; struct palette_entry_s { diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 0ce87ec0c..17f9def28 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: buffer_types.c,v 1.31 2002/07/05 21:23:07 uid45177 Exp $ + * $Id: buffer_types.c,v 1.32 2002/07/07 00:43:49 tmmm Exp $ * * * contents: @@ -290,6 +290,7 @@ static video_db_t video_db[] = { { { meFOURCC('j','p','e','g'), + meFOURCC('j','f','i','f'), 0 }, BUF_VIDEO_JPEG, |