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

Side by Side Diff: webrtc/modules/audio_coding/neteq/test/RTPencode.cc

Issue 1438663003: modules/audio_coding: Remove some codec include dirs (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase again Created 5 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 void stereoDeInterleave(int16_t* audioSamples, size_t numSamples); 119 void stereoDeInterleave(int16_t* audioSamples, size_t numSamples);
120 void stereoInterleave(unsigned char* data, size_t dataLen, size_t stride); 120 void stereoInterleave(unsigned char* data, size_t dataLen, size_t stride);
121 121
122 /*********************/ 122 /*********************/
123 /* Codec definitions */ 123 /* Codec definitions */
124 /*********************/ 124 /*********************/
125 125
126 #include "webrtc_vad.h" 126 #include "webrtc_vad.h"
127 127
128 #if ((defined CODEC_PCM16B) || (defined NETEQ_ARBITRARY_CODEC)) 128 #if ((defined CODEC_PCM16B) || (defined NETEQ_ARBITRARY_CODEC))
129 #include "pcm16b.h" 129 #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h"
130 #endif 130 #endif
131 #ifdef CODEC_G711 131 #ifdef CODEC_G711
132 #include "g711_interface.h" 132 #include "webrtc/modules/audio_coding/codecs/g711/g711_interface.h"
133 #endif 133 #endif
134 #ifdef CODEC_G729 134 #ifdef CODEC_G729
135 #include "G729Interface.h" 135 #include "G729Interface.h"
136 #endif 136 #endif
137 #ifdef CODEC_G729_1 137 #ifdef CODEC_G729_1
138 #include "G729_1Interface.h" 138 #include "G729_1Interface.h"
139 #endif 139 #endif
140 #ifdef CODEC_AMR 140 #ifdef CODEC_AMR
141 #include "AMRInterface.h" 141 #include "AMRInterface.h"
142 #include "AMRCreation.h" 142 #include "AMRCreation.h"
143 #endif 143 #endif
144 #ifdef CODEC_AMRWB 144 #ifdef CODEC_AMRWB
145 #include "AMRWBInterface.h" 145 #include "AMRWBInterface.h"
146 #include "AMRWBCreation.h" 146 #include "AMRWBCreation.h"
147 #endif 147 #endif
148 #ifdef CODEC_ILBC 148 #ifdef CODEC_ILBC
149 #include "ilbc.h" 149 #include "webrtc/modules/audio_coding/codecs/ilbc/ilbc.h"
150 #endif 150 #endif
151 #if (defined CODEC_ISAC || defined CODEC_ISAC_SWB) 151 #if (defined CODEC_ISAC || defined CODEC_ISAC_SWB)
152 #include "isac.h" 152 #include "webrtc/modules/audio_coding/codecs/isac/main/include/isac.h"
153 #endif 153 #endif
154 #ifdef NETEQ_ISACFIX_CODEC 154 #ifdef NETEQ_ISACFIX_CODEC
155 #include "isacfix.h" 155 #include "webrtc/modules/audio_coding/codecs/isac/fix/include/isacfix.h"
156 #ifdef CODEC_ISAC 156 #ifdef CODEC_ISAC
157 #error Cannot have both ISAC and ISACfix defined. Please de-select one. 157 #error Cannot have both ISAC and ISACfix defined. Please de-select one.
158 #endif 158 #endif
159 #endif 159 #endif
160 #ifdef CODEC_G722 160 #ifdef CODEC_G722
161 #include "g722_interface.h" 161 #include "webrtc/modules/audio_coding/codecs/g722/g722_interface.h"
162 #endif 162 #endif
163 #ifdef CODEC_G722_1_24 163 #ifdef CODEC_G722_1_24
164 #include "G722_1Interface.h" 164 #include "G722_1Interface.h"
165 #endif 165 #endif
166 #ifdef CODEC_G722_1_32 166 #ifdef CODEC_G722_1_32
167 #include "G722_1Interface.h" 167 #include "G722_1Interface.h"
168 #endif 168 #endif
169 #ifdef CODEC_G722_1_16 169 #ifdef CODEC_G722_1_16
170 #include "G722_1Interface.h" 170 #include "G722_1Interface.h"
171 #endif 171 #endif
172 #ifdef CODEC_G722_1C_24 172 #ifdef CODEC_G722_1C_24
173 #include "G722_1Interface.h" 173 #include "G722_1Interface.h"
174 #endif 174 #endif
175 #ifdef CODEC_G722_1C_32 175 #ifdef CODEC_G722_1C_32
176 #include "G722_1Interface.h" 176 #include "G722_1Interface.h"
177 #endif 177 #endif
178 #ifdef CODEC_G722_1C_48 178 #ifdef CODEC_G722_1C_48
179 #include "G722_1Interface.h" 179 #include "G722_1Interface.h"
180 #endif 180 #endif
181 #ifdef CODEC_G726 181 #ifdef CODEC_G726
182 #include "G726Creation.h" 182 #include "G726Creation.h"
183 #include "G726Interface.h" 183 #include "G726Interface.h"
184 #endif 184 #endif
185 #ifdef CODEC_GSMFR 185 #ifdef CODEC_GSMFR
186 #include "GSMFRInterface.h" 186 #include "GSMFRInterface.h"
187 #include "GSMFRCreation.h" 187 #include "GSMFRCreation.h"
188 #endif 188 #endif
189 #if (defined(CODEC_CNGCODEC8) || defined(CODEC_CNGCODEC16) || \ 189 #if (defined(CODEC_CNGCODEC8) || defined(CODEC_CNGCODEC16) || \
190 defined(CODEC_CNGCODEC32) || defined(CODEC_CNGCODEC48)) 190 defined(CODEC_CNGCODEC32) || defined(CODEC_CNGCODEC48))
191 #include "webrtc_cng.h" 191 #include "webrtc/modules/audio_coding/codecs/cng/webrtc_cng.h"
192 #endif 192 #endif
193 #if ((defined CODEC_SPEEX_8) || (defined CODEC_SPEEX_16)) 193 #if ((defined CODEC_SPEEX_8) || (defined CODEC_SPEEX_16))
194 #include "SpeexInterface.h" 194 #include "SpeexInterface.h"
195 #endif 195 #endif
196 196
197 /***********************************/ 197 /***********************************/
198 /* Global codec instance variables */ 198 /* Global codec instance variables */
199 /***********************************/ 199 /***********************************/
200 200
201 WebRtcVadInst* VAD_inst[2]; 201 WebRtcVadInst* VAD_inst[2];
(...skipping 1635 matching lines...) Expand 10 before | Expand all | Expand 10 after
1837 memmove(ptrL + stride, ptrL, ptrR - ptrL); 1837 memmove(ptrL + stride, ptrL, ptrR - ptrL);
1838 1838
1839 // copy from temp to left pointer 1839 // copy from temp to left pointer
1840 memcpy(ptrL, temp, stride); 1840 memcpy(ptrL, temp, stride);
1841 1841
1842 // advance pointers 1842 // advance pointers
1843 ptrL += stride * 2; 1843 ptrL += stride * 2;
1844 ptrR += stride; 1844 ptrR += stride;
1845 } 1845 }
1846 } 1846 }
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/normal.cc ('k') | webrtc/modules/audio_coding/neteq/test/neteq_ilbc_quality_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698