Changeset 2921:d2fd1f7cdfa6 in roaraudio

Timestamp:

10/16/09 17:47:00 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added roar_xcoder_proc_header(), roar_bixcoder_read_header() and roar_bixcoder_write_header()

Files:

• include/libroardsp/transcode.h (modified) (3 diffs)
• libroardsp/transcode.c (modified) (4 diffs)

include/libroardsp/transcode.h

@@ -60 +60 @@
  int (*encode)(struct roar_xcoder * state, void * buf, size_t len);
  int (*decode)(struct roar_xcoder * state, void * buf, size_t len);
+ int (*proc_header)(struct roar_xcoder * state);
 };
 
@@ -90 +91 @@
 int roar_xcoder_packet_size(struct roar_xcoder * state, int samples);
 int roar_xcoder_close      (struct roar_xcoder * state);
+int roar_xcoder_proc_header(struct roar_xcoder * state);
 int roar_xcoder_proc_packet(struct roar_xcoder * state, void * buf, size_t len);
 int roar_xcoder_proc       (struct roar_xcoder * state, void * buf, size_t len);
@@ -96 +98 @@
 int roar_bixcoder_packet_size (struct roar_bixcoder * state, int samples);
 int roar_bixcoder_close       (struct roar_bixcoder * state);
+int roar_bixcoder_read_header (struct roar_bixcoder * state);
 int roar_bixcoder_read_packet (struct roar_bixcoder * state, void * buf, size_t len);
 int roar_bixcoder_read        (struct roar_bixcoder * state, void * buf, size_t len);
+int roar_bixcoder_write_header(struct roar_bixcoder * state);
 int roar_bixcoder_write_packet(struct roar_bixcoder * state, void * buf, size_t len);
 int roar_bixcoder_write       (struct roar_bixcoder * state, void * buf, size_t len);

libroardsp/transcode.c

@@ -33 +33 @@
 static struct roar_xcoder_entry g_xcoders[] = {
  {ROAR_CODEC_ALAW,  roar_xcoder_dummy_inituninit, roar_xcoder_dummy_inituninit, roar_xcoder_dummy_packet_size_any,
-                     roar_xcoder_alaw_encode,  roar_xcoder_alaw_decode},
+                     roar_xcoder_alaw_encode,  roar_xcoder_alaw_decode, NULL},
  {ROAR_CODEC_MULAW, roar_xcoder_dummy_inituninit, roar_xcoder_dummy_inituninit, roar_xcoder_dummy_packet_size_any,
-                     roar_xcoder_mulaw_encode, roar_xcoder_mulaw_decode},
+                     roar_xcoder_mulaw_encode, roar_xcoder_mulaw_decode, NULL},
 #ifdef ROAR_HAVE_LIBCELT
  {ROAR_CODEC_ROAR_CELT, roar_xcoder_celt_init, roar_xcoder_celt_uninit, roar_xcoder_celt_packet_size,
-                     roar_xcoder_celt_encode,  roar_xcoder_celt_decode},
+                     roar_xcoder_celt_encode,  roar_xcoder_celt_decode, NULL},
 #endif
 #ifdef ROAR_HAVE_LIBSPEEX
  {ROAR_CODEC_ROAR_SPEEX, roar_xcoder_speex_init, roar_xcoder_speex_uninit, roar_xcoder_speex_packet_size,
-                     roar_xcoder_speex_encode, roar_xcoder_speex_decode},
+                     roar_xcoder_speex_encode, roar_xcoder_speex_decode, NULL},
 #endif
- {-1, NULL, NULL, NULL, NULL, NULL}
+ {-1, NULL, NULL, NULL, NULL, NULL, NULL}
 };
 
@@ -124 +124 @@
 
  return _FUNC(uninit)(state);
+}
+
+int roar_xcoder_proc_header(struct roar_xcoder * state) {
+ _CHECK_BASIC(proc_header);
+
+ return _FUNC(proc_header)(state);
 }
 
@@ -367 +373 @@
 }
 
+int roar_bixcoder_read_header (struct roar_bixcoder * state) {
+ if ( state == NULL )
+  return -1;
+
+ return roar_xcoder_proc_header(&(state->decoder));
+}
+
 int roar_bixcoder_read_packet (struct roar_bixcoder * state, void * buf, size_t len) {
 
@@ -382 +395 @@
 
  return roar_xcoder_proc(&(state->decoder), buf, len);
+}
+
+int roar_bixcoder_write_header(struct roar_bixcoder * state) {
+ if ( state == NULL )
+  return -1;
+
+ return roar_xcoder_proc_header(&(state->decoder));
 }