Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(289)

Side by Side Diff: silk/float/pitch_analysis_core_FLP.c

Issue 12388030: Update Opus to 1.0.2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/opus
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « silk/float/noise_shape_analysis_FLP.c ('k') | silk/float/prefilter_FLP.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /*********************************************************************** 1 /***********************************************************************
2 Copyright (c) 2006-2011, Skype Limited. All rights reserved. 2 Copyright (c) 2006-2011, Skype Limited. All rights reserved.
3 Redistribution and use in source and binary forms, with or without 3 Redistribution and use in source and binary forms, with or without
4 modification, are permitted provided that the following conditions 4 modification, are permitted provided that the following conditions
5 are met: 5 are met:
6 - Redistributions of source code must retain the above copyright notice, 6 - Redistributions of source code must retain the above copyright notice,
7 this list of conditions and the following disclaimer. 7 this list of conditions and the following disclaimer.
8 - Redistributions in binary form must reproduce the above copyright 8 - Redistributions in binary form must reproduce the above copyright
9 notice, this list of conditions and the following disclaimer in the 9 notice, this list of conditions and the following disclaimer in the
10 documentation and/or other materials provided with the distribution. 10 documentation and/or other materials provided with the distribution.
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 CCmax = -1000.0f; 412 CCmax = -1000.0f;
413 413
414 /* Calculate the correlations and energies needed in stage 3 */ 414 /* Calculate the correlations and energies needed in stage 3 */
415 silk_P_Ana_calc_corr_st3( cross_corr_st3, frame, start_lag, sf_length, n b_subfr, complexity ); 415 silk_P_Ana_calc_corr_st3( cross_corr_st3, frame, start_lag, sf_length, n b_subfr, complexity );
416 silk_P_Ana_calc_energy_st3( energies_st3, frame, start_lag, sf_length, n b_subfr, complexity ); 416 silk_P_Ana_calc_energy_st3( energies_st3, frame, start_lag, sf_length, n b_subfr, complexity );
417 417
418 lag_counter = 0; 418 lag_counter = 0;
419 silk_assert( lag == silk_SAT16( lag ) ); 419 silk_assert( lag == silk_SAT16( lag ) );
420 contour_bias = PE_FLATCONTOUR_BIAS / lag; 420 contour_bias = PE_FLATCONTOUR_BIAS / lag;
421 421
422 /* Set up cbk parameters acording to complexity setting and frame length */ 422 /* Set up cbk parameters according to complexity setting and frame lengt h */
423 if( nb_subfr == PE_MAX_NB_SUBFR ) { 423 if( nb_subfr == PE_MAX_NB_SUBFR ) {
424 nb_cbk_search = (opus_int)silk_nb_cbk_searchs_stage3[ complexity ]; 424 nb_cbk_search = (opus_int)silk_nb_cbk_searchs_stage3[ complexity ];
425 cbk_size = PE_NB_CBKS_STAGE3_MAX; 425 cbk_size = PE_NB_CBKS_STAGE3_MAX;
426 Lag_CB_ptr = &silk_CB_lags_stage3[ 0 ][ 0 ]; 426 Lag_CB_ptr = &silk_CB_lags_stage3[ 0 ][ 0 ];
427 } else { 427 } else {
428 nb_cbk_search = PE_NB_CBKS_STAGE3_10MS; 428 nb_cbk_search = PE_NB_CBKS_STAGE3_10MS;
429 cbk_size = PE_NB_CBKS_STAGE3_10MS; 429 cbk_size = PE_NB_CBKS_STAGE3_10MS;
430 Lag_CB_ptr = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ]; 430 Lag_CB_ptr = &silk_CB_lags_stage3_10_ms[ 0 ][ 0 ];
431 } 431 }
432 432
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 for( j = 0; j < PE_NB_STAGE3_LAGS; j++ ) { 621 for( j = 0; j < PE_NB_STAGE3_LAGS; j++ ) {
622 silk_assert( idx + j < SCRATCH_SIZE ); 622 silk_assert( idx + j < SCRATCH_SIZE );
623 silk_assert( idx + j < lag_counter ); 623 silk_assert( idx + j < lag_counter );
624 energies_st3[ k ][ i ][ j ] = scratch_mem[ idx + j ]; 624 energies_st3[ k ][ i ][ j ] = scratch_mem[ idx + j ];
625 silk_assert( energies_st3[ k ][ i ][ j ] >= 0.0f ); 625 silk_assert( energies_st3[ k ][ i ][ j ] >= 0.0f );
626 } 626 }
627 } 627 }
628 target_ptr += sf_length; 628 target_ptr += sf_length;
629 } 629 }
630 } 630 }
OLDNEW
« no previous file with comments | « silk/float/noise_shape_analysis_FLP.c ('k') | silk/float/prefilter_FLP.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698