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

Side by Side Diff: celt/fixed_c5x.h

Issue 28553003: Updating Opus to a pre-release of 1.1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/opus
Patch Set: Removing failing file Created 7 years, 2 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 | « celt/entdec.c ('k') | celt/fixed_c6x.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 /* Copyright (c) 2007-2008 CSIRO 1 /* Copyright (C) 2003 Jean-Marc Valin */
2 Copyright (c) 2007-2009 Xiph.Org Foundation
3 Written by Jean-Marc Valin */
4 /** 2 /**
5 @file pitch.h 3 @file fixed_c5x.h
6 @brief Pitch analysis 4 @brief Fixed-point operations for the TI C5x DSP family
7 */ 5 */
8
9 /* 6 /*
10 Redistribution and use in source and binary forms, with or without 7 Redistribution and use in source and binary forms, with or without
11 modification, are permitted provided that the following conditions 8 modification, are permitted provided that the following conditions
12 are met: 9 are met:
13 10
14 - Redistributions of source code must retain the above copyright 11 - Redistributions of source code must retain the above copyright
15 notice, this list of conditions and the following disclaimer. 12 notice, this list of conditions and the following disclaimer.
16 13
17 - Redistributions in binary form must reproduce the above copyright 14 - Redistributions in binary form must reproduce the above copyright
18 notice, this list of conditions and the following disclaimer in the 15 notice, this list of conditions and the following disclaimer in the
19 documentation and/or other materials provided with the distribution. 16 documentation and/or other materials provided with the distribution.
20 17
21 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 18 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
22 ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 19 ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
23 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 20 LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
24 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 21 A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
25 OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 22 OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
26 EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 23 EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
27 PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 24 PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
28 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF 25 PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
29 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 26 LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
30 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 27 NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
31 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32 */ 29 */
33 30
34 #ifndef PITCH_H 31 #ifndef FIXED_C5X_H
35 #define PITCH_H 32 #define FIXED_C5X_H
36 33
37 #include "modes.h" 34 #include "dsplib.h"
38 35
39 void pitch_downsample(celt_sig * OPUS_RESTRICT x[], opus_val16 * OPUS_RESTRICT x _lp, 36 #undef IMUL32
40 int len, int C); 37 static inline long IMUL32(long i, long j)
38 {
39 long ac0, ac1;
40 ac0 = _lmpy(i>>16,j);
41 ac1 = ac0 + _lmpy(i,j>>16);
42 return _lmpyu(i,j) + (ac1<<16);
43 }
41 44
42 void pitch_search(const opus_val16 * OPUS_RESTRICT x_lp, opus_val16 * OPUS_RESTR ICT y, 45 #undef MAX16
43 int len, int max_pitch, int *pitch); 46 #define MAX16(a,b) _max(a,b)
44 47
45 opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod, 48 #undef MIN16
46 int N, int *T0, int prev_period, opus_val16 prev_gain); 49 #define MIN16(a,b) _min(a,b)
47 50
48 #endif 51 #undef MAX32
52 #define MAX32(a,b) _lmax(a,b)
53
54 #undef MIN32
55 #define MIN32(a,b) _lmin(a,b)
56
57 #undef VSHR32
58 #define VSHR32(a, shift) _lshl(a,-(shift))
59
60 #undef MULT16_16_Q15
61 #define MULT16_16_Q15(a,b) (_smpy(a,b))
62
63 #undef MULT16_16SU
64 #define MULT16_16SU(a,b) _lmpysu(a,b)
65
66 #undef MULT_16_16
67 #define MULT_16_16(a,b) _lmpy(a,b)
68
69 /* FIXME: This is technically incorrect and is bound to cause problems. Is there any cleaner solution? */
70 #undef MULT16_32_Q15
71 #define MULT16_32_Q15(a,b) ADD32(SHL(MULT16_16((a),SHR((b),16)),1), SHR(MULT16_1 6SU((a),(b)),15))
72
73 #define celt_ilog2(x) (30 - _lnorm(x))
74 #define OVERRIDE_CELT_ILOG2
75
76 #define celt_maxabs16(x, len) MAX32(EXTEND32(maxval((DATA *)x, len)),-EXTEND32(m inval((DATA *)x, len)))
77 #define OVERRIDE_CELT_MAXABS16
78
79 #endif /* FIXED_C5X_H */
OLDNEW
« no previous file with comments | « celt/entdec.c ('k') | celt/fixed_c6x.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698