Merge "Bug 5365486 GetVideoDecoderCapabilities"
merge in ics-release history after reset to master
Merge "Decode to buffer queue test updates"
Merge "Return after prefetch error in get position test"
Merge "Check result of GetFillLevel and GetPrefetchStatus"
AAC decoder test

Record and display statistics on AAC frame sizes.
Record and display the number of buffer queue completions.
Make it optional whether to create a .raw file with PCM data.
Enable and display play events: HEADATMARKER and HEADATNEWPOS.
Add option to pause in middle of decoding.

Change-Id: Iaaa37337260cd061a13f942f6b5c07d7611b13a7
Use prefetch for error handling in mutesolo test

Change-Id: I526da804bd7f47b124d0aff3a47b1888fde3642f
Merge "AAC decoder test"
Merge "Use prefetch for error handling in mutesolo test"
Remove dead code

AudioPlayback_Parameters fields trackcb and trackcbUser
audioTrack_callBack_uri
android_Player_androidBufferQueue_registerCallback_l
GenericPlayer field mLooperPriority
StreamPlayer::registerQueueCallback
CAudioPlayer::mpLock
AudioSfDecoder::startPrefetch_async
IAndroidBufferQueue does not support AudioRecorder object
android/BufferQueueSource.h #include

Change-Id: I9d7cef243167e10279df452e7c62e66d8f5fe3b6
merge in ics-release history after reset to master
Update the URI slow-down (playback rate) test

Use prefetch status callback to detect bad URI and signal to main thread.
Check return value of GetFillLevel and GetPrefetchStatus.
Display rate capabilities in a nicely formatted way.
Fix compile warnings.

Change-Id: I3f96ceb72a7a17ffe3dbcdcbda7053b3e736eb12
Relax format checking in BackDropperFilter.

This format check should restrict to GPUs, but to allow source filters with
initially unspecified targets to connect to the filter, relax the check to
be any target.

Bug: 5299669
Change-Id: I1a54be793c68ac81dd36b111daf8d463c7d1e486
merge in ics-release history after reset to master
Additional fixes for bug 5357970: Handle exceptions in async runner.

The AsyncRunner now attempts to deactivate the GL context when an error
occurs.

Also, a minor patch to error reporting that has been causing some
confusion lately.

Change-Id: I1e18b5611cf5c048ef83a4659be221e02accd69f
Bug 5385386 missing HEADATNEWPOS

Workaround for mediaserver bug where it does not send MEDIA_SEEK_COMPLETE
to the MediaPlayerNotifier after a discontinuity is processed.

Instead, we simulate a seek complete event in this case.
A short delay is applied to compensate for shared memory latency.

A longer-term fix will be to have mediaserver send the event.

Change-Id: Id0d01b842a145fa5762d44f03144741152f7b03f
Remove dead code

Change-Id: Ic68d4d7b942ef99120ad30ee3ef7ce48ff1d697a
Bug 5161265 Error recovery getting video codecs

Retry if mediaserver happens to be down when asking for OMX codecs.
Use IMediaDeathNotifier::getMediaPlayerService which tries a few times.

Change-Id: Ibeb69c82303f35fbc9e5948997f568e816721328
Merge "Bug 5334969 MediaPlayerNotificationClient safety"
Fix bug 5374629 Can't create AudioPlayer playing from MP2TS ABQ

An AudioPlayer playing audio coming from MP2TS data stored in an
 AndroidBufferQueue couldn't be created and realized anymore due
 to:
  - a regression that prevented an OutputMix to be used as the
    sink of an AudioPlayer that had an ABQ as a data source
  - a missing update when the Realize() method became fully
    locked on the object, android_audioPlayer_realize() was
    still trying to lock the already locked AudioPlayer.
Both issues are covered by a CTS test.

Also verify the SLSeekItf is not required when using an ABQ
 source.

Change-Id: Ibb1b753dcce59b7cf23ba118e287349e00e7fff4