- Timestamp:
- Dec 17, 2018, 2:34:15 AM (6 years ago)
- Branches:
- feature/autosink, feature/cnn, feature/crepe, fix/ffmpeg5, master
- Children:
- 4c37e87
- Parents:
- 0850e54 (diff), 0512fca (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - Location:
- src
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
src/aubio_priv.h
r0850e54 r40bdc14 368 368 #endif /* __STRICT_ANSI__ */ 369 369 370 #if defined(DEBUG) 371 #include <assert.h> 372 #define AUBIO_ASSERT(x) assert(x) 373 #else 374 #define AUBIO_ASSERT(x) 375 #endif /* DEBUG */ 376 370 377 #endif /* AUBIO_PRIV_H */ -
src/io/ioutils.c
r0850e54 r40bdc14 52 52 return AUBIO_OK; 53 53 } 54 55 uint_t 56 aubio_sink_validate_input_length(const char_t *kind, const char_t *path, 57 uint_t max_size, uint_t write_data_length, uint_t write) 58 { 59 uint_t can_write = write; 60 61 if (write > max_size) { 62 AUBIO_WRN("%s: partial write to %s, trying to write %d frames," 63 " at most %d can be written at once\n", kind, path, write, max_size); 64 can_write = max_size; 65 } 66 67 if (can_write > write_data_length) { 68 AUBIO_WRN("%s: partial write to %s, trying to write %d frames," 69 " but found input of length %d\n", kind, path, write, 70 write_data_length); 71 can_write = write_data_length; 72 } 73 74 return can_write; 75 } 76 77 uint_t 78 aubio_sink_validate_input_channels(const char_t *kind, const char_t *path, 79 uint_t sink_channels, uint_t write_data_height) 80 { 81 uint_t channels = sink_channels; 82 if (write_data_height < sink_channels) { 83 AUBIO_WRN("%s: partial write to %s, trying to write %d channels," 84 " but found input of height %d\n", kind, path, sink_channels, 85 write_data_height); 86 channels = write_data_height; 87 } 88 return channels; 89 } -
src/io/ioutils.h
r0850e54 r40bdc14 54 54 uint_t channels); 55 55 56 /** validate length of input 57 58 \param kind the object kind to report on 59 \param path the path to report on 60 \param max_size maximum number of frames that can be written 61 \param write_data_length actual length of input vector/matrix 62 \param write number of samples asked 63 64 \return write or the maximum number of frames that can be written 65 */ 66 uint_t 67 aubio_sink_validate_input_length(const char_t *kind, const char_t *path, 68 uint_t max_size, uint_t write_data_length, uint_t write); 69 70 /** validate height of input 71 72 \param kind the object kind to report on 73 \param path the path to report on 74 \param max_size maximum number of channels that can be written 75 \param write_data_height actual height of input matrix 76 77 \return write_data_height or the maximum number of channels 78 */ 79 uint_t 80 aubio_sink_validate_input_channels(const char_t *kind, const char_t *path, 81 uint_t sink_channels, uint_t write_data_height); 82 56 83 #ifdef __cplusplus 57 84 } -
src/io/sink.c
r0850e54 r40bdc14 103 103 AUBIO_ERROR("sink: failed creating '%s' at %dHz (no sink built-in)\n", uri, samplerate); 104 104 #endif 105 AUBIO_FREE(s);105 del_aubio_sink(s); 106 106 return NULL; 107 107 } … … 136 136 137 137 void del_aubio_sink(aubio_sink_t * s) { 138 if (!s) return; 139 s->s_del((void *)s->sink); 138 AUBIO_ASSERT(s); 139 if (s->s_del && s->sink) 140 s->s_del((void *)s->sink); 140 141 AUBIO_FREE(s); 141 return;142 142 } -
src/io/sink_apple_audio.c
r0850e54 r40bdc14 62 62 s->async = false; 63 63 64 if ( (uri == NULL) || (str len(uri) < 1) ) {64 if ( (uri == NULL) || (strnlen(uri, PATH_MAX) < 1) ) { 65 65 AUBIO_ERROR("sink_apple_audio: Aborted opening null path\n"); 66 66 goto beach; 67 67 } 68 if (s->path != NULL) AUBIO_FREE(s->path); 68 69 69 s->path = AUBIO_ARRAY(char_t, strnlen(uri, PATH_MAX) + 1); 70 70 strncpy(s->path, uri, strnlen(uri, PATH_MAX) + 1); … … 92 92 return s; 93 93 beach: 94 AUBIO_FREE(s);94 del_aubio_sink_apple_audio(s); 95 95 return NULL; 96 96 } … … 103 103 s->samplerate = samplerate; 104 104 // automatically open when both samplerate and channels have been set 105 if ( s->samplerate != 0 &&s->channels != 0) {105 if (/* s->samplerate != 0 && */ s->channels != 0) { 106 106 return aubio_sink_apple_audio_open(s); 107 107 } … … 116 116 s->channels = channels; 117 117 // automatically open when both samplerate and channels have been set 118 if (s->samplerate != 0 && s->channels != 0) {118 if (s->samplerate != 0 /* && s->channels != 0 */) { 119 119 return aubio_sink_apple_audio_open(s); 120 120 } … … 176 176 UInt32 c, v; 177 177 short *data = (short*)s->bufferList.mBuffers[0].mData; 178 if (write > s->max_frames) { 179 AUBIO_WRN("sink_apple_audio: trying to write %d frames, max %d\n", write, s->max_frames); 180 write = s->max_frames; 181 } 182 smpl_t *buf = write_data->data; 183 184 if (buf) { 185 for (c = 0; c < s->channels; c++) { 186 for (v = 0; v < write; v++) { 187 data[v * s->channels + c] = 188 FLOAT_TO_SHORT(buf[ v * s->channels + c]); 189 } 190 } 191 } 192 aubio_sink_apple_audio_write(s, write); 178 uint_t length = aubio_sink_validate_input_length("sink_apple_audio", s->path, 179 s->max_frames, write_data->length, write); 180 181 for (c = 0; c < s->channels; c++) { 182 for (v = 0; v < length; v++) { 183 data[v * s->channels + c] = FLOAT_TO_SHORT(write_data->data[v]); 184 } 185 } 186 187 aubio_sink_apple_audio_write(s, length); 193 188 } 194 189 … … 196 191 UInt32 c, v; 197 192 short *data = (short*)s->bufferList.mBuffers[0].mData; 198 if (write > s->max_frames) { 199 AUBIO_WRN("sink_apple_audio: trying to write %d frames, max %d\n", write, s->max_frames); 200 write = s->max_frames; 201 } 202 smpl_t **buf = write_data->data; 203 204 if (buf) { 205 for (c = 0; c < s->channels; c++) { 206 for (v = 0; v < write; v++) { 207 data[v * s->channels + c] = 208 FLOAT_TO_SHORT(buf[c][v]); 209 } 210 } 211 } 212 aubio_sink_apple_audio_write(s, write); 193 uint_t channels = aubio_sink_validate_input_channels("sink_apple_audio", 194 s->path, s->channels, write_data->height); 195 uint_t length = aubio_sink_validate_input_length("sink_apple_audio", s->path, 196 s->max_frames, write_data->length, write); 197 198 for (c = 0; c < channels; c++) { 199 for (v = 0; v < length; v++) { 200 data[v * s->channels + c] = FLOAT_TO_SHORT(write_data->data[c][v]); 201 } 202 } 203 204 aubio_sink_apple_audio_write(s, length); 213 205 } 214 206 … … 258 250 259 251 void del_aubio_sink_apple_audio(aubio_sink_apple_audio_t * s) { 260 if (s->audioFile) aubio_sink_apple_audio_close (s); 261 if (s->path) AUBIO_FREE(s->path); 252 AUBIO_ASSERT(s); 253 if (s->audioFile) 254 aubio_sink_apple_audio_close (s); 255 if (s->path) 256 AUBIO_FREE(s->path); 262 257 freeAudioBufferList(&s->bufferList); 263 258 AUBIO_FREE(s); 264 return;265 259 } 266 260 -
src/io/sink_sndfile.c
r0850e54 r40bdc14 59 59 if (path == NULL) { 60 60 AUBIO_ERR("sink_sndfile: Aborted opening null path\n"); 61 return NULL; 62 } 63 64 if (s->path) AUBIO_FREE(s->path); 61 goto beach; 62 } 63 65 64 s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1); 66 65 strncpy(s->path, path, strnlen(path, PATH_MAX) + 1); … … 98 97 s->samplerate = samplerate; 99 98 // automatically open when both samplerate and channels have been set 100 if ( s->samplerate != 0 &&s->channels != 0) {99 if (/* s->samplerate != 0 && */ s->channels != 0) { 101 100 return aubio_sink_sndfile_open(s); 102 101 } … … 111 110 s->channels = channels; 112 111 // automatically open when both samplerate and channels have been set 113 if (s->samplerate != 0 && s->channels != 0) {112 if (s->samplerate != 0 /* && s->channels != 0 */) { 114 113 return aubio_sink_sndfile_open(s); 115 114 } … … 148 147 /* allocate data for de/interleaving reallocated when needed. */ 149 148 if (s->scratch_size >= MAX_SIZE * AUBIO_MAX_CHANNELS) { 150 abort(); 151 AUBIO_ERR("sink_sndfile: %d x %d exceeds maximum aubio_sink_sndfile buffer size %d\n", 149 AUBIO_ERR("sink_sndfile: %d x %d exceeds maximum buffer size %d\n", 152 150 s->max_size, s->channels, MAX_SIZE * AUBIO_MAX_CHANNELS); 153 151 return AUBIO_FAIL; … … 159 157 160 158 void aubio_sink_sndfile_do(aubio_sink_sndfile_t *s, fvec_t * write_data, uint_t write){ 161 uint_t i, j, channels = s->channels; 162 int nsamples = 0; 163 smpl_t *pwrite; 159 uint_t i, j; 164 160 sf_count_t written_frames; 165 166 if (write > s->max_size) { 167 AUBIO_WRN("sink_sndfile: trying to write %d frames, but only %d can be written at a time\n", 168 write, s->max_size); 169 write = s->max_size; 170 } 171 172 nsamples = channels * write; 161 uint_t channels = s->channels; 162 uint_t length = aubio_sink_validate_input_length("sink_sndfile", s->path, 163 s->max_size, write_data->length, write); 164 int nsamples = channels * length; 173 165 174 166 /* interleaving data */ 175 167 for ( i = 0; i < channels; i++) { 176 pwrite = (smpl_t *)write_data->data; 177 for (j = 0; j < write; j++) { 178 s->scratch_data[channels*j+i] = pwrite[j]; 168 for (j = 0; j < length; j++) { 169 s->scratch_data[channels*j+i] = write_data->data[j]; 179 170 } 180 171 } … … 189 180 190 181 void aubio_sink_sndfile_do_multi(aubio_sink_sndfile_t *s, fmat_t * write_data, uint_t write){ 191 uint_t i, j, channels = s->channels; 192 int nsamples = 0; 193 smpl_t *pwrite; 182 uint_t i, j; 194 183 sf_count_t written_frames; 195 196 if (write > s->max_size) { 197 AUBIO_WRN("sink_sndfile: trying to write %d frames, but only %d can be written at a time\n", 198 write, s->max_size); 199 write = s->max_size; 200 } 201 202 nsamples = channels * write; 184 uint_t channels = aubio_sink_validate_input_channels("sink_sndfile", s->path, 185 s->channels, write_data->height); 186 uint_t length = aubio_sink_validate_input_length("sink_sndfile", s->path, 187 s->max_size, write_data->length, write); 188 int nsamples = channels * length; 203 189 204 190 /* interleaving data */ 205 for ( i = 0; i < write_data->height; i++) { 206 pwrite = (smpl_t *)write_data->data[i]; 207 for (j = 0; j < write; j++) { 208 s->scratch_data[channels*j+i] = pwrite[j]; 191 for ( i = 0; i < channels; i++) { 192 for (j = 0; j < length; j++) { 193 s->scratch_data[channels*j+i] = write_data->data[i][j]; 209 194 } 210 195 } … … 231 216 232 217 void del_aubio_sink_sndfile(aubio_sink_sndfile_t * s){ 233 if (!s) return; 234 if (s->path) AUBIO_FREE(s->path); 235 aubio_sink_sndfile_close(s); 236 AUBIO_FREE(s->scratch_data); 218 AUBIO_ASSERT(s); 219 if (s->handle) 220 aubio_sink_sndfile_close(s); 221 if (s->path) 222 AUBIO_FREE(s->path); 223 if (s->scratch_data) 224 AUBIO_FREE(s->scratch_data); 237 225 AUBIO_FREE(s); 238 226 } -
src/io/sink_wavwrite.c
r0850e54 r40bdc14 88 88 goto beach; 89 89 } 90 if ((sint_t)samplerate < 0) { 91 AUBIO_ERR("sink_wavwrite: Can not create %s with samplerate %d\n", path, samplerate); 92 goto beach; 93 } 94 95 if (s->path) AUBIO_FREE(s->path); 90 96 91 s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1); 97 92 strncpy(s->path, path, strnlen(path, PATH_MAX) + 1); … … 136 131 s->samplerate = samplerate; 137 132 // automatically open when both samplerate and channels have been set 138 if ( s->samplerate != 0 &&s->channels != 0) {133 if (/* s->samplerate != 0 && */ s->channels != 0) { 139 134 return aubio_sink_wavwrite_open(s); 140 135 } … … 149 144 s->channels = channels; 150 145 // automatically open when both samplerate and channels have been set 151 if (s->samplerate != 0 && s->channels != 0) {146 if (s->samplerate != 0 /* && s->channels != 0 */) { 152 147 return aubio_sink_wavwrite_open(s); 153 148 } … … 234 229 235 230 void aubio_sink_wavwrite_do(aubio_sink_wavwrite_t *s, fvec_t * write_data, uint_t write){ 236 uint_t i = 0, written_frames = 0; 237 238 if (write > s->max_size) { 239 AUBIO_WRN("sink_wavwrite: trying to write %d frames to %s, " 240 "but only %d can be written at a time\n", write, s->path, s->max_size); 241 write = s->max_size; 242 } 243 244 for (i = 0; i < write; i++) { 245 s->scratch_data[i] = HTOLES(FLOAT_TO_SHORT(write_data->data[i])); 246 } 247 written_frames = fwrite(s->scratch_data, 2, write, s->fid); 231 uint_t c = 0, i = 0, written_frames = 0; 232 uint_t length = aubio_sink_validate_input_length("sink_wavwrite", s->path, 233 s->max_size, write_data->length, write); 234 235 for (c = 0; c < s->channels; c++) { 236 for (i = 0; i < length; i++) { 237 s->scratch_data[i * s->channels + c] = HTOLES(FLOAT_TO_SHORT(write_data->data[i])); 238 } 239 } 240 written_frames = fwrite(s->scratch_data, 2, length * s->channels, s->fid); 248 241 249 242 if (written_frames != write) { … … 258 251 uint_t c = 0, i = 0, written_frames = 0; 259 252 260 if (write > s->max_size) { 261 AUBIO_WRN("sink_wavwrite: trying to write %d frames to %s, " 262 "but only %d can be written at a time\n", write, s->path, s->max_size); 263 write = s->max_size; 264 } 265 266 for (c = 0; c < s->channels; c++) { 267 for (i = 0; i < write; i++) { 253 uint_t channels = aubio_sink_validate_input_channels("sink_wavwrite", s->path, 254 s->channels, write_data->height); 255 uint_t length = aubio_sink_validate_input_length("sink_wavwrite", s->path, 256 s->max_size, write_data->length, write); 257 258 for (c = 0; c < channels; c++) { 259 for (i = 0; i < length; i++) { 268 260 s->scratch_data[i * s->channels + c] = HTOLES(FLOAT_TO_SHORT(write_data->data[c][i])); 269 261 } 270 262 } 271 written_frames = fwrite(s->scratch_data, 2, write* s->channels, s->fid);263 written_frames = fwrite(s->scratch_data, 2, length * s->channels, s->fid); 272 264 273 265 if (written_frames != write * s->channels) { … … 298 290 299 291 void del_aubio_sink_wavwrite(aubio_sink_wavwrite_t * s){ 300 if (!s) return; 301 aubio_sink_wavwrite_close(s); 302 if (s->path) AUBIO_FREE(s->path); 303 AUBIO_FREE(s->scratch_data); 292 AUBIO_ASSERT(s); 293 if (s->fid) 294 aubio_sink_wavwrite_close(s); 295 if (s->path) 296 AUBIO_FREE(s->path); 297 if (s->scratch_data) 298 AUBIO_FREE(s->scratch_data); 304 299 AUBIO_FREE(s); 305 300 } -
src/io/source.c
r0850e54 r40bdc14 122 122 " (no source built-in)\n", uri, samplerate, hop_size); 123 123 #endif 124 AUBIO_FREE(s);124 del_aubio_source(s); 125 125 return NULL; 126 126 } … … 139 139 140 140 void del_aubio_source(aubio_source_t * s) { 141 if (!s) return; 142 s->s_del((void *)s->source); 141 AUBIO_ASSERT(s); 142 if (s->s_del && s->source) 143 s->s_del((void *)s->source); 143 144 AUBIO_FREE(s); 144 145 } -
src/io/source.h
r0850e54 r40bdc14 60 60 61 61 \example io/test-source.c 62 \example io/test-source_multi.c63 62 64 63 */ -
src/io/source_apple_audio.c
r0850e54 r40bdc14 60 60 aubio_source_apple_audio_t * s = AUBIO_NEW(aubio_source_apple_audio_t); 61 61 62 if (path == NULL ) {62 if (path == NULL || strnlen(path, PATH_MAX) < 1) { 63 63 AUBIO_ERROR("source_apple_audio: Aborted opening null path\n"); 64 64 goto beach; … … 86 86 87 87 beach: 88 AUBIO_FREE(s);88 del_aubio_source_apple_audio(s); 89 89 return NULL; 90 90 } … … 95 95 UInt32 propSize; 96 96 97 if (s->path) AUBIO_FREE(s->path);98 97 s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1); 99 98 strncpy(s->path, path, strnlen(path, PATH_MAX) + 1); … … 294 293 295 294 void del_aubio_source_apple_audio(aubio_source_apple_audio_t * s){ 295 AUBIO_ASSERT(s); 296 296 aubio_source_apple_audio_close (s); 297 297 if (s->path) AUBIO_FREE(s->path); 298 298 freeAudioBufferList(&s->bufferList); 299 299 AUBIO_FREE(s); 300 return;301 300 } 302 301 -
src/io/source_avcodec.c
r0850e54 r40bdc14 45 45 #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57,0,0) 46 46 #define HAVE_AUBIO_LIBAVCODEC_DEPRECATED 1 47 #endif 48 49 #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,3,102) 50 #define HAVE_AUBIO_LIBAVCODEC_TIMEBASE_FIX 1 47 51 #endif 48 52 … … 144 148 s->channels = 1; 145 149 146 if (s->path) AUBIO_FREE(s->path);147 150 s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1); 148 151 strncpy(s->path, path, strnlen(path, PATH_MAX) + 1); … … 240 243 goto beach; 241 244 } 245 #if HAVE_AUBIO_LIBAVCODEC_TIMEBASE_FIX 246 // avoids 'skipped frames warning' with avecodec < 58, deprecated after 247 av_codec_set_pkt_timebase(avCodecCtx, 248 avFormatCtx->streams[selected_stream]->time_base); 249 #endif 242 250 #endif 243 251 … … 631 639 632 640 void del_aubio_source_avcodec(aubio_source_avcodec_t * s){ 633 if (!s) return;641 AUBIO_ASSERT(s); 634 642 aubio_source_avcodec_close(s); 635 643 if (s->output != NULL) { -
src/io/source_sndfile.c
r0850e54 r40bdc14 87 87 s->channels = 1; 88 88 89 if (s->path) AUBIO_FREE(s->path);90 89 s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1); 91 90 strncpy(s->path, path, strnlen(path, PATH_MAX) + 1); … … 332 331 333 332 void del_aubio_source_sndfile(aubio_source_sndfile_t * s){ 334 if (!s) return;333 AUBIO_ASSERT(s); 335 334 aubio_source_sndfile_close(s); 336 335 #ifdef HAVE_SAMPLERATE -
src/io/source_wavread.c
r0850e54 r40bdc14 92 92 } 93 93 94 if (s->path) AUBIO_FREE(s->path);95 94 s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1); 96 95 strncpy(s->path, path, strnlen(path, PATH_MAX) + 1); … … 472 471 473 472 void del_aubio_source_wavread(aubio_source_wavread_t * s) { 474 if (!s) return;473 AUBIO_ASSERT(s); 475 474 aubio_source_wavread_close(s); 476 475 if (s->short_output) AUBIO_FREE(s->short_output);
Note: See TracChangeset
for help on using the changeset viewer.