614 Commits

Author SHA1 Message Date
Andreas Huber
871e4ee81d am e8472900: Merge change Ie13526ad into eclair-mr2
Merge commit 'e84729002102622b40bd6efddffb76909615c12a' into eclair-mr2-plus-aosp

* commit 'e84729002102622b40bd6efddffb76909615c12a':
  Prefer software decoders over hardware for thumbnail extraction.
2009-10-23 08:51:19 -07:00
Andreas Huber
1f04c83684 am 1f64ffe2: Merge change Icb64cd2c into eclair-mr2
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.
2009-10-23 08:43:55 -07:00
Eric Laurent
bae0d0d4c7 am 470687e2: am dd28d563: Fix 2209967 Tonegenerator: mutex not release in 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.
2009-10-23 08:43:39 -07:00
Android (Google) Code Review
e847290021 Merge change Ie13526ad into eclair-mr2
* changes:
  Prefer software decoders over hardware for thumbnail extraction.
2009-10-23 11:42:41 -04:00
Andreas Huber
e13526ad92 Prefer software decoders over hardware for thumbnail extraction.
While our hardware decoders clearly outperform the software decoders in terms
of raw throughput, their startup latency makes them less suitable for thumbnail
extraction.
2009-10-23 08:39:00 -07:00
Android (Google) Code Review
1f64ffe2e4 Merge change Icb64cd2c into eclair-mr2
* changes:
  Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
2009-10-23 11:34:38 -04:00
Eric Laurent
470687e251 am dd28d563: Fix 2209967 Tonegenerator: mutex not release in startTone() 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.
2009-10-23 08:27:11 -07:00
Eric Laurent
dd28d56368 Fix 2209967 Tonegenerator: mutex not release in startTone() upon timeout 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.
2009-10-23 06:54:33 -07:00
Andreas Huber
7453da3f42 am e981c334: Extract video thumbnails from the largest sync sample among the first 20.
Merge commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732' into eclair-mr2-plus-aosp

* commit 'e981c33446a98d5ccc0d73c1a840696d77cf0732':
  Extract video thumbnails from the largest sync sample among the first 20.
2009-10-22 14:49:35 -07:00
Andreas Huber
e981c33446 Extract video thumbnails from the largest sync sample among the first 20.
Also fixes OMXCodec seek behaviour on the very first call to OMXCodec::read()
2009-10-22 14:22:57 -07:00
Andreas Huber
0c012efaab am f7f671ed: am b0e6a9a0: Merge change I7a03b074 into eclair
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.
2009-10-22 11:02:35 -07:00
Andreas Huber
f7f671edef am b0e6a9a0: Merge change I7a03b074 into eclair
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.
2009-10-22 10:46:50 -07:00
Andreas Huber
cb64cd2c3f Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening. 2009-10-22 08:45:28 -07:00
Andreas Huber
917d0aece5 am bfd5b386: Merge change If68c168d into eclair-mr2
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.
2009-10-21 15:24:07 -07:00
Andreas Huber
7a03b074a5 Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers. 2009-10-21 15:06:21 -07:00
Andreas Huber
f68c168d36 Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever. 2009-10-21 14:01:30 -07:00
Andreas Huber
f16a0b7399 do not merge: The qcom video decoders always output yuv data after adjusting 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.
2009-10-20 11:49:01 -07:00
Andreas Huber
ec6c6dcf5b am 8cca3a6e: Merge change Ib1678609 into eclair-mr2
Merge commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba' into eclair-mr2-plus-aosp

* commit '8cca3a6e48047201862e0d8c3b8d99e5d90266ba':
  Avoid signaling a format change to the client if its insubstantial.
2009-10-19 13:25:13 -07:00
Andreas Huber
b27849d3bf am eaa91ed1: Merge change I63d524fd into eclair-mr2
Merge commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f' into eclair-mr2-plus-aosp

* commit 'eaa91ed1ee2581b88e555d3573d327ee9864833f':
  Fixing the build by renaming private "string.h" header file.
2009-10-19 13:16:07 -07:00
Andreas Huber
b1678609ca Avoid signaling a format change to the client if its insubstantial.
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.
2009-10-19 13:06:40 -07:00
Andreas Huber
63d524fdf0 Fixing the build by renaming private "string.h" header file. 2009-10-19 10:15:44 -07:00
Yu Shan Emily Lau
c3d8f16a72 am 720ac1d4: am da2ecbeb: Merge change Idcaa1ef8 into eclair
Merge commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f' into eclair-mr2-plus-aosp

* commit '720ac1d4fa0ca3dc44c5c8dc4f57949b2f72681f':
  1) Add 10 seconds wait time before collecting the end memory.
2009-10-16 15:44:27 -07:00
Yu Shan Emily Lau
720ac1d4fa am da2ecbeb: Merge change Idcaa1ef8 into eclair
Merge commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007' into eclair-mr2

* commit 'da2ecbebd226a0fbc5ed881c541b9126d30f9007':
  1) Add 10 seconds wait time before collecting the end memory.
2009-10-16 15:21:22 -07:00
Andreas Huber
4b9dbdfa18 am d96f6e85: Merge change I8176f35e into eclair-mr2
Merge commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d' into eclair-mr2-plus-aosp

* commit 'd96f6e85931e3d4ac4a6dacbedc561e56c293b8d':
  Reimplement the OMX backend for stagefright.
2009-10-16 12:51:42 -07:00
Andreas Huber
784202ea11 Reimplement the OMX backend for stagefright.
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.
2009-10-16 11:22:43 -07:00
Yu Shan Emily Lau
999101368f 1) Add 10 seconds wait time before collecting the end memory.
2) Modified the player stress test, shorten the plabyack time.
2009-10-15 18:52:31 -07:00
Ray Chen
34cc52922d am b65a90d7: Merge change I73b00501 into eclair-mr2
Merge commit 'b65a90d76ff486208974f0b1dac8e880ba29174b' into eclair-mr2-plus-aosp

* commit 'b65a90d76ff486208974f0b1dac8e880ba29174b':
  Check cursor and URI value for nullity to prevent NPE.
2009-10-13 10:50:30 -07:00
Android (Google) Code Review
b65a90d76f Merge change I73b00501 into eclair-mr2
* changes:
  Check cursor and URI value for nullity to prevent NPE.
2009-10-13 13:43:18 -04:00
Andreas Huber
28af587a05 am c642199d: Merge change Ibd7b43bb into eclair-mr2
Merge commit 'c642199d1d60176980e2781bb78f42dce93e1c84' into eclair-mr2-plus-aosp

* commit 'c642199d1d60176980e2781bb78f42dce93e1c84':
  Separated private from public header files.
2009-10-13 10:41:12 -07:00
Andreas Huber
b7a69ce8f2 am fe324a61: Merge change I8d87cd98 into eclair-mr2
Merge commit 'fe324a61c39d5db59f09fdae81c808d7851841e6' into eclair-mr2-plus-aosp

* commit 'fe324a61c39d5db59f09fdae81c808d7851841e6':
  Fix various compiler warnings accumulated over time.
2009-10-13 10:41:03 -07:00
Andreas Huber
bd7b43bb02 Separated private from public header files. 2009-10-13 10:22:55 -07:00
Andreas Huber
8d87cd98a8 Fix various compiler warnings accumulated over time. 2009-10-13 10:06:37 -07:00
Andreas Huber
9550e2892f am cfd55579: OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
Merge commit 'cfd55579c2e20514b181809dfaf30bd6f7e04c7e' into eclair-mr2-plus-aosp

* commit 'cfd55579c2e20514b181809dfaf30bd6f7e04c7e':
  OMXCodec now notifies the reader of changes in the output format by returning a special result/error code.
2009-10-13 09:56:09 -07:00
Andreas Huber
cfd55579c2 OMXCodec now notifies the reader of changes in the output format by returning a special result/error code. 2009-10-13 09:46:46 -07:00
Andreas Huber
96c1dfccb2 am 63f20ec1: Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
Merge commit '63f20ec1a8d31c85261056c6c171140b93bcde0a' into eclair-mr2-plus-aosp

* commit '63f20ec1a8d31c85261056c6c171140b93bcde0a':
  Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
2009-10-12 16:24:53 -07:00
Andreas Huber
c55bb59e54 am ef703f60: Merge change I98276091 into eclair-mr2
Merge commit 'ef703f60d5c00527048fdaf1c24984762f6fd434' into eclair-mr2-plus-aosp

* commit 'ef703f60d5c00527048fdaf1c24984762f6fd434':
  Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
2009-10-12 16:24:46 -07:00
Andreas Huber
63f20ec1a8 Proper chunk size computation for Layer II/III V2 and V2.5, skip optional ID3 tag.
related-to-bug: 1986192
2009-10-12 16:04:30 -07:00
Andreas Huber
fa8de75250 Change to a int64_t usecs representation for timestamps and duration throughout stagefright. 2009-10-12 16:00:07 -07:00
Ray Chen
73b0050111 Check cursor and URI value for nullity to prevent NPE. 2009-10-12 13:19:34 -07:00
Ray Chen
7c86fc066a am 23a2d92f: Merge change Ib01005ea into eclair-mr2
Merge commit '23a2d92f2dd122a6f7ba39580b1d7be088ce6de0' into eclair-mr2-plus-aosp

* commit '23a2d92f2dd122a6f7ba39580b1d7be088ce6de0':
  Avoid extracting EXIF data for non-JPEG images.
2009-10-09 09:28:44 -07:00
Android (Google) Code Review
23a2d92f2d Merge change Ib01005ea into eclair-mr2
* changes:
  Avoid extracting EXIF data for non-JPEG images.
2009-10-09 12:21:37 -04:00
Andreas Huber
e1ba422636 am 936fff36: Merge change Ib64cab41 into eclair-mr2
Merge commit '936fff36882764ec031ae4fb8338273cc2abccd5' into eclair-mr2-plus-aosp

* commit '936fff36882764ec031ae4fb8338273cc2abccd5':
  Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
2009-10-09 08:50:07 -07:00
Andreas Huber
53a76bd0c9 Split the ColorConverter off SoftwareRenderer, metadata support in stagefright. 2009-10-08 15:06:09 -07:00
Ray Chen
b01005ea21 Avoid extracting EXIF data for non-JPEG images. 2009-10-08 14:53:13 -07:00
Andreas Huber
1c83540e38 am 2d295a96: Merge change Iedebfe8d into eclair-mr2
Merge commit '2d295a9601315a2610a2cb759ed9a4f787e7d4b5' into eclair-mr2-plus-aosp

* commit '2d295a9601315a2610a2cb759ed9a4f787e7d4b5':
  Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this.
2009-10-08 14:39:12 -07:00
Andreas Huber
39c923a94c am 23bccd6c: Merge change I729c3938 into eclair-mr2
Merge commit '23bccd6c25f581860487835bf7b5442589897352' into eclair-mr2-plus-aosp

* commit '23bccd6c25f581860487835bf7b5442589897352':
  Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
2009-10-08 14:38:48 -07:00
Andreas Huber
3f42707c62 Some decoders will return an error on OMX_EmptyThisBuffer to indicate that they don't support the media format, deal with this. 2009-10-08 14:21:58 -07:00
Android (Google) Code Review
23bccd6c25 Merge change I729c3938 into eclair-mr2
* changes:
  Insert a small delay after submitting to surface flinger and before returning the buffer to the decoder.
2009-10-08 17:19:10 -04:00
Andreas Huber
a6b76c35a4 am cd74c0d5: The vendor is about to check in a fix for this issue, the workaround is no longer needed
Merge commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9' into eclair-mr2-plus-aosp

* commit 'cd74c0d56c0756ceb5cfa5f06d76e17aa2ed6fb9':
  The vendor is about to check in a fix for this issue, the workaround is no longer needed
2009-10-08 09:22:29 -07:00
Andreas Huber
cd74c0d56c The vendor is about to check in a fix for this issue, the workaround is no longer needed 2009-10-08 09:12:11 -07:00