Changeset 2901:8c574e2033be in roaraudio

Timestamp:

10/11/09 01:43:52 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

write length + data at once

File:

• roard/codecfilter_speex.c (modified) (3 diffs)

roard/codecfilter_speex.c

@@ -315 +315 @@
 
   if ( !self->cd ) {
-   self->cd = malloc(fs2);
+   self->cd = malloc(fs2 + 2);
    if ( !self->cd )
     return 0;
@@ -341 +341 @@
    speex_encode_int(self->encoder, (spx_int16_t *) self->o_rest, &(self->bits));
 
-   tmp = mode = speex_bits_write(&(self->bits), self->cd, fs2);
+   tmp = mode = speex_bits_write(&(self->bits), self->cd + 2, fs2);
 
    mode = ROAR_HOST2NET16(mode);
-   stream_vio_s_write(self->stream, &mode, 2);
-   if ( stream_vio_s_write(self->stream, self->cd, tmp) != tmp )
+   *(uint16_t*)(self->cd) = mode;
+   if ( stream_vio_s_write(self->stream, self->cd, tmp + 2) != (tmp + 2) )
     return -1;
 
@@ -371 +371 @@
   speex_encode_int(self->encoder, (spx_int16_t *) buf, &(self->bits));
 
-  tmp = mode = speex_bits_write(&(self->bits), self->cd, fs2);
+  tmp = mode = speex_bits_write(&(self->bits), self->cd + 2, fs2);
 
   mode = ROAR_HOST2NET16(mode);
 
-  stream_vio_s_write(self->stream, &mode, 2);
-
-  if ( stream_vio_s_write(self->stream, self->cd, tmp) != tmp )
+  *(uint16_t*)(self->cd) = mode;
+
+  if ( stream_vio_s_write(self->stream, self->cd, tmp + 2) != (tmp + 2) )
    return -1;