Merge commit 'f345a094e90be664f7390d12d505a052ac4b064f'
* commit 'f345a094e90be664f7390d12d505a052ac4b064f':
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
Merge commit 'f4eb754b1810a60e640401396c1f9a10be65dffa'
* commit 'f4eb754b1810a60e640401396c1f9a10be65dffa':
Two more uses of strlcpy that break the sim build. Now fixed.
Merge commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17'
* commit '06ef1d2104b4c90d5b134ae17e2562fd6bedda17':
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
Merge commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4'
* commit 'b8fb6c0bd8236fb964697639d7bbe8e7cf78e3b4':
I accidentally broke this code while refactoring MediaScanner. This is the fix.
Merge commit '874c508c5352936c0640317ef44b81c9b632dfd6'
* commit '874c508c5352936c0640317ef44b81c9b632dfd6':
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Merge commit 'b06ecc401160c5906fd1f4c85f61163bc2875200'
* commit 'b06ecc401160c5906fd1f4c85f61163bc2875200':
Remove old hack A/V sync hack that is no longer needed.
Merge commit '104d3f755e5ebc15d66154526c2c149beb33a7ee' into eclair-mr2-plus-aosp
* commit '104d3f755e5ebc15d66154526c2c149beb33a7ee':
Media/ToneGenerator: Change tone format for TONE_CDMA_ANSWER
Merge commit '2a428fd463431e2b3d3680faf2e9640989ca7791' into eclair-mr2-plus-aosp
* commit '2a428fd463431e2b3d3680faf2e9640989ca7791':
Two more uses of strlcpy that break the sim build. Now fixed.
Merge commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e' into eclair-mr2-plus-aosp
* commit '9f0fa1f4c1ed8499bf53479cf51c440a8f665d5e':
Apparently strlcpy is not part of a standard linux distribution... Unbreaking the sim build.
Merge commit '8d670d345893fb9b9566f6b8c20202b77d4d211a' into eclair-mr2-plus-aosp
* commit '8d670d345893fb9b9566f6b8c20202b77d4d211a':
I accidentally broke this code while refactoring MediaScanner. This is the fix.
Merge commit '2d6d609c9ede7ed8924001df00af9c13effab8ad' into eclair-mr2-plus-aosp
* commit '2d6d609c9ede7ed8924001df00af9c13effab8ad':
Squashed commit of the following:
Merge commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a' into eclair-mr2-plus-aosp
* commit 'bfb9fb143b67c2d0307af2bce9af3c08f362b29a':
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
Merge commit '7c09a0ff365d6df96e880422a7b389ddf63401da' into eclair-mr2-plus-aosp
* commit '7c09a0ff365d6df96e880422a7b389ddf63401da':
Remove old hack A/V sync hack that is no longer needed.
commit 543e192bf2ae13f573dc4c4e53b239ed4ea00e81
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 3 11:33:57 2009 -0800
stagefright now acts as the OMX Master, vendors supply their own plugins through libstagefrighthw. In OpenCore-enabled builds we now sit on top of PVMaster...
commit 3cbfdbd9cecadbb77b63125c62883bf1065884fe
Author: Andreas Huber <andih@google.com>
Date: Wed Dec 2 12:39:07 2009 -0800
More OMX infrastructure, stagefright is now taking over the OMX Master, multiplexing all contributing OMX implementations under a common interface.
1) Add the include path for jni.h.
2) Rename InitCheck() and read_at() to initCheck() and readAt(),
repectively in StreamSource, as done in DataSource.
3) Add back the definition of SkJPEGImageDecoder to jpeg_decoder_bench.cpp.
Need to do so because SkJPEGImageDecoder is not defined in a header file.
Merge commit 'cb6203cdcbfbcb0c2909964b9173d0a873f086c4'
* commit 'cb6203cdcbfbcb0c2909964b9173d0a873f086c4':
DATE_TAKEN should be in millisecond instead of second.
Merge commit '9db1a37cc48a01a66ee8026de303faaf4a83667d' into eclair-mr2-plus-aosp
* commit '9db1a37cc48a01a66ee8026de303faaf4a83667d':
DATE_TAKEN should be in millisecond instead of second.
Merge commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58' into eclair-mr2
* commit 'f27eb3264d4b5d3fd154834a709a9a53cc878b58':
DATE_TAKEN should be in millisecond instead of second.
Merge commit 'e77d40834589ec70abcf71d93a82d24ca6e5535b'
* commit 'e77d40834589ec70abcf71d93a82d24ca6e5535b':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Merge commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565' into eclair-mr2-plus-aosp
* commit '5e392e2b028fb0f92b2efe6de24b60a57cd4c565':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Merge commit 'ae34cf92db9c54ba72fdcac33a8ba855a2215e4e'
* commit 'ae34cf92db9c54ba72fdcac33a8ba855a2215e4e':
A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
Merge commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb' into eclair-mr2-plus-aosp
* commit '781ac16283574ec07cd7b13d67b54b7b4c2c15cb':
A small sample tool to encode pcm audio data to amr, decode it again and play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
Merge commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3' into eclair-mr2
* commit 'bb3bb57a6330f71323fcd7e93e88dbdab55daec3':
Fix issue 2192673: Music Pausing Even when notifications are set to silent.
Merge commit '03c185bf763fd2a289131d64e4b14d4a5461d80f'
* commit '03c185bf763fd2a289131d64e4b14d4a5461d80f':
Update documentation: The width of the image for face detection must be even.
Merge commit 'c61b0de83bc0c6f7bb1d10bcfc02ab29f3a49caa' into eclair-mr2-plus-aosp
* commit 'c61b0de83bc0c6f7bb1d10bcfc02ab29f3a49caa':
Update documentation: The width of the image for face detection must be even.
Merge commit '551e1a7608887c5bb29b65f3b4aab058fdd06c80'
* commit '551e1a7608887c5bb29b65f3b4aab058fdd06c80':
Set metadata retriever thread group to the caller's group.
Merge commit 'ebcb7c3167e76c19d4721dbc472772744918e868' into eclair-mr2-plus-aosp
* commit 'ebcb7c3167e76c19d4721dbc472772744918e868':
Set metadata retriever thread group to the caller's group.
