Attachment #345272 for bug #464676

View | Details | Raw Unified | Return to bug 464676
Collapse All | Expand All




        continue_decoding = false;
        break;
      }
      int frame_channels = av_get_channel_layout_nb_channels(av_frame->channel_layout);

      if (av_frame->sample_rate != sample_rate_ ||
          frame_channels != channels_ ||
          av_frame->format != av_sample_format_) {
        DLOG(ERROR) << "Unsupported midstream configuration change!"
                    << " Sample Rate: " << av_frame->sample_rate << " vs "
                    << sample_rate_
                    << ", Channels: " << frame_channels << " vs "
                    << channels_
                    << ", Sample Format: " << av_frame->format << " vs "
                    << av_sample_format_;

Return to bug 464676

Lines 178-191 int AudioFileReader::Read(AudioBus* audio_bus) { Link Here

(-)a/media/filters/audio_file_reader.cc (-2 / +3 lines)
178	continue_decoding = false;	178	continue_decoding = false;
179	break;	179	break;
180	}	180	}
		181	int frame_channels = av_get_channel_layout_nb_channels(av_frame->channel_layout);
181		182
182	if (av_frame->sample_rate != sample_rate_ \|\|	183	if (av_frame->sample_rate != sample_rate_ \|\|
183	av_frame->channels != channels_ \|\|	184	frame_channels != channels_ \|\|
184	av_frame->format != av_sample_format_) {	185	av_frame->format != av_sample_format_) {
185	DLOG(ERROR) << "Unsupported midstream configuration change!"	186	DLOG(ERROR) << "Unsupported midstream configuration change!"
186	<< " Sample Rate: " << av_frame->sample_rate << " vs "	187	<< " Sample Rate: " << av_frame->sample_rate << " vs "
187	<< sample_rate_	188	<< sample_rate_
188	<< ", Channels: " << av_frame->channels << " vs "	189	<< ", Channels: " << frame_channels << " vs "
189	<< channels_	190	<< channels_
190	<< ", Sample Format: " << av_frame->format << " vs "	191	<< ", Sample Format: " << av_frame->format << " vs "
191	<< av_sample_format_;	192	<< av_sample_format_;