481 Commits

Author SHA1 Message Date
Android (Google) Code Review
466dbbfd45 Merge change 24450 into eclair
* changes:
  Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
2009-09-10 12:39:26 -04:00
Android (Google) Code Review
546f3cd579 Merge change 24448 into eclair
* changes:
  Support for amr-wb tracks in MPEG4Extractor.
2009-09-10 12:39:16 -04:00
Android (Google) Code Review
18ed7601d2 Merge change 24447 into eclair
* changes:
  Added some more verbose output for AMR formats. Properly fill out the output format.
2009-09-10 12:39:08 -04:00
Eric Laurent
dc1d17a1db Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
Add audio permission checks in setSpeakerphoneOn() and setBluetoothScoOn() methods.
2009-09-10 00:48:21 -07:00
Andreas Huber
033e6c3a68 Minor API change in MPEG4Writer, support for amr output into MPEG4 containers. 2009-09-09 16:36:12 -07:00
Andreas Huber
2a651177be Support for amr-wb tracks in MPEG4Extractor. 2009-09-09 16:33:53 -07:00
Andreas Huber
7ae02c8855 Added some more verbose output for AMR formats. Properly fill out the output format. 2009-09-09 16:29:47 -07:00
Android (Google) Code Review
16b72bbbc9 Merge change 24391 into eclair
* changes:
  RIO-7461: Update media scanner to scan AAC files. (Change in frameworks/base git)
2009-09-09 17:42:32 -04:00
Andreas Huber
201511cf8a Calculate proper output buffer size for some more 16-bit RGB color spaces. 2009-09-09 11:24:33 -07:00
James Stokebrand
a79da2e9b4 RIO-7461: Update media scanner to scan AAC files.
(Change in frameworks/base git)
2009-09-09 11:22:21 -07:00
Andreas Huber
5a65a6e220 Added a .amr file extractor (for AMR-NB and AMR-WB content). 2009-09-09 11:05:42 -07:00
Android (Google) Code Review
4e60d7e60b Merge change 24179 into eclair
* changes:
  Support encoding amr-wb content in stagefright.
2009-09-09 13:55:48 -04:00
Eric Laurent
8a77a995c9 Fix issue 2107584: media server crash when AudioFlinger fails to allocate memory for track control block.
AudioFlinger: verify that mCblk is not null before using it in Track and RecordTrack contructors.
IAudioFlinger: check result of remote transaction before reading IAudioTrack and IAudioRecord.
IAudioTrack and IAudioRecord: check result of remote transaction before reading IMemory.
2009-09-09 05:16:08 -07:00
Eric Laurent
96c08a69ea Fix issue 1992233: DTMF tones on Sholes is really long.
Add a parameter to ToneGenerator.startTone() allowing the caller to specify the tone duration. This is used by the phone application to have a precise control on the DTMF tone duration which was not possible with the use of delayed messaged.
Also modified AudioFlinger output threads so that 0s are written to the audio output stream when no more tracks are ready to mix instead of just sleeping. This avoids an issue where the end of a previous DTMF tone could stay in audio hardware buffers and be played just before the beginning of the next DTMF tone.
2009-09-08 22:56:07 -07:00
Yu Shan Emily Lau
bde54df020 modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
Fixed the incorrect expected druation
2009-09-08 18:55:01 -07:00
Android (Google) Code Review
e0f64aae8c Merge change 24178 into eclair
* changes:
  The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.
2009-09-08 13:07:45 -07:00
Andreas Huber
ee606e66b0 Support encoding amr-wb content in stagefright. 2009-09-08 12:55:50 -07:00
Andreas Huber
a7d0cf490a The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work. 2009-09-08 11:38:14 -07:00
James Dong
392ff3b529 Add basic metadata retrieval support for midi, ogg, etc.
Bug 2050320
2009-09-08 11:04:53 -07:00
Android (Google) Code Review
e1da8be501 Merge change 23835 into eclair
* changes:
  When encountering a .nomedia file, notify the MediaScannerClient, so that it can erase the data column for entries that are in the folder containing the .nomedia file. This prevents us from deleting (via a delete trigger) files when somebody adds a .nomedia file after the fact.
2009-09-03 12:27:26 -07:00
Marco Nelissen
8b04661700 When encountering a .nomedia file, notify the MediaScannerClient,
so that it can erase the data column for entries that are in the
folder containing the .nomedia file. This prevents us from
deleting (via a delete trigger) files when somebody adds a
.nomedia file after the fact.
2009-09-03 11:22:28 -07:00
Android (Google) Code Review
f619028470 Merge change 23715 into eclair
* changes:
  Setting the component role appears to be mandatory now for all mime types.
2009-09-03 09:40:17 -07:00
Android (Google) Code Review
8e65337d06 Merge change 23714 into eclair
* changes:
  Some work to make audio encoding work.
2009-09-03 09:40:08 -07:00
Eric Laurent
9d85d5adf9 Fix issue 2097083: STREAM_SYSTEM should be at max volume.
Changed default volume for STREAM_SYSTEM and STREAM_SYSTEM_ENFORCED to the maximum value.
2009-09-03 01:28:26 -07:00
Andreas Huber
4c48342572 Setting the component role appears to be mandatory now for all mime types.
Also using CODEC_LOGV instead of vanilla LOGV to include the component name the message related to.
2009-09-02 16:05:36 -07:00
Andreas Huber
da050cf206 Some work to make audio encoding work. 2009-09-02 14:01:43 -07:00
Android (Google) Code Review
040571aa2f Merge change 23632 into eclair
* changes:
  Increase buffer allocated to receive HTTP response, YouTube is rather verbose...
2009-09-02 10:05:45 -07:00
Andreas Huber
7272f7f9aa Increase buffer allocated to receive HTTP response, YouTube is rather verbose...
Yes, I know, fixed buffers are bad.
2009-09-02 09:24:09 -07:00
Andreas Huber
43ad6eaf77 Squashed commit of the following:
commit c45bfbb97ccd05982008df47181f9c73abaf0497
Author: Andreas Huber <andih@google.com>
Date:   Tue Sep 1 15:58:12 2009 -0700

    This quirk should not be enabled by default in order to make the bug reproducible by the vendor.

commit 21d72e80e795fcae53d9c3bcc8ba6312b081e420
Author: Andreas Huber <andih@google.com>
Date:   Tue Sep 1 15:55:45 2009 -0700

    Undoing the hack to temporarily give up the lock to facilitate reading from the buffer source.

    This simply causes too many issues, there need to be independent threads providing input buffers and dequeuing output buffers.

commit 84d507def8999c146ce124cc8edfe106c9ca70c2
Author: Andreas Huber <andih@google.com>
Date:   Tue Sep 1 15:16:23 2009 -0700

    The AAC components appear to output stereo data even if the input data is mono...
2009-09-01 16:02:43 -07:00
Chih-Chung Chang
a7bdedabf4 Fix 2081525: NPE in MediaScannerService.
Handle the case where the datetime string in jpeg exif is not in the format we expect.

Change-Id: I5462052c3dd723d01bce45f4924137632d081400
2009-09-01 12:23:43 +08:00
Android (Google) Code Review
bf1071c079 Merge change 23356 into eclair
* changes:
  Temporarily unlock our mutex while fetching a buffer from the upstream source.
2009-08-31 16:44:46 -07:00
Andreas Huber
6db4aad623 Temporarily unlock our mutex while fetching a buffer from the upstream source. 2009-08-31 16:40:08 -07:00
Android (Google) Code Review
52d6245ba2 Merge change 22995 into eclair
* changes:
  	modified:   res/layout/surface_view.xml 	modified:   src/com/android/mediaframeworktest/MediaFrameworkTest.java 	modified:   src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java         Fixed the async mp3 playback test case and also switch the base activity to full screen.
2009-08-31 12:07:07 -07:00
Yu Shan Emily Lau
d3b0d642c9 modified: res/layout/surface_view.xml
modified:   src/com/android/mediaframeworktest/MediaFrameworkTest.java
	modified:   src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
        Fixed the async mp3 playback test case and also switch the base activity to full screen.

	modified:   src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java

	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java

	modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java
2009-08-31 11:57:30 -07:00
Andreas Huber
d06e5b877c Fixes a race condition between entering ERROR state and initial buffer submit. 2009-08-28 13:18:14 -07:00
Daniel Sandler
c035f7c79f Final high-density frameworks artwork drop from designers (dated 25-Aug-2009). 2009-08-28 09:04:53 -04:00
Android (Google) Code Review
bf8ecd7c7e Merge change 22991 into eclair
* changes:
  Apparently setting the preferred role of the OMX component is now required on this platform.
2009-08-27 16:34:15 -07:00
Andreas Huber
813a875286 Apparently setting the preferred role of the OMX component is now required on this platform. 2009-08-27 15:28:12 -07:00
Android (Google) Code Review
c1dccce741 Merge change 22986 into eclair
* changes:
  Squashed commit of the following:
2009-08-27 15:24:35 -07:00
Andreas Huber
329577aa6d Squashed commit of the following:
commit 3fa5f3ce910f34da0cedb8bcce1bd593db7eb740
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 27 14:48:54 2009 -0700

    Getting rid of more code now obsolete with the departure of OMXDecoder.

commit e0d923ec0c7bb60bec8eb97739036a4c70c0feef
Author: Andreas Huber <andih@google.com>
Date:   Thu Aug 27 14:33:06 2009 -0700

    Remove obsoleted OMXDecoder class. OMXDecoder is dead, long live OMXCodec.
2009-08-27 14:50:58 -07:00
Andreas Huber
3986afef0c Fix a typo. 2009-08-27 14:05:47 -07:00
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