player_thread: initialize chunk->times in silence generator

When waiting for the decoder to provide more data, the player thread generates silence chunks if needed. However, it forgot to initialize the chunk.times attribute, which had now an undefined value. This patch sets it to -1.0, meaning "value is undefined". Add a ">= 0.0" check to audio_output_all_check(). This fixes spurious relative seeking errors, because sometimes, the "elapsed" value falls back to 0.0.

player_thread: initialize chunk->times in silence generator
76283c25 · Max Kellermann · b9866e43 · 76283c25 · 76283c25
Commit 76283c25 authored Nov 12, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

output_all.c src/output_all.c +4 -1

player_thread.c src/player_thread.c +1 -0

No files found.
--- a/src/output_all.c
+++ b/src/output_all.c
@@ -441,7 +441,10 @@ audio_output_all_check(void)
 			   this chunk */
 			return music_pipe_size(g_mp);
-		audio_output_all_elapsed_time = chunk->times;
+		if (chunk->length > 0 && chunk->times >= 0.0)
+			/* only update elapsed_time if the chunk
+			   provides a defined value */
+			audio_output_all_elapsed_time = chunk->times;
 		is_tail = chunk->next == NULL;
 		if (is_tail)

--- a/src/player_thread.c
+++ b/src/player_thread.c
@@ -333,6 +333,7 @@ player_send_silence(struct player *player)
 	chunk->audio_format = player->play_audio_format;
 #endif
+	chunk->times = -1.0; /* undefined time stamp */
 	chunk->length = num_frames * frame_size;
 	memset(chunk->data, 0, chunk->length);