commit 0d44b5b2acbdc2579509da9ff4d63afb837943fc
author Ricardo Cerqueira <cyanogenmod@cerqueira.org> Sun Nov 03 02:46:27 2013 +0000
committer Ricardo Cerqueira <cyanogenmod@cerqueira.org> Sun Nov 03 02:46:27 2013 +0000
tree e352596e95e8c98bf3f42631ed3afdbb0326229d
parent 89ad23a2d0ebc317e62ffb87e048469b1df3d69e

Add support for ICS audio blobs

Enable with the ICS_AUDIO_BLOB CFLAG

Change-Id: Ie174d5997202b8931c1f11db62b6ec2e377f096a

Conflicts:
	services/audioflinger/AudioFlinger.cpp

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 9c8fd1f..2135e79 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -2705,11 +2705,13 @@
     int64_t pts;
     status_t status = INVALID_OPERATION;
 
+#ifndef ICS_AUDIO_BLOB
     if (mNormalSink != 0) {
         status = mNormalSink->getNextWriteTimestamp(&pts);
     } else {
         status = mOutputSink->getNextWriteTimestamp(&pts);
     }
+#endif
 
     if (status != NO_ERROR) {
         pts = AudioBufferProvider::kInvalidPTS;