340 Commits

Author SHA1 Message Date
Android (Google) Code Review
bc86bda499 Merge change 22897 into eclair
* changes:
  Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
2009-08-27 11:37:35 -07:00
Android (Google) Code Review
e0daf8043f Merge change 22921 into eclair
* changes:
  An attempt to fix a deadlock between OMXCodec::start and upstream ::read
2009-08-27 11:18:36 -07:00
Android (Google) Code Review
6ff90cf2b3 Merge change 22870 into eclair
* changes:
  Set Routing to A2DP only when state is Connected.
2009-08-27 11:08:55 -07:00
Jaikumar Ganesh
78333dd750 Set Routing to A2DP only when state is Connected.
We were setting the routing to A2DP when the state was Connecting too.
This was incorrect and can cause problems. One such problem was when
handling an incoming connection we set the routing to A2DP before
authorization. And even if authorization succeeds we get out sync with
AVDTP command state.
2009-08-27 11:03:00 -07:00
Andreas Huber
42978e55fe An attempt to fix a deadlock between OMXCodec::start and upstream ::read 2009-08-27 10:41:13 -07:00
Eric Laurent
327c27be19 Fix issue 2045911: Camera Shutter tone does not play correctly while listening to music.
Add the possibility to delay routing and volume commands in AudioPolicyClientInterface. The delay is not blocking for the caller.
2009-08-27 05:58:10 -07:00
Andreas Huber
127fcdcd9f Another quirk, some OMX components fail to properly flush before shutdown and we must do it for them... 2009-08-26 16:27:02 -07:00
Andreas Huber
b5ceb9ee21 assert => CHECK in stagefright. 2009-08-26 14:48:20 -07:00
Andreas Huber
d7795892a5 Disregard the EOS buffer flag while flushing or shutting down the decoder. 2009-08-26 10:33:47 -07:00
Andreas Huber
446f44f61a Keep up with latest changes to overlay handling on that unnamable platform. 2009-08-26 09:11:13 -07:00
Eric Laurent
6ee9952bc2 Fix issue 2076322: AudioService, too many stream volume steps.
MAX_STREAM_VOLUME[] now contains the maximum valid index instead of the number of indexes for all stream types.
2009-08-26 05:23:20 -07:00
Android (Google) Code Review
f96d49a277 Merge change 22646 into eclair
* changes:
  Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder.
2009-08-25 14:35:12 -07:00
Andreas Huber
404cc418be Make sure not to ask for more buffers when we know that there won't be any, added a quirk for the aac decoder. 2009-08-25 14:26:05 -07:00
Yu Shan Emily Lau
523018f182 am b56de747: Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
Merge commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8' into eclair

* commit 'b56de7474d93e634f77be58a794fbd1b0e68f6a8':
  Revert "	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
2009-08-25 10:42:02 -07:00
Yu Shan Emily Lau
b56de7474d Revert " modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java"
This reverts commit 051d8d6692a4f8d852f6336d1e31a3a907913ac7.
2009-08-25 10:21:31 -07:00
Dianne Hackborn
e1a7ad23e0 Fix build.
Change-Id: I7a21bc2151fb2a9a1135f676b563f40609bc997b
2009-08-24 18:27:08 -07:00
Dianne Hackborn
4a51c20ce6 I am getting tired of the java doc warnings, so fix them.
Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
2009-08-24 17:37:32 -07:00
Yu Shan Emily Lau
b91c52f773 am 8c937a17: Merge change 22379 into donut
Merge commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78' into eclair

* commit '8c937a17667704ee9ba60663f4c4b76f3c3a0f78':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-24 10:14:25 -07:00
Yu Shan Emily Lau
051d8d6692 modified: MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
Fixed the passing incorrect media names and add the localH263AMRprepareAsync test.

	modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-21 19:20:42 -07:00
Andreas Huber
5c0a9133d2 Dynamically allocate a pair of MemoryHeaps according buffer count/sizes required by the OMX component, respect JPEG compressed size. 2009-08-20 11:16:40 -07:00
Nick Pelly
a56d1c7219 Fix AudioService on HFP power off due to new Bluetooth API.
HEADSET_STATE_CHANGED_ACTION contains a null BluetoothDevice when the HFP
disconnects.
2009-08-19 15:20:39 -07:00
Andreas Huber
ebf66ea2f8 Better (proper) parsing of the AVCDecoderConfigurationRecord, respect hardware decoder profile/level limits. 2009-08-19 13:32:58 -07:00
Andreas Huber
4f5e602e17 The PV AVC software decoder expects each fragment of a NAL unit to be handed to the decoder unframed. 2009-08-19 09:37:46 -07:00
Feng Qian
1fd769ceea Fix missing -lpthread in linux-sim build.
It mimics the behavior in libstagefraight/Android.mk
2009-08-18 11:00:30 -07:00
Nick Pelly
bd022f423a Bluetooth: API change.
Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.

BluetoothAdapter: Represents the local BT adapter. Operations on the local
                  adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
                 (pair, connect, etc).

IBluetoothDevice.aidl -> Bluetooth.aidl
BluetoothDeviceService.java -> BluetoothDeviceService.java

TODO:
Javadoc
2009-08-18 08:24:22 -07:00
Andreas Huber
2f10ae08d4 Support for marshalling pointers / intptr_t in Parcel.
Some refactoring to eliminate code duplication in Parcel implementation.
2009-08-17 15:31:25 -07:00
Andreas Huber
be06d26cdc Squashed commit of the following:
commit 5bb012f0065f7ffaaeb4f569d71f0e3a8d6b19c3
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 14 10:40:08 2009 -0700

    An attempt at fixing export using the qcom encoders. More quirks.

commit 0690e76bfa48118a68287ccf1bbfa82febaa620c
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 14 09:08:28 2009 -0700

    Callbacks are now dispatched from a separate thread in OMX.

commit c6571a039526df29b6343f9a1971dbc019088c61
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 13 15:42:25 2009 -0700

    Massive API changes throughout stagefright, smart pointers everywhere.

commit 900612af6a0555664d9ba195112cd859491265f4
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 13 13:33:12 2009 -0700

    OMXCodecs now properly shutdown.

commit 96732f05e1b0603dcd1b11f16a23512592eeb4f5
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 13 12:04:04 2009 -0700

    More work on JPEG decoding using the hardware OMX component.

commit 63839a073ac393e3a130434ba467969053b694ad
Author: Andreas Huber <andih@google.com>
Date:   Wed Aug 12 13:13:31 2009 -0700

    An attempt to drive the JPEG decoder OMX node.

commit 3ac2fe5ab2926eda81b2123610b2434c645294ff
Author: Andreas Huber <andih@google.com>
Date:   Tue Aug 11 16:38:21 2009 -0700

    Renamed StateMachine to OMXCodec and put it in its proper place.

commit 247da75a96bf8881956413023dd49a84d5b4f5b2
Author: Andreas Huber <andih@google.com>
Date:   Tue Aug 11 16:06:19 2009 -0700

    Statemachine is now a full-fledged MediaSource.

commit 045244f6771fa0b9b329495c953afda900a84b71
Author: Andreas Huber <andih@google.com>
Date:   Fri Aug 7 09:16:54 2009 -0700

    Properly setup the input format when exporting to AMR audio.

commit 271b984cb32c5cd9e46e3f90ae121f334e4b8da9
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 6 09:59:38 2009 -0700

    Added some code to test audio encoding to the OMX harness.

commit 79af4748e4af33bd66d3fbac606e332a69741cf4
Author: Andreas Huber <andih@google.com>
Date:   Wed Aug 5 14:36:22 2009 -0700

    Merge the old OMXDecoder and the new, shiny, StateMachine code.

commit 91cf5dd77a8762bc10a0b2ffce35e3bbeb262231
Author: Andreas Huber <andih@google.com>
Date:   Tue Aug 4 17:41:43 2009 -0700

    A new harness to test OMX node compliance (and quirks).
2009-08-17 10:24:50 -07:00
Chih-Chung Chang
099397cbd0 Fix 1860351: Put datetime in jpeg exif to datetaken field. 2009-08-17 19:43:24 +08:00
Sahil Sachdeva
c9706f0262 DO NOT MERGE, ALready merged to master.
1440173 [NJ-1331] MetaData utility parse the wrong m4a meta data. Changes to Java, application side.
2009-08-14 14:52:23 -07:00
Jared Suttles
5982013cfc Change the number of volume steps from 6 to 7 per Verizon Requirements
Submitted on behalf of Helen Tran <Helen.Tran@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
2009-08-13 21:27:55 -07:00
Mike Lockwood
e840928a33 libdrm: "==" should be an assignment.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-12 11:32:36 -04:00
Chia-chi Yeh
188f5a7106 DO NOT MERGE: cherry-pick: libdrm1: Use libcrypto instead of libaes.
It seems that libdrm1 was the only user of libaes.
Now libaes is no longer required and removing it saves 36 kilobytes.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-11 21:14:09 -04:00
Wu-cheng Li
2ac8c27988 am cb2b2378: Merge change 20729 into donut
Merge commit 'cb2b2378c735e687c15e2af7f908c68ffae5fe90'

* commit 'cb2b2378c735e687c15e2af7f908c68ffae5fe90':
  Fix the bug that EXIF attributes are always cached.
2009-08-11 18:12:00 -07:00
Eric Laurent
c4e58c0f31 Fix issue 2045983 ToneGenerator: fix void statement.
There is a void statement at line 917 of ToneGenerator.cpp: mState == TONE_IDLE;
This problem is harmless as in current code this execution path is never taken; it can only happen if a "new" operator fails in prepareWave() which is a case we usually consider as unlikely in android audio framework.
2009-08-11 09:57:45 -07:00
Wu-cheng Li
b826bf9182 Fix the bug that EXIF attributes are always cached.
b2039501
2009-08-11 23:37:01 +08:00
Andreas Huber
ccf8b94169 Expose a variation of the createRenderer API that works on a plain Surface. 2009-08-10 12:58:05 -07:00
Andreas Huber
e9ec12c47e Deprecate/remove now unused socketpair ipc communication in favour of exclusive binder use. 2009-08-10 10:29:40 -07:00
Android (Google) Code Review
03a9746200 Merge change 20422
* changes:
  Build the stagefright library by default.
2009-08-07 11:09:44 -07:00
Andreas Huber
0d596d4724 Build the stagefright library by default. 2009-08-07 10:40:34 -07:00
Eric Laurent
d5603c126a AudioService now differentiates BT headsets and car kits.
The BT headset detection now makes the difference between car kits and headsets, which can be used by audio policy manager.
The headset connection is also detected earlier, that is when the headset is connected and not when the SCO socket is connected as it was the case before. This allows the audio policy manager to suspend A2DP output while ringing if a SCO headset is connected.
2009-08-07 10:31:53 -07:00
Android (Google) Code Review
1420bf3ec6 Merge change 9674
* changes:
  Fix problem in AudioTrack with 8 bit PCM and direct output.
2009-08-07 09:10:15 -07:00
Eric Laurent
ddb78e7753 Fix issue 2001214: AudioFlinger and AudioPolicyService interfaces should not use pointers as handles to inputs and outputs.
Use integers instead of void* as input/output handles at IAudioFlinger and IAudioPolicyService interfaces.
AudioFlinger maintains an always increasing count of opened inputs or outputs as unique ID.
2009-08-07 00:27:19 -07:00
Yu Shan Emily Lau
6874e3df0e am 3397f169: Capture the start and end memory usage in the output file. Move the start memory catpure after 10 loops.
Merge commit '3397f16949d2e86442c32f3b82d5ee3ace99ba82'

* commit '3397f16949d2e86442c32f3b82d5ee3ace99ba82':
  Capture the start and end memory usage in the output file. Move the start memory catpure after 10 loops.
2009-08-06 18:14:39 -07:00
Yu Shan Emily Lau
3397f16949 Capture the start and end memory usage in the output file. Move the start memory catpure after 10 loops. 2009-08-06 17:42:29 -07:00
Andreas Huber
6e1584ccd3 The mp3 decoder now correctly uses microseconds to measure time. One less quirk. 2009-08-06 15:52:12 -07:00
Chia-chi Yeh
64e69e8ab8 libdrm1: Use libcrypto instead of libaes.
It seems that libdrm1 was the only user of libaes.
Now libaes is no longer required and removing it saves 36 kilobytes.
2009-08-05 22:01:28 -04:00
Yu Shan Emily Lau
859c37548f am bd014e07: Remove the memory capture in the first run and make it the same as the cupcake test case.
Merge commit 'bd014e07e2e95d4ac706c6863e2587bd96daa51e'

* commit 'bd014e07e2e95d4ac706c6863e2587bd96daa51e':
  Remove the memory capture in the first run and make it the same as the cupcake test case.
2009-08-05 12:16:18 -07:00
Yu Shan Emily Lau
bd014e07e2 Remove the memory capture in the first run and make it the same as the cupcake test case. 2009-08-05 11:44:51 -07:00
Andreas Huber
ea03f4af10 Recording/Export to .mp4/h.263 somewhat works on TI hardware. 2009-08-05 09:46:40 -07:00
Eric Laurent
28ad42b58c Fix problem in AudioTrack with 8 bit PCM and direct output.
Do not perform 8 to 16 bit conversion in AudioTrack write() and processAudioBuffer() if direct output flag is set.
2009-08-04 10:42:26 -07:00