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

Side by Side Diff: silk/shell_coder.c

Issue 882843002: Update to opus-HEAD-66611f1. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/opus.git@master
Patch Set: Add the contents of Makefile.mips back. Created 5 years, 10 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
« no previous file with comments | « silk/resampler_rom.c ('k') | silk/structs.h » ('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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 const opus_int p, /* I pulse amplitude of curre nt subframe */ 51 const opus_int p, /* I pulse amplitude of curre nt subframe */
52 const opus_uint8 *shell_table /* I table of shell cdfs */ 52 const opus_uint8 *shell_table /* I table of shell cdfs */
53 ) 53 )
54 { 54 {
55 if( p > 0 ) { 55 if( p > 0 ) {
56 ec_enc_icdf( psRangeEnc, p_child1, &shell_table[ silk_shell_code_table_o ffsets[ p ] ], 8 ); 56 ec_enc_icdf( psRangeEnc, p_child1, &shell_table[ silk_shell_code_table_o ffsets[ p ] ], 8 );
57 } 57 }
58 } 58 }
59 59
60 static OPUS_INLINE void decode_split( 60 static OPUS_INLINE void decode_split(
61 opus_int *p_child1, /* O pulse amplitude of first child subframe */ 61 opus_int16 *p_child1, /* O pulse amplitude of first child subframe */
62 opus_int *p_child2, /* O pulse amplitude of secon d child subframe */ 62 opus_int16 *p_child2, /* O pulse amplitude of secon d child subframe */
63 ec_dec *psRangeDec, /* I/O Compressor data structur e */ 63 ec_dec *psRangeDec, /* I/O Compressor data structur e */
64 const opus_int p, /* I pulse amplitude of curre nt subframe */ 64 const opus_int p, /* I pulse amplitude of curre nt subframe */
65 const opus_uint8 *shell_table /* I table of shell cdfs */ 65 const opus_uint8 *shell_table /* I table of shell cdfs */
66 ) 66 )
67 { 67 {
68 if( p > 0 ) { 68 if( p > 0 ) {
69 p_child1[ 0 ] = ec_dec_icdf( psRangeDec, &shell_table[ silk_shell_code_t able_offsets[ p ] ], 8 ); 69 p_child1[ 0 ] = ec_dec_icdf( psRangeDec, &shell_table[ silk_shell_code_t able_offsets[ p ] ], 8 );
70 p_child2[ 0 ] = p - p_child1[ 0 ]; 70 p_child2[ 0 ] = p - p_child1[ 0 ];
71 } else { 71 } else {
72 p_child1[ 0 ] = 0; 72 p_child1[ 0 ] = 0;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 encode_split( psRangeEnc, pulses0[ 10 ], pulses1[ 5 ], silk_shell_code_table 0 ); 110 encode_split( psRangeEnc, pulses0[ 10 ], pulses1[ 5 ], silk_shell_code_table 0 );
111 111
112 encode_split( psRangeEnc, pulses1[ 6 ], pulses2[ 3 ], silk_shell_code_table 1 ); 112 encode_split( psRangeEnc, pulses1[ 6 ], pulses2[ 3 ], silk_shell_code_table 1 );
113 encode_split( psRangeEnc, pulses0[ 12 ], pulses1[ 6 ], silk_shell_code_table 0 ); 113 encode_split( psRangeEnc, pulses0[ 12 ], pulses1[ 6 ], silk_shell_code_table 0 );
114 encode_split( psRangeEnc, pulses0[ 14 ], pulses1[ 7 ], silk_shell_code_table 0 ); 114 encode_split( psRangeEnc, pulses0[ 14 ], pulses1[ 7 ], silk_shell_code_table 0 );
115 } 115 }
116 116
117 117
118 /* Shell decoder, operates on one shell code frame of 16 pulses */ 118 /* Shell decoder, operates on one shell code frame of 16 pulses */
119 void silk_shell_decoder( 119 void silk_shell_decoder(
120 opus_int *pulses0, /* O data: no nnegative pulse amplitudes */ 120 opus_int16 *pulses0, /* O data: no nnegative pulse amplitudes */
121 ec_dec *psRangeDec, /* I/O Compress or data structure */ 121 ec_dec *psRangeDec, /* I/O Compress or data structure */
122 const opus_int pulses4 /* I number o f pulses per pulse-subframe */ 122 const opus_int pulses4 /* I number o f pulses per pulse-subframe */
123 ) 123 )
124 { 124 {
125 opus_int pulses3[ 2 ], pulses2[ 4 ], pulses1[ 8 ]; 125 opus_int16 pulses3[ 2 ], pulses2[ 4 ], pulses1[ 8 ];
126 126
127 /* this function operates on one shell code frame of 16 pulses */ 127 /* this function operates on one shell code frame of 16 pulses */
128 silk_assert( SHELL_CODEC_FRAME_LENGTH == 16 ); 128 silk_assert( SHELL_CODEC_FRAME_LENGTH == 16 );
129 129
130 decode_split( &pulses3[ 0 ], &pulses3[ 1 ], psRangeDec, pulses4, silk _shell_code_table3 ); 130 decode_split( &pulses3[ 0 ], &pulses3[ 1 ], psRangeDec, pulses4, silk _shell_code_table3 );
131 131
132 decode_split( &pulses2[ 0 ], &pulses2[ 1 ], psRangeDec, pulses3[ 0 ], silk _shell_code_table2 ); 132 decode_split( &pulses2[ 0 ], &pulses2[ 1 ], psRangeDec, pulses3[ 0 ], silk _shell_code_table2 );
133 133
134 decode_split( &pulses1[ 0 ], &pulses1[ 1 ], psRangeDec, pulses2[ 0 ], silk _shell_code_table1 ); 134 decode_split( &pulses1[ 0 ], &pulses1[ 1 ], psRangeDec, pulses2[ 0 ], silk _shell_code_table1 );
135 decode_split( &pulses0[ 0 ], &pulses0[ 1 ], psRangeDec, pulses1[ 0 ], silk _shell_code_table0 ); 135 decode_split( &pulses0[ 0 ], &pulses0[ 1 ], psRangeDec, pulses1[ 0 ], silk _shell_code_table0 );
136 decode_split( &pulses0[ 2 ], &pulses0[ 3 ], psRangeDec, pulses1[ 1 ], silk _shell_code_table0 ); 136 decode_split( &pulses0[ 2 ], &pulses0[ 3 ], psRangeDec, pulses1[ 1 ], silk _shell_code_table0 );
137 137
138 decode_split( &pulses1[ 2 ], &pulses1[ 3 ], psRangeDec, pulses2[ 1 ], silk _shell_code_table1 ); 138 decode_split( &pulses1[ 2 ], &pulses1[ 3 ], psRangeDec, pulses2[ 1 ], silk _shell_code_table1 );
139 decode_split( &pulses0[ 4 ], &pulses0[ 5 ], psRangeDec, pulses1[ 2 ], silk _shell_code_table0 ); 139 decode_split( &pulses0[ 4 ], &pulses0[ 5 ], psRangeDec, pulses1[ 2 ], silk _shell_code_table0 );
140 decode_split( &pulses0[ 6 ], &pulses0[ 7 ], psRangeDec, pulses1[ 3 ], silk _shell_code_table0 ); 140 decode_split( &pulses0[ 6 ], &pulses0[ 7 ], psRangeDec, pulses1[ 3 ], silk _shell_code_table0 );
141 141
142 decode_split( &pulses2[ 2 ], &pulses2[ 3 ], psRangeDec, pulses3[ 1 ], silk _shell_code_table2 ); 142 decode_split( &pulses2[ 2 ], &pulses2[ 3 ], psRangeDec, pulses3[ 1 ], silk _shell_code_table2 );
143 143
144 decode_split( &pulses1[ 4 ], &pulses1[ 5 ], psRangeDec, pulses2[ 2 ], silk _shell_code_table1 ); 144 decode_split( &pulses1[ 4 ], &pulses1[ 5 ], psRangeDec, pulses2[ 2 ], silk _shell_code_table1 );
145 decode_split( &pulses0[ 8 ], &pulses0[ 9 ], psRangeDec, pulses1[ 4 ], silk _shell_code_table0 ); 145 decode_split( &pulses0[ 8 ], &pulses0[ 9 ], psRangeDec, pulses1[ 4 ], silk _shell_code_table0 );
146 decode_split( &pulses0[ 10 ], &pulses0[ 11 ], psRangeDec, pulses1[ 5 ], silk _shell_code_table0 ); 146 decode_split( &pulses0[ 10 ], &pulses0[ 11 ], psRangeDec, pulses1[ 5 ], silk _shell_code_table0 );
147 147
148 decode_split( &pulses1[ 6 ], &pulses1[ 7 ], psRangeDec, pulses2[ 3 ], silk _shell_code_table1 ); 148 decode_split( &pulses1[ 6 ], &pulses1[ 7 ], psRangeDec, pulses2[ 3 ], silk _shell_code_table1 );
149 decode_split( &pulses0[ 12 ], &pulses0[ 13 ], psRangeDec, pulses1[ 6 ], silk _shell_code_table0 ); 149 decode_split( &pulses0[ 12 ], &pulses0[ 13 ], psRangeDec, pulses1[ 6 ], silk _shell_code_table0 );
150 decode_split( &pulses0[ 14 ], &pulses0[ 15 ], psRangeDec, pulses1[ 7 ], silk _shell_code_table0 ); 150 decode_split( &pulses0[ 14 ], &pulses0[ 15 ], psRangeDec, pulses1[ 7 ], silk _shell_code_table0 );
151 } 151 }
OLDNEW
« no previous file with comments | « silk/resampler_rom.c ('k') | silk/structs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698