Diff: gstbytereader.h - gstbytereader.h

	gstbytereader.h	gstbytereader.h

	/* GStreamer	/* GStreamer byte reader
	*	*
	* Copyright (C) 2008 Sebastian Dröge <sebastian.droege@collabora.co.uk>.	* Copyright (C) 2008 Sebastian Dröge <sebastian.droege@collabora.co.uk>.

		* Copyright (C) 2009 Tim-Philipp Müller <tim centricular net>
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public	* modify it under the terms of the GNU Library General Public
	* License as published by the Free Software Foundation; either	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.	* version 2 of the License, or (at your option) any later version.
	*	*
	* This library is distributed in the hope that it will be useful,	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.	* Library General Public License for more details.

	skipping to change at line 28	skipping to change at line 29
	* Boston, MA 02111-1307, USA.	* Boston, MA 02111-1307, USA.
	*/	*/

	#ifndef __GST_BYTE_READER_H__	#ifndef __GST_BYTE_READER_H__
	#define __GST_BYTE_READER_H__	#define __GST_BYTE_READER_H__

	#include <gst/gst.h>	#include <gst/gst.h>

	G_BEGIN_DECLS	G_BEGIN_DECLS


		#define GST_BYTE_READER(reader) ((GstByteReader *) (reader))

	/**	/**
	* GstByteReader:	* GstByteReader:
	* @data: Data from which the bit reader will read	* @data: Data from which the bit reader will read
	* @size: Size of @data in bytes	* @size: Size of @data in bytes
	* @byte: Current byte position	* @byte: Current byte position
	*	*
	* A byte reader instance.	* A byte reader instance.
	*/	*/
	typedef struct {	typedef struct {
	const guint8 *data;	const guint8 *data;

	skipping to change at line 55	skipping to change at line 58
	void gst_byte_reader_free (GstByteReader *reader);	void gst_byte_reader_free (GstByteReader *reader);

	void gst_byte_reader_init (GstByteReader reader, const guint8 data, guint size);	void gst_byte_reader_init (GstByteReader reader, const guint8 data, guint size);
	void gst_byte_reader_init_from_buffer (GstByteReader reader, const GstBuff er buffer);	void gst_byte_reader_init_from_buffer (GstByteReader reader, const GstBuff er buffer);

	gboolean gst_byte_reader_set_pos (GstByteReader *reader, guint pos);	gboolean gst_byte_reader_set_pos (GstByteReader *reader, guint pos);

	guint gst_byte_reader_get_pos (const GstByteReader *reader);	guint gst_byte_reader_get_pos (const GstByteReader *reader);
	guint gst_byte_reader_get_remaining (const GstByteReader *reader);	guint gst_byte_reader_get_remaining (const GstByteReader *reader);


		guint gst_byte_reader_get_size (const GstByteReader *reader);

	gboolean gst_byte_reader_skip (GstByteReader *reader, guint nbytes);	gboolean gst_byte_reader_skip (GstByteReader *reader, guint nbytes);

	gboolean gst_byte_reader_get_uint8 (GstByteReader reader, guint8 val);	gboolean gst_byte_reader_get_uint8 (GstByteReader reader, guint8 val);
	gboolean gst_byte_reader_get_int8 (GstByteReader reader, gint8 val);	gboolean gst_byte_reader_get_int8 (GstByteReader reader, gint8 val);
	gboolean gst_byte_reader_get_uint16_le (GstByteReader reader, guint16 val );	gboolean gst_byte_reader_get_uint16_le (GstByteReader reader, guint16 val );
	gboolean gst_byte_reader_get_int16_le (GstByteReader reader, gint16 val);	gboolean gst_byte_reader_get_int16_le (GstByteReader reader, gint16 val);
	gboolean gst_byte_reader_get_uint16_be (GstByteReader reader, guint16 val );	gboolean gst_byte_reader_get_uint16_be (GstByteReader reader, guint16 val );
	gboolean gst_byte_reader_get_int16_be (GstByteReader reader, gint16 val);	gboolean gst_byte_reader_get_int16_be (GstByteReader reader, gint16 val);
	gboolean gst_byte_reader_get_uint24_le (GstByteReader reader, guint32 val );	gboolean gst_byte_reader_get_uint24_le (GstByteReader reader, guint32 val );
	gboolean gst_byte_reader_get_int24_le (GstByteReader reader, gint32 val);	gboolean gst_byte_reader_get_int24_le (GstByteReader reader, gint32 val);

	skipping to change at line 76	skipping to change at line 81
	gboolean gst_byte_reader_get_int24_be (GstByteReader reader, gint32 val);	gboolean gst_byte_reader_get_int24_be (GstByteReader reader, gint32 val);
	gboolean gst_byte_reader_get_uint32_le (GstByteReader reader, guint32 val );	gboolean gst_byte_reader_get_uint32_le (GstByteReader reader, guint32 val );
	gboolean gst_byte_reader_get_int32_le (GstByteReader reader, gint32 val);	gboolean gst_byte_reader_get_int32_le (GstByteReader reader, gint32 val);
	gboolean gst_byte_reader_get_uint32_be (GstByteReader reader, guint32 val );	gboolean gst_byte_reader_get_uint32_be (GstByteReader reader, guint32 val );
	gboolean gst_byte_reader_get_int32_be (GstByteReader reader, gint32 val);	gboolean gst_byte_reader_get_int32_be (GstByteReader reader, gint32 val);
	gboolean gst_byte_reader_get_uint64_le (GstByteReader reader, guint64 val );	gboolean gst_byte_reader_get_uint64_le (GstByteReader reader, guint64 val );
	gboolean gst_byte_reader_get_int64_le (GstByteReader reader, gint64 val);	gboolean gst_byte_reader_get_int64_le (GstByteReader reader, gint64 val);
	gboolean gst_byte_reader_get_uint64_be (GstByteReader reader, guint64 val );	gboolean gst_byte_reader_get_uint64_be (GstByteReader reader, guint64 val );
	gboolean gst_byte_reader_get_int64_be (GstByteReader reader, gint64 val);	gboolean gst_byte_reader_get_int64_be (GstByteReader reader, gint64 val);


	gboolean gst_byte_reader_peek_uint8 (GstByteReader reader, guint8 val);	gboolean gst_byte_reader_peek_uint8 (const GstByteReader reader, guint8 v
	gboolean gst_byte_reader_peek_int8 (GstByteReader reader, gint8 val);	al);
	gboolean gst_byte_reader_peek_uint16_le (GstByteReader reader, guint16 va	gboolean gst_byte_reader_peek_int8 (const GstByteReader reader, gint8 val
	l);	);
	gboolean gst_byte_reader_peek_int16_le (GstByteReader reader, gint16 val)	gboolean gst_byte_reader_peek_uint16_le (const GstByteReader *reader, guint
	;	16 *val);
	gboolean gst_byte_reader_peek_uint16_be (GstByteReader reader, guint16 va	gboolean gst_byte_reader_peek_int16_le (const GstByteReader *reader, gint16
	l);	*val);
	gboolean gst_byte_reader_peek_int16_be (GstByteReader reader, gint16 val)	gboolean gst_byte_reader_peek_uint16_be (const GstByteReader *reader, guint
	;	16 *val);
	gboolean gst_byte_reader_peek_uint24_le (GstByteReader reader, guint32 va	gboolean gst_byte_reader_peek_int16_be (const GstByteReader *reader, gint16
	l);	*val);
	gboolean gst_byte_reader_peek_int24_le (GstByteReader reader, gint32 val)	gboolean gst_byte_reader_peek_uint24_le (const GstByteReader *reader, guint
	;	32 *val);
	gboolean gst_byte_reader_peek_uint24_be (GstByteReader reader, guint32 va	gboolean gst_byte_reader_peek_int24_le (const GstByteReader *reader, gint32
	l);	*val);
	gboolean gst_byte_reader_peek_int24_be (GstByteReader reader, gint32 val)	gboolean gst_byte_reader_peek_uint24_be (const GstByteReader *reader, guint
	;	32 *val);
	gboolean gst_byte_reader_peek_uint32_le (GstByteReader reader, guint32 va	gboolean gst_byte_reader_peek_int24_be (const GstByteReader *reader, gint32
	l);	*val);
	gboolean gst_byte_reader_peek_int32_le (GstByteReader reader, gint32 val)	gboolean gst_byte_reader_peek_uint32_le (const GstByteReader *reader, guint
	;	32 *val);
	gboolean gst_byte_reader_peek_uint32_be (GstByteReader reader, guint32 va	gboolean gst_byte_reader_peek_int32_le (const GstByteReader *reader, gint32
	l);	*val);
	gboolean gst_byte_reader_peek_int32_be (GstByteReader reader, gint32 val)	gboolean gst_byte_reader_peek_uint32_be (const GstByteReader *reader, guint
	;	32 *val);
	gboolean gst_byte_reader_peek_uint64_le (GstByteReader reader, guint64 va	gboolean gst_byte_reader_peek_int32_be (const GstByteReader *reader, gint32
	l);	*val);
	gboolean gst_byte_reader_peek_int64_le (GstByteReader reader, gint64 val)	gboolean gst_byte_reader_peek_uint64_le (const GstByteReader *reader, guint
	;	64 *val);
	gboolean gst_byte_reader_peek_uint64_be (GstByteReader reader, guint64 va	gboolean gst_byte_reader_peek_int64_le (const GstByteReader *reader, gint64
	l);	*val);
	gboolean gst_byte_reader_peek_int64_be (GstByteReader reader, gint64 val)	gboolean gst_byte_reader_peek_uint64_be (const GstByteReader *reader, guint
	;	64 *val);
		gboolean gst_byte_reader_peek_int64_be (const GstByteReader *reader, gint64
		*val);

	gboolean gst_byte_reader_get_float32_le (GstByteReader reader, gfloat val );	gboolean gst_byte_reader_get_float32_le (GstByteReader reader, gfloat val );
	gboolean gst_byte_reader_get_float32_be (GstByteReader reader, gfloat val );	gboolean gst_byte_reader_get_float32_be (GstByteReader reader, gfloat val );
	gboolean gst_byte_reader_get_float64_le (GstByteReader reader, gdouble va l);	gboolean gst_byte_reader_get_float64_le (GstByteReader reader, gdouble va l);
	gboolean gst_byte_reader_get_float64_be (GstByteReader reader, gdouble va l);	gboolean gst_byte_reader_get_float64_be (GstByteReader reader, gdouble va l);


	gboolean gst_byte_reader_peek_float32_le (GstByteReader reader, gfloat va	gboolean gst_byte_reader_peek_float32_le (const GstByteReader *reader, gflo
	l);	at *val);
	gboolean gst_byte_reader_peek_float32_be (GstByteReader reader, gfloat va	gboolean gst_byte_reader_peek_float32_be (const GstByteReader *reader, gflo
	l);	at *val);
	gboolean gst_byte_reader_peek_float64_le (GstByteReader reader, gdouble v	gboolean gst_byte_reader_peek_float64_le (const GstByteReader *reader, gdou
	al);	ble *val);
	gboolean gst_byte_reader_peek_float64_be (GstByteReader reader, gdouble v	gboolean gst_byte_reader_peek_float64_be (const GstByteReader *reader, gdou
	al);	ble *val);

	gboolean gst_byte_reader_get_data (GstByteReader *reader, guint size, const	gboolean gst_byte_reader_dup_data (GstByteReader * reader, guint size, gui
	guint8 **val);	nt8 ** val);
	gboolean gst_byte_reader_peek_data (GstByteReader *reader, guint size, cons	gboolean gst_byte_reader_get_data (GstByteReader * reader, guint size, con
	t guint8 **val);	st guint8 ** val);
		gboolean gst_byte_reader_peek_data (const GstByteReader * reader, guint siz
		e, const guint8 ** val);

		#define gst_byte_reader_dup_string(reader,str) \
		gst_byte_reader_dup_string_utf8(reader,str)

		gboolean gst_byte_reader_dup_string_utf8 (GstByteReader * reader, gchar
		** str);
		gboolean gst_byte_reader_dup_string_utf16 (GstByteReader * reader, guint16
		** str);
		gboolean gst_byte_reader_dup_string_utf32 (GstByteReader * reader, guint32
		** str);

		#define gst_byte_reader_skip_string(reader) \
		gst_byte_reader_skip_string_utf8(reader)

		gboolean gst_byte_reader_skip_string_utf8 (GstByteReader * reader);
		gboolean gst_byte_reader_skip_string_utf16 (GstByteReader * reader);
		gboolean gst_byte_reader_skip_string_utf32 (GstByteReader * reader);

		#define gst_byte_reader_get_string(reader,str) \
		gst_byte_reader_get_string_utf8(reader,str)

		#define gst_byte_reader_peek_string(reader,str) \
		gst_byte_reader_peek_string_utf8(reader,str)

		gboolean gst_byte_reader_get_string_utf8 (GstByteReader * reader, const g
		char ** str);
		gboolean gst_byte_reader_peek_string_utf8 (const GstByteReader * reader, c
		onst gchar ** str);

		guint gst_byte_reader_masked_scan_uint32 (const GstByteReader * reader,
		guint32 mask,
		guint32 pattern,
		guint offset,
		guint size);

	/**	/**
	* GST_BYTE_READER_INIT:	* GST_BYTE_READER_INIT:
	* @data: Data from which the #GstByteReader should read	* @data: Data from which the #GstByteReader should read
	* @size: Size of @data in bytes	* @size: Size of @data in bytes
	*	*
	* A #GstByteReader must be initialized with this macro, before it can be	* A #GstByteReader must be initialized with this macro, before it can be
	* used. This macro can used be to initialize a variable, but it cannot	* used. This macro can used be to initialize a variable, but it cannot
	* be assigned to a variable. In that case you have to use	* be assigned to a variable. In that case you have to use
	* gst_byte_reader_init().	* gst_byte_reader_init().

	skipping to change at line 135	skipping to change at line 170
	*	*
	* A #GstByteReader must be initialized with this macro, before it can be	* A #GstByteReader must be initialized with this macro, before it can be
	* used. This macro can used be to initialize a variable, but it cannot	* used. This macro can used be to initialize a variable, but it cannot
	* be assigned to a variable. In that case you have to use	* be assigned to a variable. In that case you have to use
	* gst_byte_reader_init().	* gst_byte_reader_init().
	*	*
	* Since: 0.10.22	* Since: 0.10.22
	*/	*/
	#define GST_BYTE_READER_INIT_FROM_BUFFER(buffer) {GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer), 0}	#define GST_BYTE_READER_INIT_FROM_BUFFER(buffer) {GST_BUFFER_DATA (buffer), GST_BUFFER_SIZE (buffer), 0}


		/* unchecked variants */
		static inline void
		gst_byte_reader_skip_unchecked (GstByteReader * reader, guint nbytes)
		{
		reader->byte += nbytes;
		}

		#define __GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(bits,type,lower,upper,adj
		) \
		\
		static inline type \
		gst_byte_reader_peek_##lower##_unchecked (const GstByteReader * reader) \
		{ \
		type val = (type) GST_READ_##upper (reader->data + reader->byte); \
		adj \
		return val; \
		} \
		\
		static inline type \
		gst_byte_reader_get_##lower##_unchecked (GstByteReader * reader) \
		{ \
		type val = gst_byte_reader_peek_##lower##_unchecked (reader); \
		reader->byte += bits / 8; \
		return val; \
		}

		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(8,guint8,uint8,UINT8,/* */)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(8,gint8,int8,UINT8,/* */)

		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(16,guint16,uint16_le,UINT16_LE,/*
		*/)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(16,guint16,uint16_be,UINT16_BE,/*
		*/)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(16,gint16,int16_le,UINT16_LE,/* *
		/)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(16,gint16,int16_be,UINT16_BE,/* *
		/)

		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,guint32,uint32_le,UINT32_LE,/*
		*/)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,guint32,uint32_be,UINT32_BE,/*
		*/)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,gint32,int32_le,UINT32_LE,/* *
		/)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,gint32,int32_be,UINT32_BE,/* *
		/)

		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(24,guint32,uint24_le,UINT24_LE,/*
		*/)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(24,guint32,uint24_be,UINT24_BE,/*
		*/)

		/* fix up the sign for 24-bit signed ints stored in 32-bit signed ints */
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(24,gint32,int24_le,UINT24_LE,
		if (val & 0x00800000) val \|= 0xff000000;)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(24,gint32,int24_be,UINT24_BE,
		if (val & 0x00800000) val \|= 0xff000000;)

		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,guint64,uint64_le,UINT64_LE,/*
		*/)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,guint64,uint64_be,UINT64_BE,/*
		*/)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,gint64,int64_le,UINT64_LE,/* *
		/)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,gint64,int64_be,UINT64_BE,/* *
		/)

		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,gfloat,float32_le,FLOAT_LE,/*
		*/)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(32,gfloat,float32_be,FLOAT_BE,/*
		*/)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,gdouble,float64_le,DOUBLE_LE,/
		* */)
		__GST_BYTE_READER_GET_PEEK_BITS_UNCHECKED(64,gdouble,float64_be,DOUBLE_BE,/
		* */)

		#undef __GET_PEEK_BITS_UNCHECKED

		static inline const guint8 *
		gst_byte_reader_peek_data_unchecked (const GstByteReader * reader)
		{
		return (const guint8 *) (reader->data + reader->byte);
		}

		static inline const guint8 *
		gst_byte_reader_get_data_unchecked (GstByteReader * reader, guint size)
		{
		const guint8 *data;

		data = gst_byte_reader_peek_data_unchecked (reader);
		gst_byte_reader_skip_unchecked (reader, size);
		return data;
		}

		static inline guint8 *
		gst_byte_reader_dup_data_unchecked (GstByteReader * reader, guint size)
		{
		return g_memdup (gst_byte_reader_get_data_unchecked (reader, size), size)
		;
		}

		/* Unchecked variants that should not be used */
		static inline guint
		_gst_byte_reader_get_pos_unchecked (const GstByteReader * reader)
		{
		return reader->byte;
		}

		static inline guint
		_gst_byte_reader_get_remaining_unchecked (const GstByteReader * reader)
		{
		return reader->size - reader->byte;
		}

		static inline guint
		_gst_byte_reader_get_size_unchecked (const GstByteReader * reader)
		{
		return reader->size;
		}

		/* inlined variants (do not use directly) */

		static inline guint
		_gst_byte_reader_get_remaining_inline (const GstByteReader * reader)
		{
		g_return_val_if_fail (reader != NULL, 0);

		return _gst_byte_reader_get_remaining_unchecked (reader);
		}

		static inline guint
		_gst_byte_reader_get_size_inline (const GstByteReader * reader)
		{
		g_return_val_if_fail (reader != NULL, 0);

		return _gst_byte_reader_get_size_unchecked (reader);
		}

		#define __GST_BYTE_READER_GET_PEEK_BITS_INLINE(bits,type,name) \
		\
		static inline gboolean \
		_gst_byte_reader_peek_##name##_inline (const GstByteReader * reader, type *
		val) \
		{ \
		g_return_val_if_fail (reader != NULL, FALSE); \
		g_return_val_if_fail (val != NULL, FALSE); \
		\
		if (_gst_byte_reader_get_remaining_unchecked (reader) < (bits / 8)) \
		return FALSE; \
		\
		*val = gst_byte_reader_peek_##name##_unchecked (reader); \
		return TRUE; \
		} \
		\
		static inline gboolean \
		_gst_byte_reader_get_##name##_inline (GstByteReader * reader, type * val) \
		{ \
		g_return_val_if_fail (reader != NULL, FALSE); \
		g_return_val_if_fail (val != NULL, FALSE); \
		\
		if (_gst_byte_reader_get_remaining_unchecked (reader) < (bits / 8)) \
		return FALSE; \
		\
		*val = gst_byte_reader_get_##name##_unchecked (reader); \
		return TRUE; \
		}

		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(8,guint8,uint8)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(8,gint8,int8)

		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(16,guint16,uint16_le)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(16,guint16,uint16_be)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(16,gint16,int16_le)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(16,gint16,int16_be)

		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,guint32,uint32_le)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,guint32,uint32_be)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,gint32,int32_le)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,gint32,int32_be)

		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(24,guint32,uint24_le)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(24,guint32,uint24_be)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(24,gint32,int24_le)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(24,gint32,int24_be)

		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,guint64,uint64_le)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,guint64,uint64_be)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,gint64,int64_le)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,gint64,int64_be)

		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,gfloat,float32_le)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(32,gfloat,float32_be)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,gdouble,float64_le)
		__GST_BYTE_READER_GET_PEEK_BITS_INLINE(64,gdouble,float64_be)

		#undef __GST_BYTE_READER_GET_PEEK_BITS_INLINE

		#ifndef GST_BYTE_READER_DISABLE_INLINES

		#define gst_byte_reader_get_remaining(reader) \
		_gst_byte_reader_get_remaining_inline(reader)

		#define gst_byte_reader_get_size(reader) \
		_gst_byte_reader_get_size_inline(reader)

		#define gst_byte_reader_get_pos(reader) \
		_gst_byte_reader_get_pos_inline(reader)

		/* we use defines here so we can add the G_LIKELY() */
		#define gst_byte_reader_get_uint8(reader,val) \
		G_LIKELY(_gst_byte_reader_get_uint8_inline(reader,val))
		#define gst_byte_reader_get_int8(reader,val) \
		G_LIKELY(_gst_byte_reader_get_int8_inline(reader,val))
		#define gst_byte_reader_get_uint16_le(reader,val) \
		G_LIKELY(_gst_byte_reader_get_uint16_le_inline(reader,val))
		#define gst_byte_reader_get_int16_le(reader,val) \
		G_LIKELY(_gst_byte_reader_get_int16_le_inline(reader,val))
		#define gst_byte_reader_get_uint16_be(reader,val) \
		G_LIKELY(_gst_byte_reader_get_uint16_be_inline(reader,val))
		#define gst_byte_reader_get_int16_be(reader,val) \
		G_LIKELY(_gst_byte_reader_get_int16_be_inline(reader,val))
		#define gst_byte_reader_get_uint24_le(reader,val) \
		G_LIKELY(_gst_byte_reader_get_uint24_le_inline(reader,val))
		#define gst_byte_reader_get_int24_le(reader,val) \
		G_LIKELY(_gst_byte_reader_get_int24_le_inline(reader,val))
		#define gst_byte_reader_get_uint24_be(reader,val) \
		G_LIKELY(_gst_byte_reader_get_uint24_be_inline(reader,val))
		#define gst_byte_reader_get_int24_be(reader,val) \
		G_LIKELY(_gst_byte_reader_get_int24_be_inline(reader,val))
		#define gst_byte_reader_get_uint32_le(reader,val) \
		G_LIKELY(_gst_byte_reader_get_uint32_le_inline(reader,val))
		#define gst_byte_reader_get_int32_le(reader,val) \
		G_LIKELY(_gst_byte_reader_get_int32_le_inline(reader,val))
		#define gst_byte_reader_get_uint32_be(reader,val) \
		G_LIKELY(_gst_byte_reader_get_uint32_be_inline(reader,val))
		#define gst_byte_reader_get_int32_be(reader,val) \
		G_LIKELY(_gst_byte_reader_get_int32_be_inline(reader,val))
		#define gst_byte_reader_get_uint64_le(reader,val) \
		G_LIKELY(_gst_byte_reader_get_uint64_le_inline(reader,val))
		#define gst_byte_reader_get_int64_le(reader,val) \
		G_LIKELY(_gst_byte_reader_get_int64_le_inline(reader,val))
		#define gst_byte_reader_get_uint64_be(reader,val) \
		G_LIKELY(_gst_byte_reader_get_uint64_be_inline(reader,val))
		#define gst_byte_reader_get_int64_be(reader,val) \
		G_LIKELY(_gst_byte_reader_get_int64_be_inline(reader,val))

		#define gst_byte_reader_peek_uint8(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_uint8_inline(reader,val))
		#define gst_byte_reader_peek_int8(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_int8_inline(reader,val))
		#define gst_byte_reader_peek_uint16_le(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_uint16_le_inline(reader,val))
		#define gst_byte_reader_peek_int16_le(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_int16_le_inline(reader,val))
		#define gst_byte_reader_peek_uint16_be(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_uint16_be_inline(reader,val))
		#define gst_byte_reader_peek_int16_be(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_int16_be_inline(reader,val))
		#define gst_byte_reader_peek_uint24_le(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_uint24_le_inline(reader,val))
		#define gst_byte_reader_peek_int24_le(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_int24_le_inline(reader,val))
		#define gst_byte_reader_peek_uint24_be(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_uint24_be_inline(reader,val))
		#define gst_byte_reader_peek_int24_be(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_int24_be_inline(reader,val))
		#define gst_byte_reader_peek_uint32_le(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_uint32_le_inline(reader,val))
		#define gst_byte_reader_peek_int32_le(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_int32_le_inline(reader,val))
		#define gst_byte_reader_peek_uint32_be(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_uint32_be_inline(reader,val))
		#define gst_byte_reader_peek_int32_be(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_int32_be_inline(reader,val))
		#define gst_byte_reader_peek_uint64_le(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_uint64_le_inline(reader,val))
		#define gst_byte_reader_peek_int64_le(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_int64_le_inline(reader,val))
		#define gst_byte_reader_peek_uint64_be(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_uint64_be_inline(reader,val))
		#define gst_byte_reader_peek_int64_be(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_int64_be_inline(reader,val))

		#define gst_byte_reader_get_float32_le(reader,val) \
		G_LIKELY(_gst_byte_reader_get_float32_le_inline(reader,val))
		#define gst_byte_reader_get_float32_be(reader,val) \
		G_LIKELY(_gst_byte_reader_get_float32_be_inline(reader,val))
		#define gst_byte_reader_get_float64_le(reader,val) \
		G_LIKELY(_gst_byte_reader_get_float64_le_inline(reader,val))
		#define gst_byte_reader_get_float64_be(reader,val) \
		G_LIKELY(_gst_byte_reader_get_float64_be_inline(reader,val))
		#define gst_byte_reader_peek_float32_le(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_float32_le_inline(reader,val))
		#define gst_byte_reader_peek_float32_be(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_float32_be_inline(reader,val))
		#define gst_byte_reader_peek_float64_le(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_float64_le_inline(reader,val))
		#define gst_byte_reader_peek_float64_be(reader,val) \
		G_LIKELY(_gst_byte_reader_peek_float64_be_inline(reader,val))

		#endif /* GST_BYTE_READER_DISABLE_INLINES */

		static inline gboolean
		_gst_byte_reader_dup_data_inline (GstByteReader * reader, guint size, guint
		8 ** val)
		{
		g_return_val_if_fail (reader != NULL, FALSE);
		g_return_val_if_fail (val != NULL, FALSE);

		if (G_UNLIKELY (size > reader->size \|\| _gst_byte_reader_get_remaining_inl
		ine (reader) < size))
		return FALSE;

		*val = gst_byte_reader_dup_data_unchecked (reader, size);
		return TRUE;
		}

		static inline gboolean
		_gst_byte_reader_get_data_inline (GstByteReader * reader, guint size, const
		guint8 ** val)
		{
		g_return_val_if_fail (reader != NULL, FALSE);
		g_return_val_if_fail (val != NULL, FALSE);

		if (G_UNLIKELY (size > reader->size \|\| _gst_byte_reader_get_remaining_inl
		ine (reader) < size))
		return FALSE;

		*val = gst_byte_reader_get_data_unchecked (reader, size);
		return TRUE;
		}

		static inline gboolean
		_gst_byte_reader_peek_data_inline (const GstByteReader * reader, guint size
		, const guint8 ** val)
		{
		g_return_val_if_fail (reader != NULL, FALSE);
		g_return_val_if_fail (val != NULL, FALSE);

		if (G_UNLIKELY (size > reader->size \|\| _gst_byte_reader_get_remaining_inl
		ine (reader) < size))
		return FALSE;

		*val = gst_byte_reader_peek_data_unchecked (reader);
		return TRUE;
		}

		static inline guint
		_gst_byte_reader_get_pos_inline (const GstByteReader * reader)
		{
		g_return_val_if_fail (reader != NULL, 0);

		return _gst_byte_reader_get_pos_unchecked (reader);
		}

		static inline gboolean
		_gst_byte_reader_skip_inline (GstByteReader * reader, guint nbytes)
		{
		g_return_val_if_fail (reader != NULL, FALSE);

		if (G_UNLIKELY (_gst_byte_reader_get_remaining_unchecked (reader) < nbyte
		s))
		return FALSE;

		reader->byte += nbytes;
		return TRUE;
		}

		#ifndef GST_BYTE_READER_DISABLE_INLINES

		#define gst_byte_reader_dup_data(reader,size,val) \
		G_LIKELY(_gst_byte_reader_dup_data_inline(reader,size,val))
		#define gst_byte_reader_get_data(reader,size,val) \
		G_LIKELY(_gst_byte_reader_get_data_inline(reader,size,val))
		#define gst_byte_reader_peek_data(reader,size,val) \
		G_LIKELY(_gst_byte_reader_peek_data_inline(reader,size,val))
		#define gst_byte_reader_skip(reader,nbytes) \
		G_LIKELY(_gst_byte_reader_skip_inline(reader,nbytes))

		#endif /* GST_BYTE_READER_DISABLE_INLINES */

	G_END_DECLS	G_END_DECLS

	#endif /* __GST_BYTE_READER_H__ */	#endif /* __GST_BYTE_READER_H__ */

End of changes. 7 change blocks.
	48 lines changed or deleted	472 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/