Ticket #1533: mplayerfloatvorbis-v1.diff

libavcodec/vorbis_dec.c

@@ -153 +153 @@
     float *channel_residues;
     float *channel_floors;
     float *saved;
-    uint_fast32_t add_bias; // for float->int conversion
-    uint_fast32_t exp_bias;
 } vorbis_context;
 
 /* Helper functions */
@@ -861 +859 @@
         av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (illegal blocksize). \n");
         return 3;
     }
-    // output format int16
-    if (vc->blocksize[1]/2 * vc->audio_channels * 2 >
+    // output format float
+    if (vc->blocksize[1]/2 * vc->audio_channels * sizeof(float) >
                                              AVCODEC_MAX_AUDIO_FRAME_SIZE) {
         av_log(vc->avccontext, AV_LOG_ERROR, "Vorbis channel count makes "
                "output packets too large.\n");
@@ -881 +879 @@
     vc->saved           = av_mallocz((vc->blocksize[1]/4)*vc->audio_channels * sizeof(float));
     vc->previous_window=0;
 
-    ff_mdct_init(&vc->mdct[0], bl0, 1, vc->exp_bias ? -(1<<15) : -1.0);
-    ff_mdct_init(&vc->mdct[1], bl1, 1, vc->exp_bias ? -(1<<15) : -1.0);
+    ff_mdct_init(&vc->mdct[0], bl0, 1, -1.0);
+    ff_mdct_init(&vc->mdct[1], bl1, 1, -1.0);
 
     AV_DEBUG(" vorbis version %d \n audio_channels %d \n audio_samplerate %d \n bitrate_max %d \n bitrate_nom %d \n bitrate_min %d \n blk_0 %d blk_1 %d \n ",
             vc->version, vc->audio_channels, vc->audio_samplerate, vc->bitrate_maximum, vc->bitrate_nominal, vc->bitrate_minimum, vc->blocksize[0], vc->blocksize[1]);
@@ -911 +909 @@
     vc->avccontext = avccontext;
     dsputil_init(&vc->dsp, avccontext);
 
-    if(vc->dsp.float_to_int16_interleave == ff_float_to_int16_interleave_c) {
-        vc->add_bias = 385;
-        vc->exp_bias = 0;
-    } else {
-        vc->add_bias = 0;
-        vc->exp_bias = 15<<23;
-    }
-
     if (!headers_len) {
         av_log(avccontext, AV_LOG_ERROR, "Extradata corrupt.\n");
         return -1;
@@ -957 +947 @@
     avccontext->channels = vc->audio_channels;
     avccontext->sample_rate = vc->audio_samplerate;
     avccontext->frame_size  = FFMIN(vc->blocksize[0], vc->blocksize[1])>>2;
-    avccontext->sample_fmt = SAMPLE_FMT_S16;
+    avccontext->sample_fmt = SAMPLE_FMT_FLT;
 
     return 0 ;
 }
@@ -1391 +1381 @@
     }
 }
 
-static void copy_normalize(float *dst, float *src, int len, int exp_bias, float add_bias)
-{
-    int i;
-    if(exp_bias) {
-        memcpy(dst, src, len * sizeof(float));
-    } else {
-        for(i=0; i<len; i++)
-            dst[i] = src[i] + add_bias;
-    }
-}
-
 // Decode the audio packet using the functions above
 
 static int vorbis_parse_audio_packet(vorbis_context *vc) {
@@ -1420 +1399 @@
     uint_fast8_t res_chan[vc->audio_channels];
     uint_fast8_t res_num=0;
     int_fast16_t retlen=0;
-    float fadd_bias = vc->add_bias;
 
     if (get_bits1(gb)) {
         av_log(vc->avccontext, AV_LOG_ERROR, "Not a Vorbis I audio packet.\n");
@@ -1525 +1503 @@
         const float *win=vc->win[blockflag&previous_window];
 
         if(blockflag == previous_window) {
-            vc->dsp.vector_fmul_window(ret, saved, buf, win, fadd_bias, blocksize/4);
+            vc->dsp.vector_fmul_window(ret, saved, buf, win, 0.0f, blocksize/4);
         } else if(blockflag > previous_window) {
-            vc->dsp.vector_fmul_window(ret, saved, buf, win, fadd_bias, bs0/4);
-            copy_normalize(ret+bs0/2, buf+bs0/4, (bs1-bs0)/4, vc->exp_bias, fadd_bias);
+            vc->dsp.vector_fmul_window(ret, saved, buf, win, 0.0f, bs0/4);
+            memcpy(ret+bs0/2, buf+bs0/4, (bs1-bs0)/4*sizeof(float));
         } else {
-            copy_normalize(ret, saved, (bs1-bs0)/4, vc->exp_bias, fadd_bias);
-            vc->dsp.vector_fmul_window(ret+(bs1-bs0)/4, saved+(bs1-bs0)/4, buf, win, fadd_bias, bs0/4);
+            memcpy(ret, saved, (bs1-bs0)/4*sizeof(float));
+            vc->dsp.vector_fmul_window(ret+(bs1-bs0)/4, saved+(bs1-bs0)/4, buf, win, 0.0f, bs0/4);
         }
         memcpy(saved, buf+blocksize/4, blocksize/4*sizeof(float));
     }
@@ -1550 +1528 @@
     int buf_size = avpkt->size;
     vorbis_context *vc = avccontext->priv_data ;
     GetBitContext *gb = &(vc->gb);
-    const float *channel_ptrs[vc->audio_channels];
-    int i;
+    int i,ch;
 
     int_fast16_t len;
 
@@ -1578 +1555 @@
 
     AV_DEBUG("parsed %d bytes %d bits, returned %d samples (*ch*bits) \n", get_bits_count(gb)/8, get_bits_count(gb)%8, len);
 
-    for(i=0; i<vc->audio_channels; i++)
-        channel_ptrs[i] = vc->channel_floors+i*len;
-    vc->dsp.float_to_int16_interleave(data, channel_ptrs, len, vc->audio_channels);
-    *data_size=len*2*vc->audio_channels;
+    /* interleave */
+    for (i=0; i < len; i++) {
+        for (ch=0; ch < vc->audio_channels; ch++) {
+            ((float *)data)[i * vc->audio_channels + ch] = (vc->channel_floors + ch*len)[i];
+        }
+    }
 
+    *data_size=len*sizeof(float)*vc->audio_channels;
+
     return buf_size ;
 }