comparison libao2/ao_nas.c @ 27449:5723b671a0f6

Handle AOPLAY_FINAL_CHUNK

27448:5137a84907a1

#include "audio_out.h"
#include "audio_out_internal.h"
#include "libaf/af_format.h"

#define NAS_FRAG_SIZE 4096

static char *nas_event_types[] = {
	"Undefined",
	"Undefined",

// plays 'len' bytes of 'data'
// it should round it down to outburst*n
// return: number of bytes played
static int play(void* data,int len,int flags)
{
	int maxbursts, playbursts, writelen;
	AuStatus as;

	mp_msg(MSGT_AO, MSGL_DBG3,
	       "ao_nas: play(%p, %d, %d)\n",
	       data, len, flags);

	if (len == 0)
		return 0;

	if (len < ao_data.outburst) {
		unsigned tempbufsz = ao_data.outburst;
		void *tempbuf = malloc(tempbufsz);

		memset(tempbuf, 0, tempbufsz);
		memcpy(tempbuf, data, len);

		play(tempbuf, ao_data.outburst, flags);

		if (nas_data->state != AuStateStart) {
			mp_msg(MSGT_AO, MSGL_DBG2, "ao_nas: play(): Starting flow.\n");
			nas_data->expect_underrun = 1;
			nas_data->state = AuStateStart;
			AuStartFlow(nas_data->aud, nas_data->flow, &as);
			if (as != AuSuccess)
				nas_print_error(nas_data->aud, "play(): AuStartFlow", as);
		}

		free(tempbuf);

		return len;
	}

	pthread_mutex_lock(&nas_data->buffer_mutex);
	maxbursts = (nas_data->client_buffer_size -
		     nas_data->client_buffer_used) / ao_data.outburst;
	playbursts = len / ao_data.outburst;
	writelen = (playbursts > maxbursts ? maxbursts : playbursts) *
		   ao_data.outburst;
	pthread_mutex_unlock(&nas_data->buffer_mutex);

	writelen = nas_writeBuffer(nas_data, data, writelen);

	if (nas_data->state != AuStateStart &&
	    maxbursts == playbursts) {
		mp_msg(MSGT_AO, MSGL_DBG2, "ao_nas: play(): Starting flow.\n");
		nas_data->expect_underrun = 1;
		AuStartFlow(nas_data->aud, nas_data->flow, &as);
		if (as != AuSuccess)
			nas_print_error(nas_data->aud, "play(): AuStartFlow", as);
	}

	return writelen;
}

// return: delay in seconds between first and last sample in buffer
static float get_delay(void)
{

27449:5723b671a0f6

#include "audio_out.h"
#include "audio_out_internal.h"
#include "libaf/af_format.h"

/* NAS_FRAG_SIZE must be a power-of-two value */
#define NAS_FRAG_SIZE 4096

static char *nas_event_types[] = {
	"Undefined",
	"Undefined",

// plays 'len' bytes of 'data'
// it should round it down to outburst*n
// return: number of bytes played
static int play(void* data,int len,int flags)
{
	int written, maxbursts = 0, playbursts = 0;
	AuStatus as;

	mp_msg(MSGT_AO, MSGL_DBG3,
	       "ao_nas: play(%p, %d, %d)\n",
	       data, len, flags);

	if (len == 0)
		return 0;

	if (!(flags & AOPLAY_FINAL_CHUNK)) {
		pthread_mutex_lock(&nas_data->buffer_mutex);
		maxbursts = (nas_data->client_buffer_size -
			     nas_data->client_buffer_used) / ao_data.outburst;
		playbursts = len / ao_data.outburst;
		len = (playbursts > maxbursts ? maxbursts : playbursts) *
			   ao_data.outburst;
		pthread_mutex_unlock(&nas_data->buffer_mutex);
	}

	/*
	 * If AOPLAY_FINAL_CHUNK is set, we did not actually check len fits
	 * into the available buffer space, but mplayer.c shouldn't give us
	 * more to play than we report to it by get_space(), so this should be
	 * fine.
	 */
	written = nas_writeBuffer(nas_data, data, len);

	if (nas_data->state != AuStateStart &&
	    (maxbursts == playbursts ||
	     flags & AOPLAY_FINAL_CHUNK)) {
		mp_msg(MSGT_AO, MSGL_DBG2, "ao_nas: play(): Starting flow.\n");
		nas_data->expect_underrun = 1;
		AuStartFlow(nas_data->aud, nas_data->flow, &as);
		if (as != AuSuccess)
			nas_print_error(nas_data->aud, "play(): AuStartFlow", as);
	}

	return written;
}

// return: delay in seconds between first and last sample in buffer
static float get_delay(void)
{