Ticket #1561: mplayer-audio-formats-filter-fix-ver3.patch

libaf/af.c

@@ -255 +255 @@
    failure */
 static int af_reinit(af_stream_t* s, af_instance_t* af)
 {
+  int rv=0; // Return value
+  af_instance_t* new = NULL;
+
   do{
     af_data_t in; // Format of the input to current filter
-    int rv=0; // Return value
-
     // Check if there are any filters left in the list
     if(NULL == af){
       if(!(af=af_append(s,s->first,"dummy")))
@@ -284 +285 @@
     case AF_FALSE:{ // Configuration filter is needed
       // Do auto insertion only if force is not specified
       if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){
-        af_instance_t* new = NULL;
         // Insert channels filter
         if((af->prev?af->prev->data->nch:s->input.nch) != in.nch){
           // Create channels filter
@@ -350 +350 @@
       return AF_ERROR;
     }
   }while(af);
+  
+  if((AF_INIT_TYPE_MASK & s->cfg.force) != AF_INIT_FORCE){
+    // Check number of output channels fix if not OK
+    // If needed always inserted last -> easy to screw up other filters
+    if(s->output.nch && s->last->data->nch!=s->output.nch){
+      if(!strcmp(s->last->info->name,"format"))
+        new = af_prepend(s,s->last,"channels");
+      else
+        new = af_append(s,s->last,"channels");
+      // Init the new filter
+      if(NULL == new)
+        return AF_ERROR;
+      if(AF_OK != (rv = new->control(new,AF_CONTROL_CHANNELS,&(s->output.nch))))
+        return rv;
+      if(AF_OK != (rv = af_reinit(s,new)))
+        return rv;
+    }
+
+    // Check output format fix if not OK
+    if(s->output.format != AF_FORMAT_UNKNOWN &&
+       s->last->data->format != s->output.format){
+      if(strcmp(s->last->info->name,"format")){
+        if(NULL == (new = af_append(s,s->last,"format")))
+          return AF_ERROR;
+      }
+      else
+        new = s->last;
+      // Set output bits per sample
+      s->output.format |= af_bits2fmt(s->output.bps*8);
+      if(AF_OK != (rv = new->control(new,AF_CONTROL_FORMAT_FMT,&(s->output.format))))
+        return rv;
+      if(AF_OK != (rv = af_reinit(s, new)))
+        return rv;
+    }
+  }
+
   return AF_OK;
 }
 
@@ -455 +491 @@
         return -1;
     }
 
-    // Check number of output channels fix if not OK
-    // If needed always inserted last -> easy to screw up other filters
-    if(s->output.nch && s->last->data->nch!=s->output.nch){
-      if(!strcmp(s->last->info->name,"format"))
-        af = af_prepend(s,s->last,"channels");
-      else
-        af = af_append(s,s->last,"channels");
-      // Init the new filter
-      if(!af || (AF_OK != af->control(af,AF_CONTROL_CHANNELS,&(s->output.nch))))
-        return -1;
-      if(AF_OK != af_reinit(s,af))
-        return -1;
-    }
-
-    // Check output format fix if not OK
-    if(s->output.format != AF_FORMAT_UNKNOWN &&
-                s->last->data->format != s->output.format){
-      if(strcmp(s->last->info->name,"format"))
-        af = af_append(s,s->last,"format");
-      else
-        af = s->last;
-      // Init the new filter
-      s->output.format |= af_bits2fmt(s->output.bps*8);
-      if(!af || (AF_OK != af->control(af,AF_CONTROL_FORMAT_FMT,&(s->output.format))))
-        return -1;
-      if(AF_OK != af_reinit(s,af))
-        return -1;
-    }
-
     // Re init again just in case
     if(AF_OK != af_reinit(s,s->first))
       return -1;