Changeset 2087:30d3653999b9 in roaraudio

Timestamp:

07/20/09 16:47:55 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added some debug outputs and got setting of quality for vorbis working :)

Location:

roard

Files:

• codecfilter_vorbis.c (modified) (7 diffs)
• roard.c (modified) (2 diffs)

roard/codecfilter_vorbis.c

@@ -92 +92 @@
 #ifdef ROAR_HAVE_LIBVORBISENC
   // set up the encoder here
+// this is delayed to the write function
+/*
  if ( cf_vorbis_encode_start(self) == -1 ) {
   free(self);
   return -1;
  }
+*/
 #else
  free(self);
@@ -141 +144 @@
 
  if ( ! self->opened ) {
+  if ( !self->encoding ) {
+   if ( cf_vorbis_encode_start(self) == -1 ) {
+    return -1;
+   }
+  }
+
   vorbis_analysis_headerout(&(self->encoder.vd), &(self->encoder.vc), &header, &header_comm, &header_code);
 
@@ -338 +347 @@
 #endif
  int sid = ROAR_STREAM(self->stream)->id;
+ float v_base_quality = self->encoder.v_base_quality;
  char val[LIBROAR_BUFFER_MSGDATA];
 
@@ -345 +355 @@
 
   self->encoding = 1;
-  self->encoder.srn = srn + 1;;
+  self->encoder.srn = srn + 1;
+  self->encoder.v_base_quality = v_base_quality;
 
   vorbis_info_init(&(self->encoder.vi));
@@ -362 +373 @@
 #endif
 
+  ROAR_DBG("cf_vorbis_encode_start(*): q=%f", v_base_quality);
+
   if( vorbis_encode_init_vbr(&(self->encoder.vi), (long) ROAR_STREAM(self->stream)->info.channels,
                                                   (long) ROAR_STREAM(self->stream)->info.rate,
-                                                  self->encoder.v_base_quality) != 0 ) {
+                                                  v_base_quality) != 0 ) {
    ROAR_ERR("cf_vorbis_encode_start(*): Can not vorbis_encode_init_vbr(*)!");
    vorbis_info_clear(&(self->encoder.vi)); // TODO: do we need to free vc also?
@@ -456 +469 @@
      return -1;
 
-    self->encoder.v_base_quality = *(float*)data;
+    ROAR_DBG("cf_vorbis_ctl(*): setting quality to q=%f", *(float*)data);
+
+    self->encoder.v_base_quality = *(float*)data / 10;
 
     if ( self->encoding ) {
@@ -471 +486 @@
    break;
   default:
+    ROAR_DBG("cf_vorbis_ctl(*): Unknown command: cmd=0x%.8x, type=0x%.8x, pcmd=0x%.8x",
+                    cmd, type, ROAR_CODECFILTER_CTL2CMD(cmd));
     return -1;
  }

roard/roard.c

@@ -330 +330 @@
  roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAM,   s); // ignore errors here
 
- if ( q > -1e6 )
-  streams_ctl(stream, ROAR_CODECFILTER_CTL_SET_Q|ROAR_STREAM_CTL_TYPE_FLOAT, &q);
-
  if ( blocks != -1 )
   roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_DBLOCKS, &blocks);
@@ -352 +349 @@
 
  streams_set_fh(stream, -1); // update some internal structures
+
+ if ( q > -1e6 ) {
+  ROAR_DBG("add_output(*): setting q=%f", q);
+  streams_ctl(stream, ROAR_CODECFILTER_CTL_SET_Q|ROAR_STREAM_CTL_TYPE_FLOAT, &q);
+ }
 
  client_stream_add(g_source_client, stream);