kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #216 from rucc/short_play_fix 

[core] fix: don't terminate file before max_samples returned
This commit is contained in:
Andrey Volk 2020-02-12 23:08:15 +04:00 committed by GitHub
parent fd4f181519 e90db0d768
commit d3752173bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/switch_core_file.c
View File

@ -496,7 +496,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh,
if (status != SWITCH_STATUS_SUCCESS || !rlen) { if (status != SWITCH_STATUS_SUCCESS || !rlen) {
switch_set_flag_locked(fh, SWITCH_FILE_BUFFER_DONE); switch_set_flag_locked(fh, SWITCH_FILE_BUFFER_DONE);
} else { } else {
fh->samples_in += rlen;
if (fh->real_channels != fh->channels && !switch_test_flag(fh, SWITCH_FILE_NOMUX)) { if (fh->real_channels != fh->channels && !switch_test_flag(fh, SWITCH_FILE_NOMUX)) {
switch_mux_channels((int16_t *) fh->pre_buffer_data, rlen, fh->real_channels, fh->channels); switch_mux_channels((int16_t *) fh->pre_buffer_data, rlen, fh->real_channels, fh->channels);
} }
@ -506,6 +505,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh,
} }
rlen = switch_buffer_read(fh->pre_buffer, data, asis ? *len : *len * 2 * fh->channels); rlen = switch_buffer_read(fh->pre_buffer, data, asis ? *len : *len * 2 * fh->channels);
fh->samples_in += rlen;
*len = asis ? rlen : rlen / 2 / fh->channels; *len = asis ? rlen : rlen / 2 / fh->channels;
if (*len == 0) { if (*len == 0) {