shithub: opus

Info  •  Files  •  Log  •  Branches

Remove commented-out DEBUG_STORE_DATA calls. r=keon

Also remove the SILK_DEBUG_STORE_CLOSE_FILES flush call from
opus_demo.

This is debugging code which is no longer used, but defining
the symbols for SILK_DEBUG_STORE_CLOSE_FILES and calling it
from opus_demo causes linking problems on Microsoft Visual Studio
where we have strict controls on public symbols and want to
test the compiled DLL.

Since the code isn't in active use, it's better to remove it
to avoid clutter and address the linking issue.

--- a/silk/NSQ.c

+++ b/silk/NSQ.c

@@ -168,7 +168,6 @@

     NSQ->lagPrev = pitchL[ psEncC->nb_subfr - 1 ];

     /* Save quantized speech and noise shaping signals */

-    /* DEBUG_STORE_DATA( enc.pcm, &NSQ->xq[ psEncC->ltp_mem_length ], psEncC->frame_length * sizeof( opus_int16 ) ) */

     silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int16 ) );

     silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int32 ) );

     RESTORE_STACK;

--- a/silk/NSQ_del_dec.c

+++ b/silk/NSQ_del_dec.c

@@ -306,7 +306,6 @@

     NSQ->lagPrev        = pitchL[ psEncC->nb_subfr - 1 ];

     /* Save quantized speech signal */

-    /* DEBUG_STORE_DATA( enc.pcm, &NSQ->xq[psEncC->ltp_mem_length], psEncC->frame_length * sizeof( opus_int16 ) ) */

     silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int16 ) );

     silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int32 ) );

     RESTORE_STACK;

--- a/silk/decode_core.c

+++ b/silk/decode_core.c

@@ -225,8 +225,6 @@

             pxq[ i ] = (opus_int16)silk_SAT16( silk_RSHIFT_ROUND( silk_SMULWW( sLPC_Q14[ MAX_LPC_ORDER + i ], Gain_Q10 ), 8 ) );

         }

-        /* DEBUG_STORE_DATA( dec.pcm, pxq, psDec->subfr_length * sizeof( opus_int16 ) ) */

-

         /* Update LPC filter state */

         silk_memcpy( sLPC_Q14, &sLPC_Q14[ psDec->subfr_length ], MAX_LPC_ORDER * sizeof( opus_int32 ) );

         pexc_Q14 += psDec->subfr_length;

--- a/silk/x86/NSQ_del_dec_sse.c

+++ b/silk/x86/NSQ_del_dec_sse.c

@@ -301,7 +301,6 @@

     NSQ->lagPrev        = pitchL[ psEncC->nb_subfr - 1 ];

     /* Save quantized speech signal */

-    /* DEBUG_STORE_DATA( enc.pcm, &NSQ->xq[psEncC->ltp_mem_length], psEncC->frame_length * sizeof( opus_int16 ) ) */

     silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int16 ) );

     silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int32 ) );

     RESTORE_STACK;

--- a/silk/x86/NSQ_sse.c

+++ b/silk/x86/NSQ_sse.c

@@ -233,7 +233,6 @@

     NSQ->lagPrev = pitchL[ psEncC->nb_subfr - 1 ];

     /* Save quantized speech and noise shaping signals */

-    /* DEBUG_STORE_DATA( enc.pcm, &NSQ->xq[ psEncC->ltp_mem_length ], psEncC->frame_length * sizeof( opus_int16 ) ) */

     silk_memmove( NSQ->xq,           &NSQ->xq[           psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int16 ) );

     silk_memmove( NSQ->sLTP_shp_Q14, &NSQ->sLTP_shp_Q14[ psEncC->frame_length ], psEncC->ltp_mem_length * sizeof( opus_int32 ) );

     RESTORE_STACK;

--- a/src/opus_demo.c

+++ b/src/opus_demo.c

@@ -876,8 +876,6 @@

                1e-3*bits_act*sampling_rate/(1e-15+frame_size*(double)count_act));

     fprintf (stderr, "bitrate standard deviation:  %7.3f kb/s\n",

             1e-3*sqrt(bits2/count - bits*bits/(count*(double)count))*sampling_rate/frame_size);

-    /* Close any files to which intermediate results were stored */

-    SILK_DEBUG_STORE_CLOSE_FILES

     silk_TimerSave("opus_timing.txt");

     opus_encoder_destroy(enc);

     opus_decoder_destroy(dec);