624 Commits

Author SHA1 Message Date
Andreas Huber
52646559af am c06307cc: Merge change 24583 into eclair
Merge commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3' into eclair-plus-aosp

* commit 'c06307ccde2cc8e92fcb07d29ef5a69803d0c0b3':
  Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API.
2009-09-10 15:42:41 -07:00
Andreas Huber
e6c409632f Media MIME types now have corresponding constants in MediaDefs.h, new codec enumeration API. 2009-09-10 14:43:36 -07:00
Andreas Huber
0cb94317d7 am d9ca6a79: Merge change 24530 into eclair
Merge commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528' into eclair-plus-aosp

* commit 'd9ca6a79c6ac9cc8790aabbb42fe2ce579001528':
  Add component name to informational logging in OMXCodec.cpp
2009-09-10 11:18:52 -07:00
Andreas Huber
e087373d0b Add component name to informational logging in OMXCodec.cpp 2009-09-10 10:27:14 -07:00
Andreas Huber
6f208f448c am 466dbbfd: Merge change 24450 into eclair
Merge commit '466dbbfd4595d714127a4bc92dd9235807b88be6' into eclair-plus-aosp

* commit '466dbbfd4595d714127a4bc92dd9235807b88be6':
  Minor API change in MPEG4Writer, support for amr output into MPEG4 containers.
2009-09-10 09:44:54 -07:00
Andreas Huber
26c131006c am 546f3cd5: Merge change 24448 into eclair
Merge commit '546f3cd579b80299307d82a769aca8e8f68484ec' into eclair-plus-aosp

* commit '546f3cd579b80299307d82a769aca8e8f68484ec':
  Support for amr-wb tracks in MPEG4Extractor.
2009-09-10 09:44:49 -07:00
Andreas Huber
b71e9b4e03 am 18ed7601: Merge change 24447 into eclair
Merge commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993' into eclair-plus-aosp

* commit '18ed7601d2b5d9c3e1c610fb77499900f0c74993':
  Added some more verbose output for AMR formats. Properly fill out the output format.
2009-09-10 09:44:44 -07:00
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
c6f6253ad2 am f63e3f3c: Merge change 24512 into eclair
Merge commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79' into eclair-plus-aosp

* commit 'f63e3f3cc8c61bc9eeda980f314795412eb03b79':
  Fix issue android.permission.cts.NoAudioPermissionTest:testRouting is failing.
2009-09-10 08:17:19 -07: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
James Stokebrand
7ff0d9a60a am 16b72bbb: Merge change 24391 into eclair
Merge commit '16b72bbbc985cba7c59f52bf6969b4015f185830' into eclair-plus-aosp

* commit '16b72bbbc985cba7c59f52bf6969b4015f185830':
  RIO-7461: Update media scanner to scan AAC files.
2009-09-09 14:50:19 -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
e180af0335 am 201511cf: Calculate proper output buffer size for some more 16-bit RGB color spaces.
Merge commit '201511cf8a004d386ec9f592041ad3e3d4107184' into eclair-plus-aosp

* commit '201511cf8a004d386ec9f592041ad3e3d4107184':
  Calculate proper output buffer size for some more 16-bit RGB color spaces.
2009-09-09 11:29:43 -07:00
Andreas Huber
13a2667781 am 5a65a6e2: Added a .amr file extractor (for AMR-NB and AMR-WB content).
Merge commit '5a65a6e22017e51ebcebb0f41510c54f1085f82c' into eclair-plus-aosp

* commit '5a65a6e22017e51ebcebb0f41510c54f1085f82c':
  Added a .amr file extractor (for AMR-NB and AMR-WB content).
2009-09-09 11:25:11 -07: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
Andreas Huber
022ed17cdd am 4e60d7e6: Merge change 24179 into eclair
Merge commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c' into eclair-plus-aosp

* commit '4e60d7e60b29c42c6745dd23ff90dced8834fa7c':
  Support encoding amr-wb content in stagefright.
2009-09-09 11:02:33 -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
d3a31996e6 am db603b0b: Merge change 24114 into eclair
Merge commit 'db603b0b2c7c06ea78b8aa0bdc7ea8f08b335c3d' into eclair-plus-aosp

* commit 'db603b0b2c7c06ea78b8aa0bdc7ea8f08b335c3d':
  Fix issue 1992233: DTMF tones on Sholes is really long.
2009-09-08 23:07:51 -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
ec00bcbe54 am bde54df0: modified: tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the incorrect expected druation
Merge commit 'bde54df0209e6b3db720b14f5c7b8bd6e6372757' into eclair-plus-aosp

* commit 'bde54df0209e6b3db720b14f5c7b8bd6e6372757':
  modified:   tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
2009-09-08 19:03:35 -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
Andreas Huber
04cae64ed1 am e0f64aae: Merge change 24178 into eclair
Merge commit 'e0f64aae8c02088be1c67bd97afc495e9098561c' into eclair-plus-aosp

* commit 'e0f64aae8c02088be1c67bd97afc495e9098561c':
  The qcom decoder requires that the output buffers be allocated by the component for hardware accelerated display to work.
2009-09-08 13:42:07 -07:00
James Dong
366f2e61fe am e05e02e1: Merge change 24094 into eclair
Merge commit 'e05e02e17463616c885784a1f0e57eeb22b13f93' into eclair-plus-aosp

* commit 'e05e02e17463616c885784a1f0e57eeb22b13f93':
  Add basic metadata retrieval support for midi, ogg, etc.
2009-09-08 13:41:59 -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
Jean-Baptiste Queru
be8e36e32b merge from donut 2009-09-03 15:19:21 -07:00
Marco Nelissen
5e52884107 am e1da8be5: Merge change 23835 into eclair
Merge commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9' into eclair-plus-aosp

* commit 'e1da8be501e953cdf50b0ba2edf8fe68af8cf2b9':
  When encountering a .nomedia file, notify the MediaScannerClient,
2009-09-03 12:29:51 -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
Andreas Huber
461cb5613c am f6190284: Merge change 23715 into eclair
Merge commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b' into eclair-plus-aosp

* commit 'f619028470b63ba1c8e9d86fd2faab7bbece873b':
  Setting the component role appears to be mandatory now for all mime types.
2009-09-03 09:42:15 -07:00
Andreas Huber
ca963369c7 am 8e65337d: Merge change 23714 into eclair
Merge commit '8e65337d06a1cc4fe896d17a947d46ae5f7257a8' into eclair-plus-aosp

* commit '8e65337d06a1cc4fe896d17a947d46ae5f7257a8':
  Some work to make audio encoding work.
2009-09-03 09:42:07 -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
7838887af4 am cabd01f4: Merge change 23798 into eclair
Merge commit 'cabd01f42afd0661d6a29217c62353c2eae3149a' into eclair-plus-aosp

* commit 'cabd01f42afd0661d6a29217c62353c2eae3149a':
  Fix issue 2097083: STREAM_SYSTEM should be at max volume.
2009-09-03 08:02:46 -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
Andreas Huber
30a85367ea am 040571aa: Merge change 23632 into eclair
Merge commit '040571aa2f71031376ff37ffa827d3612eb89340' into eclair-plus-aosp

* commit '040571aa2f71031376ff37ffa827d3612eb89340':
  Increase buffer allocated to receive HTTP response, YouTube is rather verbose...
2009-09-02 10:26:13 -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
56aa70f7f2 am 854bcb95: Merge change 23539 into eclair
Merge commit '854bcb95ce5d8d75b843e8da1b691fa93395977c' into eclair-plus-aosp

* commit '854bcb95ce5d8d75b843e8da1b691fa93395977c':
  Squashed commit of the following:
2009-09-02 09:26:08 -07:00