263 Commits

Author SHA1 Message Date
Andreas Huber
bfdb1e88ef am d0f3228d: resolved conflicts for merge of c66d53f9 to eclair-mr2
Merge commit 'd0f3228daa9ea26ec959cb79451e6f150648bce8' into eclair-mr2-plus-aosp

* commit 'd0f3228daa9ea26ec959cb79451e6f150648bce8':
  Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
2009-11-12 10:43:31 -08:00
Andreas Huber
d0f3228daa resolved conflicts for merge of c66d53f9 to eclair-mr2 2009-11-12 10:32:26 -08:00
Andreas Huber
4719963c86 am c66d53f9: Merge change I880541a8 into eclair
Merge commit 'c66d53f97b1fe635f576642d5720dcd441e34cce' into eclair-plus-aosp

* commit 'c66d53f97b1fe635f576642d5720dcd441e34cce':
  Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor.
2009-11-12 10:00:02 -08:00
Andreas Huber
c8d7c1492e Delegate the platform dependent hardware renderer implementation to a shared library provided by the vendor. 2009-11-12 09:36:10 -08:00
Andreas Huber
76bd517ed2 am 05eca1d4: Merge change Ie80e2381 into eclair
Merge commit '05eca1d46a45723a57899dabad698537b7faef82' into eclair-plus-aosp

* commit '05eca1d46a45723a57899dabad698537b7faef82':
  DO NOT MERGE: Squashed commit of the following:
2009-11-05 13:58:55 -08:00
Andreas Huber
dcaa220ff5 DO NOT MERGE: Squashed commit of the following:
commit 08259dd3dc9026887f9bbfedaf45866eb56ea9bc
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 5 12:02:31 2009 -0800

    DO NOT MERGE: Use PV for metadata extraction even if stagefright is used for playback.

commit 991832fe4dc012e51d3d9ed8d647c7f09991858f
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 5 11:24:11 2009 -0800

    DO NOT MERGE: Do not assert if we encounter OMX_StateInvalid. All bets are off though.

commit cec45cf302d9218fe79956cbe8a462d7ca3a10bb
Author: Andreas Huber <andih@google.com>
Date:   Mon Oct 26 16:11:54 2009 -0700

    DO NOT MERGE: 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.

commit 34a1e885ef9113d68acbc26d36fcc47fdebbed84
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 5 11:10:49 2009 -0800

    DO NOT MERGE: Fix heap corruptin in OMXNodeInstance.

commit 5a47f7439a1298b330541a7e4e647a8b44487388
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 5 11:08:19 2009 -0800

    DO NOT MERGE: Fix seek-on-initial-read behaviour of OMXCodec.

commit 45bed64722501b9f411a2940aff5aff4cc4d2e98
Author: Andreas Huber <andih@google.com>
Date:   Thu Nov 5 11:02:23 2009 -0800

    DO NOT MERGE: Renaming string.h to stagefright_string.h to avoid conflicts.

commit 6738e306a50196f31a73d4fc7b7c45faff639903
Author: Andreas Huber <andih@google.com>
Date:   Thu Oct 15 13:46:54 2009 -0700

    DO NOT MERGE: 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-11-05 13:06:17 -08:00
Eric Laurent
653d5d415c am fcae6c71: am 67b69292: Merge change I93f500a5 into eclair
Merge commit 'fcae6c71794696a074cabf20beeb02fd87853e30' into eclair-mr2-plus-aosp

* commit 'fcae6c71794696a074cabf20beeb02fd87853e30':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 01:55:51 -08:00
Eric Laurent
d889f189b5 am 67b69292: Merge change I93f500a5 into eclair
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-plus-aosp

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 00:01:50 -08:00
Eric Laurent
fcae6c7179 am 67b69292: Merge change I93f500a5 into eclair
Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2

* commit '67b692920c18f99b096dce285adc6f7439fa866c':
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 00:01:33 -08:00
Android (Google) Code Review
67b692920c Merge change I93f500a5 into eclair
* changes:
  Fix issue 2203561: Sholes: audio playing out of earpiece.
2009-11-05 02:55:26 -05:00
Eric Laurent
bda7469d9b Fix issue 2203561: Sholes: audio playing out of earpiece.
Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error.
Do the same if start fails due to the same error after time out in obtainBuffer().
Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails.
This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash.

Same modifications for AudioRecord.

Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
2009-11-04 23:47:21 -08:00
Jean-Michel Trivi
bd38397bc4 am 3d2d155a: am 7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '3d2d155a87cdd3038a2e6df8741181431cb250e1' into eclair-mr2-plus-aosp

* commit '3d2d155a87cdd3038a2e6df8741181431cb250e1':
  Add new audio sources to support the A1026 recording configurations.
2009-11-04 13:23:00 -08:00
Jean-Michel Trivi
39995fdf31 am 7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-plus-aosp

* commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488':
  Add new audio sources to support the A1026 recording configurations.
2009-11-04 12:05:45 -08:00
Jean-Michel Trivi
3d2d155a87 am 7ed0ceeb: Merge change I6869df3a into eclair
Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-mr2

* commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488':
  Add new audio sources to support the A1026 recording configurations.
2009-11-04 12:05:34 -08:00
Andreas Huber
8495359382 am ad278f22: Merge change I6bce6d87 into eclair-mr2
Merge commit 'ad278f2276de23197571e486ad387dacc7f346ee' into eclair-mr2-plus-aosp

* commit 'ad278f2276de23197571e486ad387dacc7f346ee':
  Adds a WAVExtractor for 16-bit signed PCM audio wave files.
2009-11-04 10:43:01 -08:00
Jean-Michel Trivi
6869df3a5d Add new audio sources to support the A1026 recording configurations. 2009-11-03 19:43:21 -08:00
Andreas Huber
6bce6d87b3 Adds a WAVExtractor for 16-bit signed PCM audio wave files. 2009-11-03 16:00:58 -08:00
Eric Laurent
2926bf7d9a am c69e7516: am ee98c240: Merge change I73680cd9 into eclair
Merge commit 'c69e7516482aae626eb550f5dd99f0f2f7a45909' into eclair-mr2-plus-aosp

* commit 'c69e7516482aae626eb550f5dd99f0f2f7a45909':
  Fix 2194140: [Passion] Support Audience chip.
2009-11-02 12:51:05 -08:00
Eric Laurent
c69e751648 am ee98c240: Merge change I73680cd9 into eclair
Merge commit 'ee98c24020c1634b02cde6d333968f04a0de941f' into eclair-mr2

* commit 'ee98c24020c1634b02cde6d333968f04a0de941f':
  Fix 2194140: [Passion] Support Audience chip.
2009-11-02 12:40:34 -08:00
Eric Laurent
7cd4f2523f am ee98c240: Merge change I73680cd9 into eclair
Merge commit 'ee98c24020c1634b02cde6d333968f04a0de941f' into eclair-plus-aosp

* commit 'ee98c24020c1634b02cde6d333968f04a0de941f':
  Fix 2194140: [Passion] Support Audience chip.
2009-11-02 12:40:28 -08:00
Eric Laurent
f22a0975c4 Fix 2194140: [Passion] Support Audience chip.
Added new input device DEVICE_IN_BACK_MIC.
Added new audio source AUDIO_SOURCE_CAMCORDER.
2009-11-02 10:38:22 -08:00
Andreas Huber
5647eebc3a am 9dba1f92: Merge change Ib482ce88 into eclair-mr2
Merge commit '9dba1f928021450f101013e03deacc9a0506772e' into eclair-mr2-plus-aosp

* commit '9dba1f928021450f101013e03deacc9a0506772e':
  Revive support for video encoding in OMXCodec.
2009-10-29 14:00:16 -07:00
Andreas Huber
b482ce8837 Revive support for video encoding in OMXCodec. 2009-10-29 12:02:48 -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
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
Eric Laurent
0c4ba3e1a4 am bf96aaad: Merge change Icf10db28 into eclair
Merge commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba' into eclair-plus-aosp

* 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:49 -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
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
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
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
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
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
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
Eric Laurent
415f3e2875 Fix issue 2192181: AudioFlinger must provide separated methods to set 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().
2009-10-21 12:29:37 -07:00
Andreas Huber
bfe2a8f3ed am ca404dfb: Merge change Ie3ffb526 into eclair
Merge commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-plus-aosp

* commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9':
  do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
2009-10-20 13:02:05 -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
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
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