mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix a 16-bit audio assumption

Browse Source
This commit is contained in:
Chris Robinson 2012-12-14 02:39:46 -08:00
parent c2b711d195
commit 157cb10f56
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/openmw/mwrender/videoplayer.cpp
View File

@ -145,14 +145,8 @@ class MovieAudioDecoder : public MWSound::Sound_Decoder
if(is->av_sync_type == AV_SYNC_AUDIO_MASTER) if(is->av_sync_type == AV_SYNC_AUDIO_MASTER)
return samples_size; return samples_size;
double diff, avg_diff, ref_clock; double ref_clock = get_master_clock(is);
int wanted_size, min_size, max_size, n; double diff = get_audio_clock(is) - ref_clock;
// int nb_samples;
n = 2 * is->audio_st->codec->channels;
ref_clock = get_master_clock(is);
diff = get_audio_clock(is) - ref_clock;
if(diff < AV_NOSYNC_THRESHOLD) if(diff < AV_NOSYNC_THRESHOLD)
{ {
// accumulate the diffs // accumulate the diffs
@ -162,12 +156,14 @@ class MovieAudioDecoder : public MWSound::Sound_Decoder
is->audio_diff_avg_count++; is->audio_diff_avg_count++;
else else
{ {
avg_diff = is->audio_diff_cum * (1.0 - is->audio_diff_avg_coef); double avg_diff = is->audio_diff_cum * (1.0 - is->audio_diff_avg_coef);
if(fabs(avg_diff) >= is->audio_diff_threshold) if(fabs(avg_diff) >= is->audio_diff_threshold)
{ {
wanted_size = samples_size + ((int)(diff * is->audio_st->codec->sample_rate) * n); int n = av_samples_get_buffer_size(NULL, is->audio_st->codec->channels, 1,
min_size = samples_size/n * (100-SAMPLE_CORRECTION_PERCENT_MAX) / 100 * n; is->audio_st->codec->sample_fmt, 1);
max_size = samples_size/n * (100+SAMPLE_CORRECTION_PERCENT_MAX) / 100 * n; int wanted_size = samples_size + ((int)(diff * is->audio_st->codec->sample_rate) * n);
int min_size = samples_size/n * (100-SAMPLE_CORRECTION_PERCENT_MAX) / 100 * n;
int max_size = samples_size/n * (100+SAMPLE_CORRECTION_PERCENT_MAX) / 100 * n;
if(wanted_size < min_size) if(wanted_size < min_size)
wanted_size = min_size; wanted_size = min_size;