Merge "Add USB out_get_presentation_position() for timestamps" into mnc-dev

This commit is contained in:
Glenn Kasten 2015-08-07 16:38:45 +00:00 committed by Android (Google) Code Review
commit 569737c6b0

View file

@ -442,8 +442,16 @@ static int out_get_render_position(const struct audio_stream_out *stream, uint32
static int out_get_presentation_position(const struct audio_stream_out *stream, static int out_get_presentation_position(const struct audio_stream_out *stream,
uint64_t *frames, struct timespec *timestamp) uint64_t *frames, struct timespec *timestamp)
{ {
/* FIXME - This needs to be implemented */ struct stream_out *out = (struct stream_out *)stream; // discard const qualifier
return -EINVAL; lock_output_stream(out);
const alsa_device_proxy *proxy = &out->proxy;
const int ret = proxy_get_presentation_position(proxy, frames, timestamp);
pthread_mutex_unlock(&out->lock);
ALOGV("out_get_presentation_position() status:%d frames:%llu",
ret, (unsigned long long)*frames);
return ret;
} }
static int out_add_audio_effect(const struct audio_stream *stream, effect_handle_t effect) static int out_add_audio_effect(const struct audio_stream *stream, effect_handle_t effect)