comparison mplayer.c @ 24892:80180dc13565

Change decode_audio() interface Rewrite decode_audio to better deal with filters that handle input in large blocks. It now always places output in sh_audio->a_out_buffer (which was always given as a parameter before) and reallocates the buffer if needed. After the changes filters can return arbitrarily large blocks of data without some of it being lost. The new version also allows simplifying some code.

24891:fefb019faa90

	bytes_to_write -= playsize;

	// Fill buffer if needed:
	current_module="decode_audio";
	t = GetTimer();
	while (sh_audio->a_out_buffer_len < playsize) {
	    int buflen = sh_audio->a_out_buffer_len;
	    int ret = decode_audio(sh_audio, &sh_audio->a_out_buffer[buflen],
				   playsize - buflen, // min bytes
				   sh_audio->a_out_buffer_size - buflen // max
				   );
	    if (ret <= 0) { // EOF?
		if (mpctx->d_audio->eof) {
		    audio_eof = 1;
		    if (sh_audio->a_out_buffer_len == 0)
			return 0;
		}
		break;
	    }
	    sh_audio->a_out_buffer_len += ret;
	}
	t = GetTimer() - t;
	tt = t*0.000001f; audio_time_usage+=tt;
	if (playsize > sh_audio->a_out_buffer_len) {
	    playsize = sh_audio->a_out_buffer_len;
	    if (audio_eof)

24892:80180dc13565

	bytes_to_write -= playsize;

	// Fill buffer if needed:
	current_module="decode_audio";
	t = GetTimer();
	if (decode_audio(sh_audio, playsize) < 0) // EOF or error
	    if (mpctx->d_audio->eof) {
		audio_eof = 1;
		if (sh_audio->a_out_buffer_len == 0)
		    return 0;
	    }
	t = GetTimer() - t;
	tt = t*0.000001f; audio_time_usage+=tt;
	if (playsize > sh_audio->a_out_buffer_len) {
	    playsize = sh_audio->a_out_buffer_len;
	    if (audio_eof)