summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 5647eebc: am 9dba1f92: Merge change Ib482ce88 into eclair-mr2Andreas Huber2009-10-291-5/+118
|\ | | | | | | | | | | | | Merge commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314' * commit '5647eebc3aeef6e644b8c7587a36206d8f0d6314': Revive support for video encoding in OMXCodec.
| * am 9dba1f92: Merge change Ib482ce88 into eclair-mr2Andreas Huber2009-10-291-5/+118
| |\ | | | | | | | | | | | | | | | | | | Merge commit '9dba1f928021450f101013e03deacc9a0506772e' into eclair-mr2-plus-aosp * commit '9dba1f928021450f101013e03deacc9a0506772e': Revive support for video encoding in OMXCodec.
| | * Merge change Ib482ce88 into eclair-mr2Android (Google) Code Review2009-10-291-5/+118
| | |\ | | | | | | | | | | | | | | | | * changes: Revive support for video encoding in OMXCodec.
| | | * Revive support for video encoding in OMXCodec.Andreas Huber2009-10-291-5/+118
| | | |
* | | | am 9ad42745: am 9d73409e: Merge change Ic5e3d73f into eclair-mr2Patrick Scott2009-10-291-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '9ad4274588374df796f7fb9f35d44476fc50c8de' * commit '9ad4274588374df796f7fb9f35d44476fc50c8de': LOG_ASSERT needs a message.
| * | | am 9d73409e: Merge change Ic5e3d73f into eclair-mr2Patrick Scott2009-10-291-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '9d73409e76000f06a7ee3395241154a029152483' into eclair-mr2-plus-aosp * commit '9d73409e76000f06a7ee3395241154a029152483': LOG_ASSERT needs a message.
| | * | Merge change Ic5e3d73f into eclair-mr2Android (Google) Code Review2009-10-291-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * changes: LOG_ASSERT needs a message.
| | | * | LOG_ASSERT needs a message.Patrick Scott2009-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | This fails to build when asserts are turned on.
* | | | | am 5fc26f60: am ee507eb5: am 89889733: Merge change I4e83a76a into eclairJean-Michel Trivi2009-10-291-5/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5fc26f609aaf0a878bd821e9d8df96be025fe2f8' * commit '5fc26f609aaf0a878bd821e9d8df96be025fe2f8': Fix bug 2201417. Whenever the System setting that indicates
| * | | | am ee507eb5: am 89889733: Merge change I4e83a76a into eclairJean-Michel Trivi2009-10-291-5/+15
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'ee507eb560319643946d73627bc7ad3e13591f2a' into eclair-mr2-plus-aosp * commit 'ee507eb560319643946d73627bc7ad3e13591f2a': Fix bug 2201417. Whenever the System setting that indicates
| | * | | am 89889733: Merge change I4e83a76a into eclairJean-Michel Trivi2009-10-291-5/+15
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-mr2 * commit '898897338dfd62a268a89fb55ee900a9bd5a683f': Fix bug 2201417. Whenever the System setting that indicates
| | | * \ \ Merge change I4e83a76a into eclairAndroid (Google) Code Review2009-10-281-5/+15
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix bug 2201417. Whenever the System setting that indicates whether the notifcation stream uses the ring volume changes, the table of stream volume aliases in AudioService is updated. But the name of the alias stored in VolumeStreamState.mVolumeIndexSettingName was not updated whenever the NOTIFICATIONS_USE_RING_VOLUME setting was updated. This caused the wrong volume setting to be persisted. This change ensures the setting name is updated whenever the volume alias is, and persists the notification volume change right away (instead of after a delay), so that registered observers are notified right away. The notification seekbar in the sound settings is an example of such an observer.
| | | | * | | Fix bug 2201417. Whenever the System setting that indicatesJean-Michel Trivi2009-10-271-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whether the notifcation stream uses the ring volume changes, the table of stream volume aliases in AudioService is updated. But the name of the alias stored in VolumeStreamState.mVolumeIndexSettingName was not updated whenever the NOTIFICATIONS_USE_RING_VOLUME setting was updated. This caused the wrong volume setting to be persisted. This change ensures the setting name is updated whenever the volume alias is, and persists the notification volume change right away (instead of after a delay), so that registered observers are notified right away. The notification seekbar in the sound settings is an example of such an observer.
* | | | | | | am a628d54d: am 63733498: am 98de26e0: Merge change I8cc42c52 into eclairDave Sparks2009-10-291-42/+51
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'a628d54d108b365b66934e4b83aac739ee5ad9cc' * commit 'a628d54d108b365b66934e4b83aac739ee5ad9cc': Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
| * | | | | | am 63733498: am 98de26e0: Merge change I8cc42c52 into eclairDave Sparks2009-10-291-42/+51
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '6373349836237abffc3de8a3632234170bc1cfca' into eclair-mr2-plus-aosp * commit '6373349836237abffc3de8a3632234170bc1cfca': Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
| | * | | | | am 98de26e0: Merge change I8cc42c52 into eclairDave Sparks2009-10-291-42/+51
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | Merge commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6' into eclair-mr2 * commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6': Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
| | | * | | Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.Dave Sparks2009-10-271-42/+51
| | | | | |
* | | | | | am f97dec83: am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclairYu Shan Emily Lau2009-10-282-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f97dec837c1fa47250af023bbaea0566a0ec9695' * commit 'f97dec837c1fa47250af023bbaea0566a0ec9695': Fixed the H263 video duation which caused the incorrect video validation.
| * | | | | am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclairYu Shan Emily Lau2009-10-282-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63' into eclair-mr2-plus-aosp * commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63': Fixed the H263 video duation which caused the incorrect video validation.
| | * | | | am adf4b4f5: Merge change I96458368 into eclairYu Shan Emily Lau2009-10-282-1/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2 * commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd': Fixed the H263 video duation which caused the incorrect video validation.
| | | * | | Merge change I96458368 into eclairAndroid (Google) Code Review2009-10-262-1/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fixed the H263 video duation which caused the incorrect video validation.
| | | | * | | Fixed the H263 video duation which caused the incorrect video validation.Yu Shan Emily Lau2009-10-262-1/+2
| | | | | | |
* | | | | | | am 687545fc: am 5a7691f0: am e8543418: Merge change I7c0d20a7 into eclairDave Sparks2009-10-282-0/+37
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '687545fc9ee79124229152df1236c53ba7d71215' * commit '687545fc9ee79124229152df1236c53ba7d71215': Run the metadataretriever at background priority. Bug 2187133.
| * | | | | | am 5a7691f0: am e8543418: Merge change I7c0d20a7 into eclairDave Sparks2009-10-282-0/+37
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b' into eclair-mr2-plus-aosp * commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b': Run the metadataretriever at background priority. Bug 2187133.
| | * | | | | am e8543418: Merge change I7c0d20a7 into eclairDave Sparks2009-10-282-0/+37
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-mr2 * commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85': Run the metadataretriever at background priority. Bug 2187133.
| | | * | | | Merge change I7c0d20a7 into eclairAndroid (Google) Code Review2009-10-262-0/+37
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Run the metadataretriever at background priority. Bug 2187133.
| | | | * | | | Run the metadataretriever at background priority. Bug 2187133.Dave Sparks2009-10-262-0/+37
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change forces metadata retreiver threads to background priority. Uses an inner class to encapsulate the priority change so that it automatically restores priority when returning to the client.
* | | | | | | am 7373755a: am 013ecbfc: am 54620b1a: Merge change I6e50a8c6 into eclairAndreas Huber2009-10-281-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7373755ac391468c413f8ce4ba1f1bcc60bb1674' * commit '7373755ac391468c413f8ce4ba1f1bcc60bb1674': Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
| * | | | | | am 013ecbfc: am 54620b1a: Merge change I6e50a8c6 into eclairAndreas Huber2009-10-281-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed' into eclair-mr2-plus-aosp * commit '013ecbfca236f3b4c2fd0eedd89c70f116f641ed': Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
| | * | | | | am 54620b1a: Merge change I6e50a8c6 into eclairAndreas Huber2009-10-281-0/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-mr2 * commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029': Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
| | | * | | | Revert "Now that the underlying bug is fixed we can continue using ↵Andreas Huber2009-10-261-0/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMX_UseBuffer for this decoder's input buffers." This reverts commit 7a03b074a554ba3fd08dbc20cfd4b2f37c5f3aaa.
* | | | | | am e113d6af: am 76a54294: Merge change I155e2ad0 into eclair-mr2Andreas Huber2009-10-282-92/+108
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e113d6af6204dac03b13b324852fe7f741ebb3d3' * commit 'e113d6af6204dac03b13b324852fe7f741ebb3d3': Re-enable CameraSource.
| * | | | | am 76a54294: Merge change I155e2ad0 into eclair-mr2Andreas Huber2009-10-282-92/+108
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '76a5429407e821c22508eca92e7475b6433cd668' into eclair-mr2-plus-aosp * commit '76a5429407e821c22508eca92e7475b6433cd668': Re-enable CameraSource.
| | * | | | Merge change I155e2ad0 into eclair-mr2Android (Google) Code Review2009-10-282-92/+108
| | |\ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | * changes: Re-enable CameraSource.
| | | * | | Re-enable CameraSource.Andreas Huber2009-10-282-92/+108
| | | | | |
* | | | | | am b1a8f54b: am 27123468: Use a simple replacement for String8 that ↵Andreas Huber2009-10-281-1/+34
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocates its storage beforehand to avoid reentering the heap while we\'re examining it (leak checker). Merge commit 'b1a8f54bf62c3974831bf3c866275425127cf7b6' * commit 'b1a8f54bf62c3974831bf3c866275425127cf7b6': Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
| * | | | | am 27123468: Use a simple replacement for String8 that allocates its storage ↵Andreas Huber2009-10-271-1/+34
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beforehand to avoid reentering the heap while we\'re examining it (leak checker). Merge commit '27123468b33cb61a1600079d583302b1b078b2ee' into eclair-mr2-plus-aosp * commit '27123468b33cb61a1600079d583302b1b078b2ee': Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker).
| | * | | | Use a simple replacement for String8 that allocates its storage beforehand ↵Andreas Huber2009-10-271-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | to avoid reentering the heap while we're examining it (leak checker).
* | | | | | am fdde959c: am dfdf9453: Merge change I3085c83e into eclair-mr2Andreas Huber2009-10-263-1/+100
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fdde959c22b5758db15293bc442e01674727fa61' * commit 'fdde959c22b5758db15293bc442e01674727fa61': When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
| * | | | | am dfdf9453: Merge change I3085c83e into eclair-mr2Andreas Huber2009-10-263-1/+100
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1' into eclair-mr2-plus-aosp * commit 'dfdf9453577de9e22df3ecf9bbe3a48c2e59ccf1': When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers.
| | * | | | When freeing an OMX node, attempt to transition it from its current state ↵Andreas Huber2009-10-263-1/+100
| | | | | | | | | | | | | | | | | | | | | | | | all the way to "Loaded" in order to properly free any allocated buffers.
* | | | | | am 848f9c99: am 7ed70c95: am bf96aaad: Merge change Icf10db28 into eclairEric Laurent2009-10-242-1/+24
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '848f9c99af9c1f3fe0cc30717ea4c73e6fefb527' * commit '848f9c99af9c1f3fe0cc30717ea4c73e6fefb527': Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
| * | | | | am 7ed70c95: am bf96aaad: Merge change Icf10db28 into eclairEric Laurent2009-10-242-1/+24
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '7ed70c9515fe3df6eb1796717d73f23e7286b3e6' into eclair-mr2-plus-aosp * commit '7ed70c9515fe3df6eb1796717d73f23e7286b3e6': Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
| | * | | | am bf96aaad: Merge change Icf10db28 into eclairEric Laurent2009-10-242-1/+24
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | | | | | | | | | | | | | | | Merge commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba' into eclair-mr2 * commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba': Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
| | | * | Merge change Icf10db28 into eclairAndroid (Google) Code Review2009-10-242-1/+24
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
| | | | * | Fix issue 2192181: AudioFlinger must provide separated methods to set ↵Eric Laurent2009-10-212-1/+24
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VOICE_CALL stream volume and down link audio volume. Added setVoiceVolume() method to AudioSystem, AudioFlinger, IAudioFlinger, AudioPolicyService. Removed call to AudioHardwareInterface::setVoiceVolume() from AudioFlinger::setStreamVolume().
* | | | | am c91e3d8d: am d9f3d60d: Merge change I3b1b7873 into eclair-mr2Andreas Huber2009-10-2313-94/+88
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c91e3d8d897f7299269e177c2891fde31cfc6ae1' * commit 'c91e3d8d897f7299269e177c2891fde31cfc6ae1': New API to instantiate a MediaExtractor given a URI and optional MIME type.
| * | | | am d9f3d60d: Merge change I3b1b7873 into eclair-mr2Andreas Huber2009-10-2313-94/+88
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd9f3d60df9317f15a7f26bc050f51b53b46898ff' into eclair-mr2-plus-aosp * commit 'd9f3d60df9317f15a7f26bc050f51b53b46898ff': New API to instantiate a MediaExtractor given a URI and optional MIME type.
| | * | | New API to instantiate a MediaExtractor given a URI and optional MIME type.Andreas Huber2009-10-2313-94/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also DataSources now must provide a method initCheck() and DataSource::reat_at has been renamed to readAt to conform to standard API naming guidelines.
* | | | | am d919aa74: am 9069aa31: Merge change I57515f33 into eclair-mr2Andreas Huber2009-10-238-9/+191
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af' * commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af': Moving the individual extractor headers files to the private include directory.
generated by cgit v1.1 at 2025-01-31 05:24:22 +0000