summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | am 9069aa31: Merge change I57515f33 into eclair-mr2Andreas Huber2009-10-238-9/+191
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56' into eclair-mr2-plus-aosp * commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56': Moving the individual extractor headers files to the private include directory.
| | * | | Moving the individual extractor headers files to the private include directory.Andreas Huber2009-10-238-9/+191
| | | | |
* | | | | am f57b07df: am ad285430: Make stagefright a little less verbose. Fix heap ↵Andreas Huber2009-10-233-12/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corruption for real. Merge commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9' * commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9': Make stagefright a little less verbose. Fix heap corruption for real.
| * | | | am ad285430: Make stagefright a little less verbose. Fix heap corruption for ↵Andreas Huber2009-10-233-12/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | real. Merge commit 'ad28543022101d0b01845e3f53dcd57e524816ef' into eclair-mr2-plus-aosp * commit 'ad28543022101d0b01845e3f53dcd57e524816ef': Make stagefright a little less verbose. Fix heap corruption for real.
| | * | | Make stagefright a little less verbose. Fix heap corruption for real.Andreas Huber2009-10-233-12/+9
| | | | |
* | | | | am 871e4ee8: am e8472900: Merge change Ie13526ad into eclair-mr2Andreas Huber2009-10-232-38/+111
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '871e4ee81d6fa310dbfc5f6f37f3d8a780a28ddc' * commit '871e4ee81d6fa310dbfc5f6f37f3d8a780a28ddc': Prefer software decoders over hardware for thumbnail extraction.
| * | | | am e8472900: Merge change Ie13526ad into eclair-mr2Andreas Huber2009-10-232-38/+111
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'e84729002102622b40bd6efddffb76909615c12a' into eclair-mr2-plus-aosp * commit 'e84729002102622b40bd6efddffb76909615c12a': Prefer software decoders over hardware for thumbnail extraction.
| | * | | Merge change Ie13526ad into eclair-mr2Android (Google) Code Review2009-10-232-38/+111
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Prefer software decoders over hardware for thumbnail extraction.
| | | * | | Prefer software decoders over hardware for thumbnail extraction.Andreas Huber2009-10-232-38/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While our hardware decoders clearly outperform the software decoders in terms of raw throughput, their startup latency makes them less suitable for thumbnail extraction.
* | | | | | am 1f04c836: am 1f64ffe2: Merge change Icb64cd2c into eclair-mr2Andreas Huber2009-10-231-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c' * commit '1f04c83684cb1a0f1e5cc6100294d6c3bbb65d4c': Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
| * | | | | am 1f64ffe2: Merge change Icb64cd2c into eclair-mr2Andreas Huber2009-10-231-1/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead' into eclair-mr2-plus-aosp * commit '1f64ffe2e486b5a0d0c77487bdb612ee46ed7ead': Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
| | * | | | Merge change Icb64cd2c into eclair-mr2Android (Google) Code Review2009-10-231-1/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
| | | * | | | Still don't know why the heap gets corrupted, but not deleting the ↵Andreas Huber2009-10-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | OMXNodeInstance appears to prevent this from happening.
* | | | | | | am bae0d0d4: am 470687e2: am dd28d563: Fix 2209967 Tonegenerator: mutex not ↵Eric Laurent2009-10-231-4/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release in startTone() upon timeout waiting for the stop sequence to complete. Merge commit 'bae0d0d4c770bbd21a0b2763fa0ddb7cf6613476' * commit 'bae0d0d4c770bbd21a0b2763fa0ddb7cf6613476': Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
| * | | | | | am 470687e2: am dd28d563: Fix 2209967 Tonegenerator: mutex not release in ↵Eric Laurent2009-10-231-4/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | startTone() upon timeout waiting for the stop sequence to complete. Merge commit '470687e251ecb298bda17f3e3978ffeaf05622a9' into eclair-mr2-plus-aosp * commit '470687e251ecb298bda17f3e3978ffeaf05622a9': Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
| | * | | | | am dd28d563: Fix 2209967 Tonegenerator: mutex not release in startTone() ↵Eric Laurent2009-10-231-4/+6
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | / / | | | | |/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | upon timeout waiting for the stop sequence to complete. Merge commit 'dd28d56368441537ec5eb42150516416fdbf10ad' into eclair-mr2 * commit 'dd28d56368441537ec5eb42150516416fdbf10ad': Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout waiting for the stop sequence to complete.
| | | * | | Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout ↵Eric Laurent2009-10-231-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | waiting for the stop sequence to complete. Unlock mLock mutex when exiting upon wait stop timeout condition. Increase timeout delays to avoid timing out when A2DP exits standby.
* | | | | | am 7453da3f: am e981c334: Extract video thumbnails from the largest sync ↵Andreas Huber2009-10-227-6/+100
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sample among the first 20. Merge commit '7453da3f420b74f5bb135d5895b82dca9c015bb3' * commit '7453da3f420b74f5bb135d5895b82dca9c015bb3': Extract video thumbnails from the largest sync sample among the first 20.
| * | | | | am e981c334: Extract video thumbnails from the largest sync sample among the ↵Andreas Huber2009-10-227-6/+100
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first 20. Merge commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732' into eclair-mr2-plus-aosp * commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732': Extract video thumbnails from the largest sync sample among the first 20.
| | * | | | Extract video thumbnails from the largest sync sample among the first 20.Andreas Huber2009-10-227-6/+100
| | | | | | | | | | | | | | | | | | | | | | | | Also fixes OMXCodec seek behaviour on the very first call to OMXCodec::read()
* | | | | | am 0c012efa: am f7f671ed: am b0e6a9a0: Merge change I7a03b074 into eclairAndreas Huber2009-10-221-1/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0c012efaab175a46df0cb217e639f414495e4a1b' * commit '0c012efaab175a46df0cb217e639f414495e4a1b': Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
| * | | | | am f7f671ed: am b0e6a9a0: Merge change I7a03b074 into eclairAndreas Huber2009-10-221-1/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f7f671edefceefaf68ab28a81ff2dffa54883b6b' into eclair-mr2-plus-aosp * commit 'f7f671edefceefaf68ab28a81ff2dffa54883b6b': Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
| | * | | | am b0e6a9a0: Merge change I7a03b074 into eclairAndreas Huber2009-10-221-1/+0
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| | | | | | | | | | | | Merge commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905' into eclair-mr2 * commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905': Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
| | | * | Now that the underlying bug is fixed we can continue using OMX_UseBuffer for ↵Andreas Huber2009-10-211-1/+0
| | | |/ | | | | | | | | | | | | this decoder's input buffers.
| | | * do not merge: The qcom video decoders always output yuv data after adjusting ↵Andreas Huber2009-10-202-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | dimensions to be a multiple of 16. Add a quirk mode to OMXCodec that makes it aware of this fact for proper display. Also integrate back a change from eclair-mr2 that delays releasing an output buffer briefly after posting it to surface flinger, as we don't know how long it'll take it to actually display the buffer's content.
* | | | am 917d0aec: am bfd5b386: Merge change If68c168d into eclair-mr2Andreas Huber2009-10-212-4/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '917d0aece5c9395892c3a8e7191f04a1e2ca6330' * commit '917d0aece5c9395892c3a8e7191f04a1e2ca6330': Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
| * | | am bfd5b386: Merge change If68c168d into eclair-mr2Andreas Huber2009-10-212-4/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe' into eclair-mr2-plus-aosp * commit 'bfd5b38673212c47f0e386c0a8370d4ff47bd2fe': Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
| | * | Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers ↵Andreas Huber2009-10-212-4/+12
| | | | | | | | | | | | | | | | in the metadata retriever.
* | | | am ec6c6dcf: am 8cca3a6e: Merge change Ib1678609 into eclair-mr2Andreas Huber2009-10-191-1/+72
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd' * commit 'ec6c6dcf5bfd6413a07f4e39dbf8ddfa63d325dd': Avoid signaling a format change to the client if its insubstantial.
| * | | am 8cca3a6e: Merge change Ib1678609 into eclair-mr2Andreas Huber2009-10-191-1/+72
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba' into eclair-mr2-plus-aosp * commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba': Avoid signaling a format change to the client if its insubstantial.
| | * | Avoid signaling a format change to the client if its insubstantial.Andreas Huber2009-10-191-1/+72
| | | | | | | | | | | | | | | | | | | | | | | | For example, the original port settings change may just indicate a change in the number of buffers to allocate, which won't be visible to the client in any case.
* | | | am b27849d3: am eaa91ed1: Merge change I63d524fd into eclair-mr2Andreas Huber2009-10-196-5/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'b27849d3bf81bbbb1878a3fd4e1ae55ba5f953d1' * commit 'b27849d3bf81bbbb1878a3fd4e1ae55ba5f953d1': Fixing the build by renaming private "string.h" header file.
| * | | am eaa91ed1: Merge change I63d524fd into eclair-mr2Andreas Huber2009-10-196-5/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f' into eclair-mr2-plus-aosp * commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f': Fixing the build by renaming private "string.h" header file.
| | * | Fixing the build by renaming private "string.h" header file.Andreas Huber2009-10-196-5/+5
| | | |
* | | | am c3d8f16a: am 720ac1d4: am da2ecbeb: Merge change Idcaa1ef8 into eclairYu Shan Emily Lau2009-10-162-8/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d' * commit 'c3d8f16a72fe803494d68ab53442afbfb5c5ad8d': 1) Add 10 seconds wait time before collecting the end memory.
| * | | am 720ac1d4: am da2ecbeb: Merge change Idcaa1ef8 into eclairYu Shan Emily Lau2009-10-162-8/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f' into eclair-mr2-plus-aosp * commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f': 1) Add 10 seconds wait time before collecting the end memory.
| | * | am da2ecbeb: Merge change Idcaa1ef8 into eclairYu Shan Emily Lau2009-10-162-8/+12
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Merge commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007' into eclair-mr2 * commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007': 1) Add 10 seconds wait time before collecting the end memory.
| | | * 1) Add 10 seconds wait time before collecting the end memory.Yu Shan Emily Lau2009-10-152-8/+12
| | | | | | | | | | | | | | | | 2) Modified the player stress test, shorten the plabyack time.
* | | | am 4b9dbdfa: am d96f6e85: Merge change I8176f35e into eclair-mr2Andreas Huber2009-10-1612-458/+776
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '4b9dbdfa1805cfb5be1eca2d26ca18a01724839a' * commit '4b9dbdfa1805cfb5be1eca2d26ca18a01724839a': Reimplement the OMX backend for stagefright.
| * | | am d96f6e85: Merge change I8176f35e into eclair-mr2Andreas Huber2009-10-1612-458/+776
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d' into eclair-mr2-plus-aosp * commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d': Reimplement the OMX backend for stagefright.
| | * | Reimplement the OMX backend for stagefright.Andreas Huber2009-10-1612-458/+776
| | | | | | | | | | | | | | | | | | | | | | | | Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup. Changed APIs to conform to the rest of the system.
* | | | am 34cc5292: am b65a90d7: Merge change I73b00501 into eclair-mr2Ray Chen2009-10-131-0/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '34cc52922d4268633b3730dfd73658be6a06a2c5' * commit '34cc52922d4268633b3730dfd73658be6a06a2c5': Check cursor and URI value for nullity to prevent NPE.
| * | | am b65a90d7: Merge change I73b00501 into eclair-mr2Ray Chen2009-10-131-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'b65a90d76ff486208974f0b1dac8e880ba29174b' into eclair-mr2-plus-aosp * commit 'b65a90d76ff486208974f0b1dac8e880ba29174b': Check cursor and URI value for nullity to prevent NPE.
| | * | Merge change I73b00501 into eclair-mr2Android (Google) Code Review2009-10-131-0/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | * changes: Check cursor and URI value for nullity to prevent NPE.
| | | * | Check cursor and URI value for nullity to prevent NPE.Ray Chen2009-10-121-0/+2
| | | | |
* | | | | am 28af587a: am c642199d: Merge change Ibd7b43bb into eclair-mr2Andreas Huber2009-10-1322-33/+634
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '28af587a0587bc3975230a9ed4a2a44be1f31ad3' * commit '28af587a0587bc3975230a9ed4a2a44be1f31ad3': Separated private from public header files.
| * | | | am c642199d: Merge change Ibd7b43bb into eclair-mr2Andreas Huber2009-10-1322-33/+634
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c642199d1d60176980e2781bb78f42dce93e1c84' into eclair-mr2-plus-aosp * commit 'c642199d1d60176980e2781bb78f42dce93e1c84': Separated private from public header files.
| | * | | Separated private from public header files.Andreas Huber2009-10-1322-33/+634
| | | | |
* | | | | am b7a69ce8: am fe324a61: Merge change I8d87cd98 into eclair-mr2Andreas Huber2009-10-134-9/+10
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420' * commit 'b7a69ce8f2d05c523ad964e98f490fe3c060a420': Fix various compiler warnings accumulated over time.
| * | | | am fe324a61: Merge change I8d87cd98 into eclair-mr2Andreas Huber2009-10-134-9/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fe324a61c39d5db59f09fdae81c808d7851841e6' into eclair-mr2-plus-aosp * commit 'fe324a61c39d5db59f09fdae81c808d7851841e6': Fix various compiler warnings accumulated over time.