fix channel count in embedded file formats

This commit is contained in:
Anthony Minessale 2014-08-06 00:25:04 +05:00
parent 9245eec00f
commit 52ed525b97
2 changed files with 3 additions and 3 deletions

View File

@ -4555,7 +4555,7 @@ static switch_status_t next_file(switch_file_handle_t *handle)
handle->samples = context->fh.samples; handle->samples = context->fh.samples;
handle->cur_samplerate = context->fh.samplerate; handle->cur_samplerate = context->fh.samplerate;
handle->cur_channels = context->fh.channels; handle->cur_channels = context->fh.real_channels;
handle->format = context->fh.format; handle->format = context->fh.format;
handle->sections = context->fh.sections; handle->sections = context->fh.sections;
handle->seekable = context->fh.seekable; handle->seekable = context->fh.seekable;
@ -4747,7 +4747,7 @@ static switch_status_t file_url_file_open(switch_file_handle_t *handle, const ch
if (status == SWITCH_STATUS_SUCCESS) { if (status == SWITCH_STATUS_SUCCESS) {
handle->samples = fh->samples; handle->samples = fh->samples;
handle->cur_samplerate = fh->samplerate; handle->cur_samplerate = fh->samplerate;
handle->cur_channels = fh->channels; handle->cur_channels = fh->real_channels;
handle->format = fh->format; handle->format = fh->format;
handle->sections = fh->sections; handle->sections = fh->sections;
handle->seekable = fh->seekable; handle->seekable = fh->seekable;

View File

@ -2893,7 +2893,7 @@ static switch_status_t file_open(switch_file_handle_t *handle, const char *path,
handle->seekable = context->fh.seekable; handle->seekable = context->fh.seekable;
handle->speed = context->fh.speed; handle->speed = context->fh.speed;
handle->interval = context->fh.interval; handle->interval = context->fh.interval;
handle->channels = context->fh.channels; handle->channels = context->fh.real_channels;
handle->flags |= SWITCH_FILE_NOMUX; handle->flags |= SWITCH_FILE_NOMUX;
if (switch_test_flag((&context->fh), SWITCH_FILE_NATIVE)) { if (switch_test_flag((&context->fh), SWITCH_FILE_NATIVE)) {