fprintf(stderr, "%s: Rewind failed, not looping.\n", pathname.c_str());
return true;
}
+ if (video_codec_ctx != nullptr) {
+ avcodec_flush_buffers(video_codec_ctx.get());
+ }
+ if (audio_codec_ctx != nullptr) {
+ avcodec_flush_buffers(audio_codec_ctx.get());
+ }
// If the file has changed since last time, return to get it reloaded.
// Note that depending on how you move the file into place, you might
// end up corrupting the one you're already playing, so this path
}
audio_format->num_channels = 2;
+ int64_t channel_layout = audio_avframe->channel_layout;
+ if (channel_layout == 0) {
+ channel_layout = av_get_default_channel_layout(audio_avframe->channels);
+ }
+
if (resampler == nullptr ||
audio_avframe->format != last_src_format ||
dst_format != last_dst_format ||
- av_frame_get_channel_layout(audio_avframe) != last_channel_layout ||
+ channel_layout != last_channel_layout ||
av_frame_get_sample_rate(audio_avframe) != last_sample_rate) {
avresample_free(&resampler);
resampler = avresample_alloc_context();
exit(1);
}
- av_opt_set_int(resampler, "in_channel_layout", av_frame_get_channel_layout(audio_avframe), 0);
+ av_opt_set_int(resampler, "in_channel_layout", channel_layout, 0);
av_opt_set_int(resampler, "out_channel_layout", AV_CH_LAYOUT_STEREO, 0);
av_opt_set_int(resampler, "in_sample_rate", av_frame_get_sample_rate(audio_avframe), 0);
av_opt_set_int(resampler, "out_sample_rate", OUTPUT_FREQUENCY, 0);
last_src_format = AVSampleFormat(audio_avframe->format);
last_dst_format = dst_format;
- last_channel_layout = av_frame_get_channel_layout(audio_avframe);
+ last_channel_layout = channel_layout;
last_sample_rate = av_frame_get_sample_rate(audio_avframe);
}
uint8_t *data = audio_frame->data + audio_frame->len;
int out_samples = avresample_convert(resampler, &data, 0, num_samples_room,
- audio_avframe->data, audio_avframe->linesize[0], audio_avframe->nb_samples);
+ const_cast<uint8_t **>(audio_avframe->data), audio_avframe->linesize[0], audio_avframe->nb_samples);
if (out_samples < 0) {
fprintf(stderr, "Audio conversion failed.\n");
exit(1);