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

FS-9705 #resolve [Files using prebuffer do not play properly when seeking back to the beginning once the file is done playing]

This commit is contained in:
Anthony Minessale 2016-11-07 12:16:01 -06:00
parent 8a80741507
commit 9e103b2b1c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/switch_core_file.c
View File

@ -392,7 +392,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh,
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
if (fh->buffer && switch_buffer_inuse(fh->buffer) >= *len * 2 * fh->channels) { if (*len && fh->buffer && switch_buffer_inuse(fh->buffer) >= *len * 2 * fh->channels) {
*len = switch_buffer_read(fh->buffer, data, orig_len * 2 * fh->channels) / 2 / fh->channels; *len = switch_buffer_read(fh->buffer, data, orig_len * 2 * fh->channels) / 2 / fh->channels;
return *len == 0 ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS; return *len == 0 ? SWITCH_STATUS_FALSE : SWITCH_STATUS_SUCCESS;
} }
@ -407,7 +407,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_file_read(switch_file_handle_t *fh,
more: more:
if (fh->pre_buffer) { if (fh->pre_buffer && switch_buffer_inuse(fh->pre_buffer)) {
switch_size_t rlen; switch_size_t rlen;
int asis = switch_test_flag(fh, SWITCH_FILE_NATIVE); int asis = switch_test_flag(fh, SWITCH_FILE_NATIVE);