Commit c79e4fd9 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch...

Merge branch '389-pcm-reading-in-external-renderer-tries-to-assign-sample-rate-from-wave-file' into 'main'

Resolve "PCM reading in external renderer tries to assign sample rate from WAVE file"

See merge request !528
parents a38f9e50 032bf52d
Loading
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -645,7 +645,9 @@ int main(
                fprintf( stderr, "Sampling rate must be specified on command line when using raw PCM input\n" );
                exit( -1 );
            }
#ifndef FIX_389_EXT_REND_PCM_SR
            args.sampleRate = inFileSampleRate;
#endif
            break;
        default:
            fprintf( stderr, "Error: %s\n", ivas_error_to_string( error ) );
+2 −0
Original line number Diff line number Diff line
@@ -157,6 +157,8 @@
#define NOKIA_ADAPTIVE_BINAURAL_PROTOS                  /* Nokia: Contribution 28: Adaptive binaural prototypes */
#define NOKIA_ADAPTIVE_BINAURAL_PROTOS_OPT              /* Nokia: enable adaptive binaural prototype complexity optimizations */

#define FIX_389_EXT_REND_PCM_SR                         /* Nokia: Issue 389: Fix assignment of sample rate with PCM input. */

/* ################## End DEVELOPMENT switches ######################### */
/* clang-format on */
#endif