Merge commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379' into eclair-plus-aosp
* commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379':
Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
Merge commit '0edada085e175e81b6d38a48b5b022917b410a98' into eclair-plus-aosp
* commit '0edada085e175e81b6d38a48b5b022917b410a98':
Added an API IOMX::createRendererFromJavaSurface.
* changes:
new file: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java Added a new test suite which parse the system media properties and group in into the high quality and low quality recording tests.
This api allows to instantiate a renderer by specifying the hosting java Surface object. This hides the implementation details of (java-)Surface, (native-)Surface and friends.
Add StreamSource, which wraps a SkStream to a DataSource.
Add SkOmxPixelRef, which holds a MediaBuffer.
Test OmxJpegImageDecoder by a Jpeg decoder bench.
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
Added a new test suite which parse the system media properties and group in into the high quality and low quality recording tests.
new file: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
Merge commit '0d5581133285cef4d7582b531e0bf09cee86aa90' into eclair-plus-aosp
* commit '0d5581133285cef4d7582b531e0bf09cee86aa90':
Added a little more logging in OMXCodec.cpp for vendors to be able to reproduce issues...
Merge commit '714ec1360cde8b1cbf6e6b8572256e4100f11560' into eclair-plus-aosp
* commit '714ec1360cde8b1cbf6e6b8572256e4100f11560':
Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else.
Merge commit '91e2d8651fe38a921b37a8bf8b3148c572cf9430' into eclair-plus-aosp
* commit '91e2d8651fe38a921b37a8bf8b3148c572cf9430':
Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
Fix the m4a1 duration and the also fix the random_seek time error in the stress test.
modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/stress/MediaPlayerStressTest.java
Merge commit 'e1a9de7a2e52e534b3f6cb613a9b35bcc16ac84d' into eclair-plus-aosp
* commit 'e1a9de7a2e52e534b3f6cb613a9b35bcc16ac84d':
Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true).
Merge commit '005b228cdfb369d9b3b325884c0337ba5968bf8c' into eclair-plus-aosp
* commit '005b228cdfb369d9b3b325884c0337ba5968bf8c':
API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
This is a large batch, and covers:
-- Bluetooth Device Discovery --
BluetoothAdapter.ACTION_DISCOVERY_STARTED
BluetoothAdapter.ACTION_DISCOVERY_FINISHED
BluetoothAdapter.startDiscovery()
BluetoothAdapter.cancelDiscovery()
BluetoothAdapter.isDiscovering()
-- Bluetooth bonding (pairing) --
BluetoothAdapter.getBondedDevices()
BluetoothDevice.ACTION_BOND_STATE_CHANGED
BluetoothDevice.EXTRA_BOND_STATE
BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE
BluetoothDevice.BOND_NONE
BluetoothDevice.BOND_BONDING
BluetoothDevice.BOND_BONDED
BluetoothDevice.getBondState()
BluetoothDevice.createBond()
BluetoothDevice.cancelBondProcess()
BluetoothDevice.removeBond()
-- BluetoothClass --
BluetoothDevice.ACTION_CLASS_CHANGED
BluetoothDevice.EXTRA_CLASS
BluetoothDevice.getBluetoothClass()
BluetoothClass.Service.*
BluetoothClass.Device.Major.*
BluetoothClass.Device.*
BluetoothClass.getDeviceClass()
BluetoothClass.getMajorDeviceClass()
BluetoothClass.hasService()
-- Misc BluetoothDevice --
BluetoothDevice.ACTION_ACL_CONNECTED
BluetoothDevice.ACTION_ACL_DISCONNECTED_REQUESTED
BluetoothDevice.ACTION_ACL_DISCONNECTED
BluetoothDevice.ACTION_DISCOVERED
BluetoothDevice.ACTION_NAME_CHANGED
BluetoothDevice.EXTRA_DEVICE
BluetoothDevice.EXTRA_NAME
BluetoothDevice.EXTRA_RSSI
-- Misc BluetoothAdapter --
BluetoothAdapter.ACTION_LOCAL_NAME_CHANGED
BluetoothAdapter.EXTRA_LOCAL_NAME
BluetoothAdapter.checkBluetoothAddress()
I deprecated BluetoothIntent and moved each intent into the class it relates
to.
Change-Id: I877b1280428ab46278b2bc25668bb44cda22dc36
Merge commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3' into eclair-plus-aosp
* commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3':
Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
Merge commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528' into eclair-plus-aosp
* commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528':
Add component name to informational logging in OMXCodec.cpp
Merge commit '466dbbfd4595d714127a4bc92dd9235807b88be6' into eclair-plus-aosp
* commit '466dbbfd4595d714127a4bc92dd9235807b88be6':
Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
Merge commit '546f3cd579b80299307d82a769aca8e8f68484ec' into eclair-plus-aosp
* commit '546f3cd579b80299307d82a769aca8e8f68484ec':
Support for amr-wb tracks in MPEG4Extractor.
Merge commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993' into eclair-plus-aosp
* commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993':
Added some more verbose output for AMR formats. Properly fill out the output format.
Merge commit '201511cf8a004d386ec9f592041ad3e3d4107184' into eclair-plus-aosp
* commit '201511cf8a004d386ec9f592041ad3e3d4107184':
Calculate proper output buffer size for some more 16-bit RGB color spaces.
Merge commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c' into eclair-plus-aosp
* commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c':
Support encoding amr-wb content in stagefright.
