From 7710c86dc7c5c091fcff696a394264b85c14bf58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Loeuillet?= <gstreamer@leroutier.net>
Date: Thu, 13 May 2004 21:27:14 +0000
Subject: ext/mad/gstid3tag.c: move from "Codec/(Dem/M)uxer" to
 "Codec/(Dem/M)uxer/Audio"

Original commit message from CVS:
* ext/mad/gstid3tag.c : move from "Codec/(Dem/M)uxer" to "Codec/(Dem/M)uxer/Audio"
* gst/wavenc/gstwavenc.c : move from "Codec/Encoder/Audio" to "Codec/Muxer/Audio"

* gst/auparse/gstauparse.c :
- add code (commented for now) to support audio/x-adpcm on src pad
(we have no decoder for those layout yet)

* gst/cdxaparse/gstcdxaparse.c :
* gst/cdxaparse/gstcdxaparse.h :
- partial rewrite using RiffRead (ripped iain's wavparse code)

* gst/rtp/gstrtpL16enc.c : typo
* gst/rtp/gstrtpgsmenc.c : typo
---
 gst/cdxaparse/gstcdxaparse.h | 43 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

(limited to 'gst/cdxaparse/gstcdxaparse.h')

diff --git a/gst/cdxaparse/gstcdxaparse.h b/gst/cdxaparse/gstcdxaparse.h
index 32af5527..4dc1236e 100644
--- a/gst/cdxaparse/gstcdxaparse.h
+++ b/gst/cdxaparse/gstcdxaparse.h
@@ -23,7 +23,8 @@
 #define __GST_CDXA_PARSE_H__
 
 #include <gst/gst.h>
-#include <gst/bytestream/bytestream.h>
+#include "gst/riff/riff-ids.h"
+#include "gst/riff/riff-read.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,31 +41,49 @@ extern "C" {
 #define GST_IS_CDXA_PARSE_CLASS(obj) \
   (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CDXA_PARSE))
 
-#define CDXA_SECTOR_SIZE  	2352
-#define CDXA_DATA_SIZE  	2324
+#define GST_CDXA_SECTOR_SIZE  	2352
+#define GST_CDXA_DATA_SIZE  	2324
 
-typedef enum
-{
-  CDXA_PARSE_HEADER,
-  CDXA_PARSE_DATA,
+typedef enum {
+  GST_CDXA_PARSE_START,
+  GST_CDXA_PARSE_FMT,
+  GST_CDXA_PARSE_OTHER,
+  GST_CDXA_PARSE_DATA,
 } GstCDXAParseState;
 
 typedef struct _GstCDXAParse GstCDXAParse;
 typedef struct _GstCDXAParseClass GstCDXAParseClass;
 
 struct _GstCDXAParse {
-  GstElement element;
+  GstRiffRead parent;
 
   /* pads */
-  GstPad *sinkpad, *srcpad;
-
-  GstByteStream *bs;
+  GstPad *sinkpad,*srcpad;
 
+  /* CDXA decoding state */
   GstCDXAParseState state;
 
+  /* useful CDXA data 
   guint32 riff_size;
   guint32 data_size;
   guint32 sectors;
+
+#define CDXA_SUB_MODE_EOF(c)    ((c&0x80)>>7)
+#define CDXA_SUB_MODE_RT(c)     ((c&0x40)>>6)
+#define CDXA_SUB_MODE_FORM(c)   ((c&0x20)>>5)
+#define CDXA_SUB_MODE_TRIGGER(c)((c&0x10)>>4)
+#define CDXA_SUB_MODE_DATA(c)   ((c&0x08)>>3)
+#define CDXA_SUB_MODE_VIDEO(c)  ((c&0x04)>>2)
+#define CDXA_SUB_MODE_AUDIO(c)  ((c&0x02)>>1)
+#define CDXA_SUB_MODE_EOR(c)    ((c&0x01)   )
+
+*/
+
+  guint64 dataleft;
+  int byteoffset;
+  
+  gboolean seek_pending;
+  guint64 seek_offset;
 };
 
 struct _GstCDXAParseClass {
@@ -77,4 +96,6 @@ GType 		gst_cdxa_parse_get_type		(void);
 }
 #endif /* __cplusplus */
 
+
 #endif /* __GST_CDXA_PARSE_H__ */
+
-- 
cgit v1.2.1