460 Commits

Author SHA1 Message Date
Andreas Huber
51173401f4 am f7c3679f: Merge change 25158 into eclair
Merge commit 'f7c3679f898cdcb208bc1675c79573e1d637083a' into eclair-plus-aosp

* commit 'f7c3679f898cdcb208bc1675c79573e1d637083a':
  Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
2009-09-16 10:08:13 -07:00
Android (Google) Code Review
f7c3679f89 Merge change 25158 into eclair
* changes:
  Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
2009-09-16 13:01:57 -04:00
Chih-Chung Chang
53a673661c am d3ba4811: Merge change 25272 into eclair
Merge commit 'd3ba4811d48e01e85b4faa57da159471022e6daa' into eclair-plus-aosp

* commit 'd3ba4811d48e01e85b4faa57da159471022e6daa':
  Make ExifInterface public.
2009-09-16 09:19:41 -07:00
Android (Google) Code Review
d3ba4811d4 Merge change 25272 into eclair
* changes:
  Make ExifInterface public.
2009-09-16 12:12:03 -04:00
Jean-Michel Trivi
2edbd217af am b53eaac6: Merge change 25155 into eclair
Merge commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8' into eclair-plus-aosp

* commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8':
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against
2009-09-16 09:10:31 -07:00
Android (Google) Code Review
b53eaac659 Merge change 25155 into eclair
* changes:
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against misuse of some of the methods that should only be used to implement the Settings and Phone apps, and the audio service.
2009-09-16 12:07:37 -04:00
Chih-Chung Chang
017bb4ccf7 Make ExifInterface public. 2009-09-16 23:38:34 +08:00
Chih-Chung Chang
e1c64f8f14 am ccd064d4: Merge change 25255 into eclair
Merge commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1' into eclair-plus-aosp

* commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1':
  Clean ExifInterface. Prepare to make it public.
2009-09-16 05:21:54 -07:00
Chih-Chung Chang
700beb4846 Clean ExifInterface. Prepare to make it public.
Change-Id: Ibff719d02f525c1e8583d1892737224a0cc42c37
2009-09-16 20:03:48 +08:00
Yu Shan Emily Lau
036033fc6d am 610e3595: modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the meta data duration
Merge commit '610e3595d250f78c857126cd08ef2a82ee650415' into eclair-plus-aosp

* commit '610e3595d250f78c857126cd08ef2a82ee650415':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
2009-09-15 20:59:10 -07:00
Yu Shan Emily Lau
610e3595d2 modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
Fixed the meta data duration
2009-09-15 20:40:07 -07:00
Andreas Huber
39b3bb95a7 am 781a5dd5: Merge change 25142 into eclair
Merge commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715' into eclair-plus-aosp

* commit '781a5dd5279b7a57c2c0b1d78cb2a4e7acbf1715':
  The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
2009-09-15 16:19:35 -07:00
Andreas Huber
4f23457958 Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565. 2009-09-15 16:19:08 -07:00
Jean-Michel Trivi
fccb25d207 Fix bug 2115258 where the AudioManager javadoc doesn't warn against
misuse of some of the methods that should only be used to implement
the Settings and Phone apps, and the audio service.
2009-09-15 16:13:59 -07:00
Andreas Huber
0446b82617 The 8k chipset qcom decoders require that the input buffers be allocated using OMX_AllocateBuffer rather than OMX_UseBuffer for now.
If they aren't, a later call to OMX_FreeBuffer crashes...
2009-09-15 15:50:31 -07:00
Andreas Huber
ecbcbf32b0 am a4fe2aca: Merge change 25128 into eclair
Merge commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379' into eclair-plus-aosp

* commit 'a4fe2aca527ee45ddde6ace2316cad27dd487379':
  Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
2009-09-15 14:51:30 -07:00
Andreas Huber
1198aa27f1 am 0edada08: Merge change 25101 into eclair
Merge commit '0edada085e175e81b6d38a48b5b022917b410a98' into eclair-plus-aosp

* commit '0edada085e175e81b6d38a48b5b022917b410a98':
  Added an API IOMX::createRendererFromJavaSurface.
2009-09-15 14:51:23 -07:00
Android (Google) Code Review
a4fe2aca52 Merge change 25128 into eclair
* changes:
  Support CbYCrY -> RGB565 color conversion in IOMXRenderer.
2009-09-15 17:48:33 -04:00
Android (Google) Code Review
0edada085e Merge change 25101 into eclair
* changes:
  Added an API IOMX::createRendererFromJavaSurface.
2009-09-15 17:48:22 -04:00
Andreas Huber
c966a3c255 Support CbYCrY -> RGB565 color conversion in IOMXRenderer. 2009-09-15 14:32:59 -07:00
Yu Shan Emily Lau
44934f3042 am 4d445d68: Merge change 24955 into eclair
Merge commit '4d445d682e6380b26fbe5cd06cb0ca4c532739e7' into eclair-plus-aosp

* commit '4d445d682e6380b26fbe5cd06cb0ca4c532739e7':
  new file:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
2009-09-15 14:16:27 -07:00
Android (Google) Code Review
4d445d682e Merge change 24955 into eclair
* 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.
2009-09-15 17:10:54 -04:00
Andreas Huber
9f9afef3d5 Added an API IOMX::createRendererFromJavaSurface.
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.
2009-09-15 12:49:11 -07:00
Yu Shan Emily Lau
1619367ab8 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.

	new file:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java
	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaRecorderTest.java
2009-09-14 16:27:34 -07:00
Andreas Huber
1ff4cdadd5 am 0d558113: Merge change 24932 into eclair
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...
2009-09-14 15:54:15 -07:00
Andreas Huber
92022857fb Added a little more logging in OMXCodec.cpp for vendors to be able to reproduce issues... 2009-09-14 15:24:14 -07:00
Andreas Huber
5962166750 am 714ec136: Merge change 24742 into eclair
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.
2009-09-14 10:13:30 -07:00
Android (Google) Code Review
714ec1360c Merge change 24742 into eclair
* changes:
  Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else.
2009-09-14 13:08:02 -04:00
Eric Laurent
6fc35e3e7e am 91e2d865: Merge change 24337 into eclair
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.
2009-09-13 23:50:52 -07:00
Android (Google) Code Review
91e2d8651f Merge change 24337 into eclair
* changes:
  Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
2009-09-14 02:43:52 -04:00
Yu Shan Emily Lau
f23eb2839a am 9a7efa45: Merge change 24789 into eclair
Merge commit '9a7efa452909b7a4f12840c44291c51a699acade' into eclair-plus-aosp

* commit '9a7efa452909b7a4f12840c44291c51a699acade':
  modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
2009-09-11 18:05:02 -07:00
Yu Shan Emily Lau
147a0c270b modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
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
2009-09-11 16:37:42 -07:00
Andreas Huber
2dc64d80e3 Apparently I must not use OMX_UseBuffer on either input or output ports on any of the TI components... or else. 2009-09-11 12:58:53 -07:00
Andreas Huber
2d1c327eb9 am e1a9de7a: Merge change 24702 into eclair
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).
2009-09-11 10:20:33 -07:00
Andreas Huber
2aa39c4507 Only build the "full" stagefright (including MediaExtractors and MediaPlayer) if BUILD_WITH_FULL_STAGEFRIGHT define is set (to true). 2009-09-11 09:54:52 -07:00
Andreas Huber
348816109a am 6026a514: Move JPEGSource.{cpp,h} into libstagefright.
Merge commit '6026a514248f0c603d0e8c4a3f542abab3fa1509' into eclair-plus-aosp

* commit '6026a514248f0c603d0e8c4a3f542abab3fa1509':
  Move JPEGSource.{cpp,h} into libstagefright.
2009-09-11 09:13:38 -07:00
Andreas Huber
6026a51424 Move JPEGSource.{cpp,h} into libstagefright. 2009-09-11 07:49:50 -07:00
Nick Pelly
e7eb85cae0 am 005b228c: API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
Merge commit '005b228cdfb369d9b3b325884c0337ba5968bf8c' into eclair-plus-aosp

* commit '005b228cdfb369d9b3b325884c0337ba5968bf8c':
  API_CHANGE: Cleanup, javadoc and unhide more Bluetooth API.
2009-09-10 19:01:25 -07:00
Nick Pelly
005b228cdf 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
2009-09-10 18:52:21 -07:00
Andreas Huber
52646559af am c06307cc: Merge change 24583 into eclair
Merge commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3' into eclair-plus-aosp

* commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3':
  Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
2009-09-10 15:42:41 -07:00
Andreas Huber
e6c409632f Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API. 2009-09-10 14:43:36 -07:00
Andreas Huber
0cb94317d7 am d9ca6a79: Merge change 24530 into eclair
Merge commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528' into eclair-plus-aosp

* commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528':
  Add component name to informational logging in OMXCodec.cpp
2009-09-10 11:18:52 -07:00
Andreas Huber
e087373d0b Add component name to informational logging in OMXCodec.cpp 2009-09-10 10:27:14 -07:00
Andreas Huber
6f208f448c am 466dbbfd: Merge change 24450 into eclair
Merge commit '466dbbfd4595d714127a4bc92dd9235807b88be6' into eclair-plus-aosp

* commit '466dbbfd4595d714127a4bc92dd9235807b88be6':
  Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
2009-09-10 09:44:54 -07:00
Andreas Huber
26c131006c am 546f3cd5: Merge change 24448 into eclair
Merge commit '546f3cd579b80299307d82a769aca8e8f68484ec' into eclair-plus-aosp

* commit '546f3cd579b80299307d82a769aca8e8f68484ec':
  Support for amr-wb tracks in MPEG4Extractor.
2009-09-10 09:44:49 -07:00
Andreas Huber
b71e9b4e03 am 18ed7601: Merge change 24447 into eclair
Merge commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993' into eclair-plus-aosp

* commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993':
  Added some more verbose output for AMR formats. Properly fill out the output format.
2009-09-10 09:44:44 -07:00
Android (Google) Code Review
466dbbfd45 Merge change 24450 into eclair
* changes:
  Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
2009-09-10 12:39:26 -04:00
Android (Google) Code Review
546f3cd579 Merge change 24448 into eclair
* changes:
  Support for amr-wb tracks in MPEG4Extractor.
2009-09-10 12:39:16 -04:00
Android (Google) Code Review
18ed7601d2 Merge change 24447 into eclair
* changes:
  Added some more verbose output for AMR formats. Properly fill out the output format.
2009-09-10 12:39:08 -04:00
Eric Laurent
c6f6253ad2 am f63e3f3c: Merge change 24512 into eclair
Merge commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79' into eclair-plus-aosp

* commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79':
  Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
2009-09-10 08:17:19 -07:00