Merge commit 'e86a37c6bfb0a0aa9ce871fdfc9e884ab3ddd1d8'
* commit 'e86a37c6bfb0a0aa9ce871fdfc9e884ab3ddd1d8':
Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
Merge commit '8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23' into eclair-mr2-plus-aosp
* commit '8eac1637b0f8ec7a2417eb53ebe56bb64c3b2b23':
Propagate duration from input to output only if available, support multiple full frames of audio per input buffer in AMR/AAC decoders.
Merge commit 'ea113f307d459577e9ed3ea2cbbbb77c92235a6e'
* commit 'ea113f307d459577e9ed3ea2cbbbb77c92235a6e':
Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
Merge commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b' into eclair-mr2-plus-aosp
* commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b':
Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
Merge commit '554647e963432d34c41e69e4c6c0c6e4cb08e80e'
* commit '554647e963432d34c41e69e4c6c0c6e4cb08e80e':
remote destructors are not synchronously executed by the binder...
Merge commit '9ec965e4fb242c9c570e43980425b8f275eb2159'
* commit '9ec965e4fb242c9c570e43980425b8f275eb2159':
remote destructors are not synchronously executed by the binder...
Merge commit '6ddcf01a9033ee7ff4230efd117d7bcc8b5b3cc1' into eclair-mr2-plus-aosp
* commit '6ddcf01a9033ee7ff4230efd117d7bcc8b5b3cc1':
remote destructors are not synchronously executed by the binder...
Merge commit 'b78599b738b7a66f5bd1bed815e9cb433b2fe740' into eclair-mr2-plus-aosp
* commit 'b78599b738b7a66f5bd1bed815e9cb433b2fe740':
remote destructors are not synchronously executed by the binder...
Merge commit 'fd672a8a8cde8d1d22878e966e8f10470966541f'
* commit 'fd672a8a8cde8d1d22878e966e8f10470966541f':
Initial checkin of software AVC video decoder based on PV source code.
Merge commit 'fd49983009e9e68de5d3f7f5c93689c8da1a9b6c' into eclair-mr2-plus-aosp
* commit 'fd49983009e9e68de5d3f7f5c93689c8da1a9b6c':
Initial checkin of software AVC video decoder based on PV source code.
Merge commit '9472b35ba190b24f811ff7b025a93b2023dbd58d' into eclair-mr2-plus-aosp
* commit '9472b35ba190b24f811ff7b025a93b2023dbd58d':
Fix media player decode function. Bug 2317821.
Merge commit '14f8940472217e8b0164d8f213679710d623d528' into eclair-mr2
* commit '14f8940472217e8b0164d8f213679710d623d528':
Fix media player decode function. Bug 2317821.
Merge commit '5c5c85a5050d5512e437be65ec00d3f31b8bf004'
* commit '5c5c85a5050d5512e437be65ec00d3f31b8bf004':
Initial check in of AMR (NB and WB) decoders based on PV source code.
Merge commit '987e7fb2d43130deb756353ca8f098b0a0a3beeb' into eclair-mr2-plus-aosp
* commit '987e7fb2d43130deb756353ca8f098b0a0a3beeb':
Initial check in of AMR (NB and WB) decoders based on PV source code.
Merge commit '30807a4500fab8b46ee661db2ba99286049a8adc'
* commit '30807a4500fab8b46ee661db2ba99286049a8adc':
Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
Merge commit 'b16cf676bd3304bc0c5da4210d689f4e680219b1'
* commit 'b16cf676bd3304bc0c5da4210d689f4e680219b1':
Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
Merge commit 'a42b8f160fb5906638e978a470972d1f50d749ac'
* commit 'a42b8f160fb5906638e978a470972d1f50d749ac':
Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
Merge commit '42be7440ee2a3a360c83802e4e7a2ecf40220eff'
* commit '42be7440ee2a3a360c83802e4e7a2ecf40220eff':
Note to self: Don't reverse the arguments to fseek(o)...
There was a recent change to OpenCORE that broke the MediaPlayer::decode()
function for all OpenCORE supported formats (MP3, AAC, and AMR-NB/WB). The
affect is that SoundPool is unreliable for all of these formats. This patch
changes the logic in the AudioCache object that processes messages from the
media player. The old logic was fragile. This change should make it more
robust against changes.
Merge commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1' into eclair-mr2-plus-aosp
* commit '7c55c3f5f5997ca572d70ad513099a5af20a23c1':
Make sure to use the hand-tweaked-assembly version of the relevant mp3 code if building for ARM.
Merge commit '6d35d4c2cff4ad411fe7d6fde3fda0467d1016c5' into eclair-mr2-plus-aosp
* commit '6d35d4c2cff4ad411fe7d6fde3fda0467d1016c5':
Fix the mp3 audio extractor that would occasionally return an invalid frame directly after a seek.
Merge commit '3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc' into eclair-mr2-plus-aosp
* commit '3f5b28679bb31b8ba8f75a2bf330ec0dc0ea14cc':
Minor tweaks to the mp3 and aac software decoders, propagate duration to output format.
Merge commit 'ee3a2443deb39ad9ce65293c045d34b9198cc57a' into eclair-mr2-plus-aosp
* commit 'ee3a2443deb39ad9ce65293c045d34b9198cc57a':
Note to self: Don't reverse the arguments to fseek(o)...
to the AudioPolicyManager a new forced usage AudioSystem::FOR_DOCK
which can take the FORCE_NONE, FORCE_BT_DOCK or FORCE_WIRED_ACCESSORY
values. This CL is complemented by an update of the APM to take into
account the FOR_DOCK usage.
Merge commit '2109e6801199b10460330027f3537d406b6a0149'
* commit '2109e6801199b10460330027f3537d406b6a0149':
Fixing the build, only instantiate the software aac decoder in full stagefright builds.
