Commit 8b6d639c authored by Zeeshan Ali's avatar Zeeshan Ali

Now flxdec works on big-endian machines as well.

Original commit message from CVS:
Now flxdec works on big-endian machines as well.
parent 81e11ca1
2005-12-11 Zeeshan Ali <zeenix at gmail dot com>
* gst/flx/flx_color.c: (flx_colorspace_convert):
* gst/flx/flx_color.h:
* gst/flx/flx_fmt.h:
* gst/flx/gstflxdec.c: (flx_decode_chunks), (gst_flxdec_chain):
* gst/flx/gstflxdec.h:
Now flxdec works on big-endian machines as well.
2005-12-11 Tim-Philipp Müller <tim at centricular dot net>
* gst/debug/efence.c: (gst_efence_init), (gst_efence_chain),
......
......@@ -60,10 +60,18 @@ flx_colorspace_convert (FlxColorSpaceConverter * flxpal, guchar * src,
while (size--) {
col = (*src++ * 3);
#if G_BYTE_ORDER == G_BIG_ENDIAN
*dest++ = 0;
*dest++ = flxpal->palvec[col];
*dest++ = flxpal->palvec[col + 1];
*dest++ = flxpal->palvec[col + 2];
#else
*dest++ = flxpal->palvec[col + 2];
*dest++ = flxpal->palvec[col + 1];
*dest++ = flxpal->palvec[col];
*dest++ = 0;
#endif
}
}
......
......@@ -17,6 +17,8 @@
* Boston, MA 02111-1307, USA.
*/
#include <gst/gst.h>
typedef enum {
FLX_COLORSPACE_RGB8,
FLX_COLORSPACE_RGB32,
......@@ -31,7 +33,6 @@ struct _FlxColorSpaceConverter {
guchar palvec[768];
};
void flx_colorspace_converter_destroy(FlxColorSpaceConverter *flxpal);
void flx_colorspace_convert(FlxColorSpaceConverter *flxpal, guchar *src, guchar *dest);
FlxColorSpaceConverter * flx_colorspace_converter_new(gint width, gint height);
......
......@@ -29,104 +29,173 @@ extern "C" {
enum Flx_TypeChunk
{
/* frame chunks */
FLX_PREFIX_TYPE = 0xf100,
FLX_SCRIPT_CHUNK = 0xf1e0,
FLX_FRAME_TYPE = 0xf1fa,
FLX_SEGMENT_TABLE = 0xf1fb,
FLX_HUFFMAN_TABLE = 0xf1fc,
/* sub chunks */
FLX_CEL_DATA = 3,
FLX_COLOR256 = 4,
FLX_SS2 = 7,
FLX_COLOR64 = 11,
FLX_LC = 12,
FLX_BLACK = 13,
FLX_BRUN = 15,
FLX_COPY = 16,
FLX_MINI = 18,
FLX_DTA_RUN = 25,
FLX_DTA_COPY = 26,
FLX_DTA_LC = 27,
FLX_LABEL = 31,
FLX_BMP_MASK = 32,
FLX_MLEV_MASK = 33,
FLX_SEGMENT = 34,
FLX_KEY_IMAGE = 35,
FLX_KEY_PAL = 36,
FLX_REGION = 37,
FLX_WAVE = 38,
FLX_USERSTRING = 39,
FLX_RGN_MASK = 40
/* frame chunks */
FLX_PREFIX_TYPE = 0xf100,
FLX_SCRIPT_CHUNK = 0xf1e0,
FLX_FRAME_TYPE = 0xf1fa,
FLX_SEGMENT_TABLE = 0xf1fb,
FLX_HUFFMAN_TABLE = 0xf1fc,
/* sub chunks */
FLX_CEL_DATA = 3,
FLX_COLOR256 = 4,
FLX_SS2 = 7,
FLX_COLOR64 = 11,
FLX_LC = 12,
FLX_BLACK = 13,
FLX_BRUN = 15,
FLX_COPY = 16,
FLX_MINI = 18,
FLX_DTA_RUN = 25,
FLX_DTA_COPY = 26,
FLX_DTA_LC = 27,
FLX_LABEL = 31,
FLX_BMP_MASK = 32,
FLX_MLEV_MASK = 33,
FLX_SEGMENT = 34,
FLX_KEY_IMAGE = 35,
FLX_KEY_PAL = 36,
FLX_REGION = 37,
FLX_WAVE = 38,
FLX_USERSTRING = 39,
FLX_RGN_MASK = 40
};
enum Flx_MagicHdr
{
FLX_MAGICHDR_FLI = 0xaf11,
FLX_MAGICHDR_FLC = 0xaf12,
FLX_MAGICHDR_FLX = 0xaf44,
FLX_MAGICHDR_HUFFBWT = 0xaf30
FLX_MAGICHDR_FLI = 0xaf11,
FLX_MAGICHDR_FLC = 0xaf12,
FLX_MAGICHDR_FLX = 0xaf44,
FLX_MAGICHDR_HUFFBWT = 0xaf30
};
typedef struct _FlxHeader
{
guint32 size;
guint16 type;
guint16 frames;
guint16 width,height,depth,flags;
guint32 speed;
guint16 reserved1;
/* FLC */
guint32 created,creator,updated,updater;
guint16 aspect_dx, aspect_dy;
/* EGI */
guint16 ext_flags,keyframes,totalframes;
guint32 req_memory;
guint16 max_regions,transp_num;
guchar reserved2[24];
/* FLC */
guint32 oframe1,oframe2;
guchar reserved3[40];
guint32 size;
guint16 type;
guint16 frames;
guint16 width,height,depth,flags;
guint32 speed;
guint16 reserved1;
/* FLC */
guint32 created,creator,updated,updater;
guint16 aspect_dx, aspect_dy;
/* EGI */
guint16 ext_flags,keyframes,totalframes;
guint32 req_memory;
guint16 max_regions,transp_num;
guchar reserved2[24];
/* FLC */
guint32 oframe1,oframe2;
guchar reserved3[40];
} FlxHeader;
#define FlxHeaderSize 128
typedef struct _FlxFrameChunk
{
guint32 size;
guint16 id;
guint32 size;
guint16 id;
} FlxFrameChunk;
#define FlxFrameChunkSize 6
typedef struct _FlxPrefixChunk
{
guint16 chunks;
guchar reserved[8];
guint16 chunks;
guchar reserved[8];
} FlxPrefixChunk;
typedef struct _FlxSegmentTable
{
guint16 segments;
guint16 segments;
} FlxSegmentTable;
typedef struct _FlxHuffmanTable
{
guint16 codelength;
guint16 numcodes;
guchar reserved[6];
guint16 codelength;
guint16 numcodes;
guchar reserved[6];
} FlxHuffmanTable;
typedef struct _FlxFrameType
{
guint16 chunks;
guint16 delay;
guchar reserved[6];
guint16 chunks;
guint16 delay;
guchar reserved[6];
} FlxFrameType;
#define FlxFrameTypeSize 10
#if G_BYTE_ORDER == G_BIG_ENDIAN
#define LE_TO_BE_16(i16) ((guint16) (((i16) << 8) | ((i16) >> 8)))
#define LE_TO_BE_32(i32) \
(((guint32) (LE_TO_BE_16((guint16) (i32))) << 16) | (LE_TO_BE_16((i32) >> 16)))
#define FLX_FRAME_TYPE_FIX_ENDIANNESS(frm_type_p) \
do { \
(frm_type_p)->chunks = LE_TO_BE_16((frm_type_p)->chunks); \
(frm_type_p)->delay = LE_TO_BE_16((frm_type_p)->delay); \
} while(0)
#define FLX_HUFFMAN_TABLE_FIX_ENDIANNESS(hffmn_table_p) \
do { \
(hffmn_table_p)->codelength = \
LE_TO_BE_16((hffmn_table_p)->codelength); \
(hffmn_table_p)->numcodes = LE_TO_BE_16((hffmn_table_p)->numcodes); \
} while(0)
#define FLX_SEGMENT_TABLE_FIX_ENDIANNESS(sgmnt_table_p) \
((sgmnt_table_p)->segments = LE_TO_BE_16((sgmnt_table_p)->segments))
#define FLX_PREFIX_CHUNK_FIX_ENDIANNESS(prfx_chnk_p) \
do { \
(prfx_chnk_p)->chunks = LE_TO_BE_16((prfx_chnk_p)->chunks); \
} while(0)
#define FLX_FRAME_CHUNK_FIX_ENDIANNESS(frm_chnk_p) \
do { \
(frm_chnk_p)->size = LE_TO_BE_32((frm_chnk_p)->size); \
(frm_chnk_p)->id = LE_TO_BE_16((frm_chnk_p)->id); \
} while(0)
#define FLX_HDR_FIX_ENDIANNESS(hdr_p) \
do { \
(hdr_p)->size = LE_TO_BE_32((hdr_p)->size); \
(hdr_p)->type = LE_TO_BE_16((hdr_p)->type); \
(hdr_p)->frames = LE_TO_BE_16((hdr_p)->frames); \
(hdr_p)->width = LE_TO_BE_16((hdr_p)->width); \
(hdr_p)->height = LE_TO_BE_16((hdr_p)->height); \
(hdr_p)->depth = LE_TO_BE_16((hdr_p)->depth); \
(hdr_p)->flags = LE_TO_BE_16((hdr_p)->flags); \
(hdr_p)->speed = LE_TO_BE_32((hdr_p)->speed); \
(hdr_p)->reserved1 = LE_TO_BE_16((hdr_p)->reserved1); \
(hdr_p)->created = LE_TO_BE_32((hdr_p)->created); \
(hdr_p)->creator = LE_TO_BE_32((hdr_p)->creator); \
(hdr_p)->updated = LE_TO_BE_32((hdr_p)->updated); \
(hdr_p)->updater = LE_TO_BE_32((hdr_p)->updater); \
(hdr_p)->aspect_dx = LE_TO_BE_16((hdr_p)->aspect_dx); \
(hdr_p)->aspect_dy = LE_TO_BE_16((hdr_p)->aspect_dy); \
(hdr_p)->ext_flags = LE_TO_BE_16((hdr_p)->ext_flags); \
(hdr_p)->keyframes = LE_TO_BE_16((hdr_p)->keyframes); \
(hdr_p)->totalframes = LE_TO_BE_16((hdr_p)->totalframes); \
(hdr_p)->req_memory = LE_TO_BE_32((hdr_p)->req_memory); \
(hdr_p)->max_regions = LE_TO_BE_16((hdr_p)->max_regions); \
(hdr_p)->transp_num = LE_TO_BE_16((hdr_p)->transp_num); \
(hdr_p)->oframe1 = LE_TO_BE_32((hdr_p)->oframe1); \
(hdr_p)->oframe2 = LE_TO_BE_32((hdr_p)->oframe2); \
} while(0)
#else
#define LE_TO_BE_16(i16) ((i16))
#define LE_TO_BE_32(i32) ((i32))
#define FLX_FRAME_TYPE_FIX_ENDIANNESS(frm_type_p)
#define FLX_HUFFMAN_TABLE_FIX_ENDIANNESS(hffmn_table_p)
#define FLX_SEGMENT_TABLE_FIX_ENDIANNESS(sgmnt_table_p)
#define FLX_PREFIX_CHUNK_FIX_ENDIANNESS(prfx_chnk_p)
#define FLX_FRAME_CHUNK_FIX_ENDIANNESS(frm_chnk_p)
#define FLX_HDR_FIX_ENDIANNESS(hdr_p)
#endif /* G_BYTE_ORDER == G_BIG_ENDIAN */
#ifdef __cplusplus
}
......
......@@ -211,6 +211,7 @@ flx_decode_chunks (GstFlxDec * flxdec, gulong count, guchar * data,
while (count--) {
hdr = (FlxFrameChunk *) data;
FLX_FRAME_CHUNK_FIX_ENDIANNESS (hdr);
data += FlxFrameChunkSize;
switch (hdr->id) {
......@@ -466,6 +467,7 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
const guint8 *data = gst_adapter_peek (flxdec->adapter, FlxHeaderSize);
memcpy ((gchar *) & flxdec->hdr, data, FlxHeaderSize);
FLX_HDR_FIX_ENDIANNESS (&(flxdec->hdr));
gst_adapter_flush (flxdec->adapter, FlxHeaderSize);
flxh = &flxdec->hdr;
......@@ -474,7 +476,7 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
if (flxh->type != FLX_MAGICHDR_FLI &&
flxh->type != FLX_MAGICHDR_FLC && flxh->type != FLX_MAGICHDR_FLX) {
GST_ELEMENT_ERROR (flxdec, STREAM, WRONG_TYPE, (NULL),
("not a flx file (type %d)\n", flxh->type));
("not a flx file (type %x)\n", flxh->type));
return GST_FLOW_ERROR;
}
......@@ -537,6 +539,7 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
const guint8 *data =
gst_adapter_peek (flxdec->adapter, FlxFrameChunkSize);
memcpy (&flxfh, data, FlxFrameChunkSize);
FLX_FRAME_CHUNK_FIX_ENDIANNESS (&flxfh);
switch (flxfh.id) {
case FLX_FRAME_TYPE:
......@@ -550,6 +553,7 @@ gst_flxdec_chain (GstPad * pad, GstBuffer * buf)
chunk = g_memdup (data, flxfh.size - FlxFrameChunkSize);
to_flush = flxfh.size - FlxFrameChunkSize;
FLX_FRAME_TYPE_FIX_ENDIANNESS ((FlxFrameType *) chunk);
if (((FlxFrameType *) chunk)->chunks == 0)
break;
......
......@@ -22,9 +22,8 @@
#include <gst/gst.h>
#include "flx_color.h"
#include <gst/base/gstadapter.h>
#include "flx_color.h"
#ifdef __cplusplus
extern "C" {
......@@ -34,7 +33,7 @@ typedef enum {
GST_FLXDEC_READ_HEADER,
GST_FLXDEC_PLAYING,
} GstFlxDecState;
/* Definition of structure storing data for this element. */
typedef struct _GstFlxDec GstFlxDec;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment