Commit Graph

724 Commits

Author SHA1 Message Date
Yu Shan Emily Lau
79e56a215e am f97dec83: am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclair
Merge commit 'f97dec837c1fa47250af023bbaea0566a0ec9695'

* commit 'f97dec837c1fa47250af023bbaea0566a0ec9695':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 23:53:27 -07:00
Dave Sparks
52fc3989c5 am 687545fc: am 5a7691f0: am e8543418: Merge change I7c0d20a7 into eclair
Merge commit '687545fc9ee79124229152df1236c53ba7d71215'

* commit '687545fc9ee79124229152df1236c53ba7d71215':
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-28 23:53:06 -07:00
Andreas Huber
d7100526c8 am 7373755a: am 013ecbfc: am 54620b1a: Merge change I6e50a8c6 into eclair
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."
2009-10-28 23:52:20 -07:00
Andreas Huber
d6d6db484d am e113d6af: am 76a54294: Merge change I155e2ad0 into eclair-mr2
Merge commit 'e113d6af6204dac03b13b324852fe7f741ebb3d3'

* commit 'e113d6af6204dac03b13b324852fe7f741ebb3d3':
  Re-enable CameraSource.
2009-10-28 23:45:38 -07:00
Andreas Huber
9e8ae3dfbe am b1a8f54b: am 27123468: Use a simple replacement for String8 that 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).
2009-10-28 23:42:25 -07:00
Yu Shan Emily Lau
f97dec837c am 42ea8dc7: am adf4b4f5: Merge change I96458368 into eclair
Merge commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63' into eclair-mr2-plus-aosp

* commit '42ea8dc732b8231df497a7a21fb3b55e1346fd63':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 12:44:28 -07:00
Dave Sparks
687545fc9e am 5a7691f0: am e8543418: Merge change I7c0d20a7 into eclair
Merge commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b' into eclair-mr2-plus-aosp

* commit '5a7691f0e13620322103d61c9f2b1eeb908fd37b':
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-28 12:44:10 -07:00
Andreas Huber
7373755ac3 am 013ecbfc: am 54620b1a: Merge change I6e50a8c6 into eclair
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."
2009-10-28 12:43:31 -07:00
Yu Shan Emily Lau
42ea8dc732 am adf4b4f5: Merge change I96458368 into eclair
Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2

* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-28 11:38:34 -07:00
Dave Sparks
5a7691f0e1 am e8543418: Merge change I7c0d20a7 into eclair
Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-mr2

* commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85':
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-28 11:38:08 -07:00
Andreas Huber
013ecbfca2 am 54620b1a: Merge change I6e50a8c6 into eclair
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."
2009-10-28 11:37:16 -07:00
Andreas Huber
e113d6af62 am 76a54294: Merge change I155e2ad0 into eclair-mr2
Merge commit '76a5429407e821c22508eca92e7475b6433cd668' into eclair-mr2-plus-aosp

* commit '76a5429407e821c22508eca92e7475b6433cd668':
  Re-enable CameraSource.
2009-10-28 10:36:57 -07:00
Android (Google) Code Review
76a5429407 Merge change I155e2ad0 into eclair-mr2
* changes:
  Re-enable CameraSource.
2009-10-28 13:25:09 -04:00
Andreas Huber
155e2ad04c Re-enable CameraSource. 2009-10-28 10:15:07 -07:00
Andreas Huber
b1a8f54bf6 am 27123468: Use a simple replacement for String8 that allocates its storage 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).
2009-10-27 16:06:21 -07:00
Andreas Huber
27123468b3 Use a simple replacement for String8 that allocates its storage beforehand to avoid reentering the heap while we're examining it (leak checker). 2009-10-27 15:50:04 -07:00
Andreas Huber
dab3a50abc am fdde959c: am dfdf9453: Merge change I3085c83e into eclair-mr2
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.
2009-10-26 22:44:10 -07:00
Andreas Huber
fdde959c22 am dfdf9453: Merge change I3085c83e into eclair-mr2
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.
2009-10-26 22:33:42 -07:00
Android (Google) Code Review
adf4b4f5cd Merge change I96458368 into eclair
* changes:
  Fixed the H263 video duation which caused the incorrect video validation.
2009-10-26 21:10:48 -04:00
Yu Shan Emily Lau
13b93713f3 Fixed the H263 video duation which caused the incorrect video validation. 2009-10-26 18:04:11 -07:00
Android (Google) Code Review
e854341878 Merge change I7c0d20a7 into eclair
* changes:
  Run the metadataretriever at background priority. Bug 2187133.
2009-10-26 21:00:46 -04:00
Dave Sparks
7c0d20a753 Run the metadataretriever at background priority. Bug 2187133.
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.
2009-10-26 16:28:26 -07:00
Andreas Huber
3085c83e00 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. 2009-10-26 16:11:54 -07:00
Andreas Huber
6e50a8c6f5 Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
This reverts commit 7a03b074a5.
2009-10-26 11:11:02 -07:00
Eric Laurent
97d9af295d am 848f9c99: am 7ed70c95: am bf96aaad: Merge change Icf10db28 into eclair
Merge commit '848f9c99af9c1f3fe0cc30717ea4c73e6fefb527'

* commit '848f9c99af9c1f3fe0cc30717ea4c73e6fefb527':
  Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
2009-10-24 01:53:57 -07:00
Eric Laurent
848f9c99af am 7ed70c95: am bf96aaad: Merge change Icf10db28 into eclair
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.
2009-10-24 01:47:59 -07:00
Eric Laurent
7ed70c9515 am bf96aaad: Merge change Icf10db28 into eclair
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.
2009-10-24 01:38:58 -07:00
Android (Google) Code Review
bf96aaadd4 Merge change Icf10db28 into eclair
* changes:
  Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
2009-10-24 04:32:28 -04:00
Andreas Huber
fdfb6674a0 am c91e3d8d: am d9f3d60d: Merge change I3b1b7873 into eclair-mr2
Merge commit 'c91e3d8d897f7299269e177c2891fde31cfc6ae1'

* commit 'c91e3d8d897f7299269e177c2891fde31cfc6ae1':
  New API to instantiate a MediaExtractor given a URI and optional MIME type.
2009-10-23 13:10:52 -07:00
Andreas Huber
c91e3d8d89 am d9f3d60d: Merge change I3b1b7873 into eclair-mr2
Merge commit 'd9f3d60df9317f15a7f26bc050f51b53b46898ff' into eclair-mr2-plus-aosp

* commit 'd9f3d60df9317f15a7f26bc050f51b53b46898ff':
  New API to instantiate a MediaExtractor given a URI and optional MIME type.
2009-10-23 13:00:43 -07:00
Andreas Huber
d437ac6a7c am d919aa74: am 9069aa31: Merge change I57515f33 into eclair-mr2
Merge commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af'

* commit 'd919aa74927fcabd18a9ea14a57f44240aecc7af':
  Moving the individual extractor headers files to the private include directory.
2009-10-23 10:37:24 -07:00
Andreas Huber
9a12baf929 New API to instantiate a MediaExtractor given a URI and optional MIME type.
Also DataSources now must provide a method initCheck()
and DataSource::reat_at has been renamed to readAt to conform to
standard API naming guidelines.
2009-10-23 10:35:08 -07:00
Andreas Huber
d919aa7492 am 9069aa31: Merge change I57515f33 into eclair-mr2
Merge commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56' into eclair-mr2-plus-aosp

* commit '9069aa31accee9c23a4cf228ca27fe8fa8506a56':
  Moving the individual extractor headers files to the private include directory.
2009-10-23 10:26:18 -07:00
Andreas Huber
57515f334b Moving the individual extractor headers files to the private include directory. 2009-10-23 09:55:10 -07:00
Andreas Huber
0220192211 am f57b07df: am ad285430: Make stagefright a little less verbose. Fix heap corruption for real.
Merge commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9'

* commit 'f57b07dfa82aba5397e54d741ce6de0d1dcd73c9':
  Make stagefright a little less verbose. Fix heap corruption for real.
2009-10-23 09:54:51 -07:00
Andreas Huber
4601d30804 am 871e4ee8: am e8472900: Merge change Ie13526ad into eclair-mr2
Merge commit '871e4ee81d6fa310dbfc5f6f37f3d8a780a28ddc'

* commit '871e4ee81d6fa310dbfc5f6f37f3d8a780a28ddc':
  Prefer software decoders over hardware for thumbnail extraction.
2009-10-23 09:54:35 -07:00
Andreas Huber
f57b07dfa8 am ad285430: Make stagefright a little less verbose. Fix heap corruption for real.
Merge commit 'ad28543022101d0b01845e3f53dcd57e524816ef' into eclair-mr2-plus-aosp

* commit 'ad28543022101d0b01845e3f53dcd57e524816ef':
  Make stagefright a little less verbose. Fix heap corruption for real.
2009-10-23 09:43:54 -07:00
Andreas Huber
0371a4d783 am 1f04c836: am 1f64ffe2: Merge change Icb64cd2c into eclair-mr2
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.
2009-10-23 09:27:58 -07:00
Eric Laurent
37c72552ea am bae0d0d4: am 470687e2: am dd28d563: Fix 2209967 Tonegenerator: mutex not 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.
2009-10-23 09:27:40 -07:00
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
ad28543022 Make stagefright a little less verbose. Fix heap corruption for real. 2009-10-23 08:48:12 -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
4d5d6c0f3f am 7453da3f: am e981c334: Extract video thumbnails from the largest sync sample among the first 20.
Merge commit '7453da3f420b74f5bb135d5895b82dca9c015bb3'

* commit '7453da3f420b74f5bb135d5895b82dca9c015bb3':
  Extract video thumbnails from the largest sync sample among the first 20.
2009-10-22 19:04:51 -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