553 Commits

Author SHA1 Message Date
Marco Nelissen
38729e69ad am c39d2e3c: Music visualizer support hack. This currently assumes 44k stereo (won\'t crash on other formats, but won\'t give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb.
Merge commit 'c39d2e3c012fb96999991e30659a474f9f30f789' into eclair-plus-aosp

* commit 'c39d2e3c012fb96999991e30659a474f9f30f789':
  Music visualizer support hack.
2009-10-07 11:52:39 -07:00
Marco Nelissen
c39d2e3c01 Music visualizer support hack.
This currently assumes 44k stereo (won't crash on other formats, but won't give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb.
2009-10-06 08:51:16 -07:00
Dianne Hackborn
943c8e7de6 am 29e4a3c5: Update from API review.
Merge commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba' into eclair-plus-aosp

* commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba':
  Update from API review.
2009-09-30 23:27:41 -07:00
Dianne Hackborn
29e4a3c566 Update from API review.
Change-Id: I16b1c566f91167aac9615ac59dd297a154c828ea
2009-09-30 23:21:02 -07:00
Ray Chen
a6715ca6f9 am f09edd60: Merge change Id60fa26a into eclair
Merge commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c' into eclair-plus-aosp

* commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c':
  Fix issue 2152541	thumbnail images stretched.
2009-09-30 22:18:41 -07:00
Android (Google) Code Review
f09edd6037 Merge change Id60fa26a into eclair
* changes:
  Fix issue 2152541	thumbnail images stretched.
2009-10-01 01:12:35 -04:00
Ray Chen
ef093cd6c4 Fix issue 2152541 thumbnail images stretched. 2009-09-30 22:05:33 -07:00
Eric Laurent
46c5fdf60b am 3f56d21b: Merge change I89e74ba1 into eclair
Merge commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e' into eclair-plus-aosp

* commit '3f56d21bf10e0ce866e16112a4ad043c6af1923e':
  Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
2009-09-30 21:16:47 -07:00
Eric Laurent
89e74ba141 Fix Issue 2158631: AudioService: volume control sometimes not restored after media server process crash.
The problem comes from the fact that the AudioSystem callback indicating that the media server is active again is ignored if it is received before the delayed message indicating media server death. This happens if another application or service running in the system server process makes a request to the AudioSystem in the interval between the death of the media server and the reception of the corresponding delayed message.

The fix consists in resetting mMediaServerOk flags immediately when the death callback is received and not when the delayed message is received.
2009-09-30 18:26:36 -07:00
Jianhong Jiang
722eba008c am 37b0f279: Merge change I999f1aeb into eclair
Merge commit '37b0f279a6a237ae366c4861cde3f774f5ab811c' into eclair-plus-aosp

* commit '37b0f279a6a237ae366c4861cde3f774f5ab811c':
  Remove audio latency fudge factor 96 msec.
2009-09-29 23:23:08 -07:00
Android (Google) Code Review
37b0f279a6 Merge change I999f1aeb into eclair
* changes:
  Remove audio latency fudge factor 96 msec.
2009-09-30 02:18:15 -04:00
Jianhong Jiang
999f1aebf7 Remove audio latency fudge factor 96 msec. 2009-09-29 23:12:39 -07:00
Yu Shan Emily Lau
f1fa1eacaa am edd942c2: Merge change I55a6ac8c into eclair
Merge commit 'edd942c2de8f9b75d22f89eb160fe0e0f6191c69' into eclair-plus-aosp

* commit 'edd942c2de8f9b75d22f89eb160fe0e0f6191c69':
  Fixed the long recorder time and reduce the number of loops.
2009-09-29 22:13:57 -07:00
Android (Google) Code Review
edd942c2de Merge change I55a6ac8c into eclair
* changes:
  Fixed the long recorder time and reduce the number of loops.
2009-09-30 01:10:54 -04:00
Yu Shan Emily Lau
55a6ac8c54 Fixed the long recorder time and reduce the number of loops. 2009-09-29 21:38:39 -07:00
Chih-Chung Chang
412933234a am 8bbba0e3: Merge change If5722b3f into eclair
Merge commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0' into eclair-plus-aosp

* commit '8bbba0e35b0dd5191c94b2aa039aa4eae0aecad0':
  Dont NPE if the thumbnail file cannot be opened.
2009-09-29 17:00:24 -07:00
Android (Google) Code Review
8bbba0e35b Merge change If5722b3f into eclair
* changes:
  Dont NPE if the thumbnail file cannot be opened.
2009-09-29 19:52:23 -04:00
Chih-Chung Chang
f5722b3f22 Dont NPE if the thumbnail file cannot be opened. 2009-09-29 16:31:16 -07:00
Eric Laurent
efc42d3a5b am 7d987180: Merge change I19f2928b into eclair
Merge commit '7d9871805beef4ea5e319f1a11ab32f610031845' into eclair-plus-aosp

* commit '7d9871805beef4ea5e319f1a11ab32f610031845':
  Fix issue 2141503: Keyclick sound doesn't honor volume settings.
2009-09-29 15:18:10 -07:00
Android (Google) Code Review
7d9871805b Merge change I19f2928b into eclair
* changes:
  Fix issue 2141503: Keyclick sound doesn't honor volume settings.
2009-09-29 18:12:54 -04:00
Eric Laurent
a2ef57dba9 Fix issue 2141503: Keyclick sound doesn't honor volume settings.
Use music stream volume minus 3 dB for sound effects if volume is not explicitly requested by application.
2009-09-29 15:00:40 -07:00
James Dong
b8bf70acee am 4c232c5b: Merge change Idd16976f into eclair
Merge commit '4c232c5b3f7fcbea73cd3cec2d3befe06e85c068' into eclair-plus-aosp

* commit '4c232c5b3f7fcbea73cd3cec2d3befe06e85c068':
  Fix some metadata retriever issues:
2009-09-29 13:32:28 -07:00
Ray Chen
06e5b76667 am 0167263b: Merge change Ide90d0cc into eclair
Merge commit '0167263bf457164a17f612ec551313f1b9e42972' into eclair-plus-aosp

* commit '0167263bf457164a17f612ec551313f1b9e42972':
  Unify Java NIO to read/write MiniThumbFile.
2009-09-29 13:32:14 -07:00
Android (Google) Code Review
4c232c5b3f Merge change Idd16976f into eclair
* changes:
  Fix some metadata retriever issues: 1. mRetriever was initialized twice: one in the constructor and the other in the setDataSource 2. cached the mode so that setMode can still be called before setDataSource.    mRetriever won't be initialized until data source is set; thus we have to do this
2009-09-29 16:27:27 -04:00
Ray Chen
ecc97cc949 Unify Java NIO to read/write MiniThumbFile. 2009-09-29 13:11:20 -07:00
James Dong
67fc234a2f Fix some metadata retriever issues:
1. mRetriever was initialized twice: one in the constructor and the other in the setDataSource
2. cached the mode so that setMode can still be called before setDataSource.
   mRetriever won't be initialized until data source is set; thus we have to do this
2009-09-29 12:43:12 -07:00
James Dong
9365c8fa7c am 99638e74: Merge change 27466 into eclair
Merge commit '99638e747251929191f7773d2a81bbea223f1e09' into eclair-plus-aosp

* commit '99638e747251929191f7773d2a81bbea223f1e09':
  Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 11:49:22 -07:00
Android (Google) Code Review
99638e7472 Merge change 27466 into eclair
* changes:
  Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 14:40:34 -04:00
James Dong
525ad18663 Turn on thubmnail capture unit test for media metadata retriever 2009-09-28 10:57:17 -07:00
Marco Nelissen
14e8e988cf am 7d973514: Merge change 27449 into eclair
Merge commit '7d9735142f75c3bf30b420fdd006dc356f32fede' into eclair-plus-aosp

* commit '7d9735142f75c3bf30b420fdd006dc356f32fede':
  Always consider m4a files as audio, even when they contain a video track.
2009-09-28 09:27:10 -07:00
Android (Google) Code Review
7d9735142f Merge change 27449 into eclair
* changes:
  Always consider m4a files as audio, even when they contain a video track.
2009-09-28 12:24:08 -04:00
Marco Nelissen
1851db6804 Always consider m4a files as audio, even when they contain a video track. 2009-09-28 09:03:33 -07:00
Marco Nelissen
aa50713649 am dba93b68: Merge change 27318 into eclair
Merge commit 'dba93b68326f139f669aefa6770d50daff032746' into eclair-plus-aosp

* commit 'dba93b68326f139f669aefa6770d50daff032746':
  Check that playlist entries refer to a row in the audio table.
2009-09-27 19:50:49 -07:00
Android (Google) Code Review
dba93b6832 Merge change 27318 into eclair
* changes:
  Check that playlist entries refer to a row in the audio table.
2009-09-27 22:43:05 -04:00
Marco Nelissen
d4f3586c93 Check that playlist entries refer to a row in the audio table. 2009-09-27 15:06:03 -07:00
Ray Chen
1055e0d830 am cc96652c: Remove fflush when storing thumbanil to sdcard.
Merge commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8' into eclair-plus-aosp

* commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8':
  Remove fflush when storing thumbanil to sdcard.
2009-09-27 14:03:32 -07:00
Ray Chen
cc96652c70 Remove fflush when storing thumbanil to sdcard. 2009-09-27 13:41:25 -07:00
Marco Nelissen
c46f886b63 am 0faa5c6c: Merge change 27271 into eclair
Merge commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2' into eclair-plus-aosp

* commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2':
  Only scan windows media files when those codecs are enabled.
2009-09-27 12:24:17 -07:00
Android (Google) Code Review
0faa5c6c5a Merge change 27271 into eclair
* changes:
  Only scan windows media files when those codecs are enabled.
2009-09-27 15:19:27 -04:00
Marco Nelissen
0ddbc35dc4 Only scan windows media files when those codecs are enabled. 2009-09-27 11:25:49 -07:00
Yu Shan Emily Lau
20f8fcd9fe am 7756cbee: Merge change 27073 into eclair
Merge commit '7756cbeef475127ed56bfeabecb3c291366a952f' into eclair-plus-aosp

* commit '7756cbeef475127ed56bfeabecb3c291366a952f':
  Removed the device type checking
2009-09-25 16:47:24 -07:00
Android (Google) Code Review
7756cbeef4 Merge change 27073 into eclair
* changes:
  Removed the device type checking
2009-09-25 19:42:24 -04:00
Yu Shan Emily Lau
34831c9330 Removed the device type checking 2009-09-25 16:01:20 -07:00
Eric Laurent
df9879bf1f am e9bd4788: Merge change 26881 into eclair
Merge commit 'e9bd4788d4370714374d833aed1339d17c5ded09' into eclair-plus-aosp

* commit 'e9bd4788d4370714374d833aed1339d17c5ded09':
  Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.
2009-09-25 00:43:43 -07:00
Yu Shan Emily Lau
384350e804 am 3f790d87: Merge change 27011 into eclair
Merge commit '3f790d87838114a71bff96b4a0a51537ca879597' into eclair-plus-aosp

* commit '3f790d87838114a71bff96b4a0a51537ca879597':
  Added the checking for the wma in the memory test.
2009-09-25 00:41:03 -07:00
Android (Google) Code Review
e9bd4788d4 Merge change 26881 into eclair
* changes:
  Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.
2009-09-25 03:37:03 -04:00
Android (Google) Code Review
3f790d8783 Merge change 27011 into eclair
* changes:
  Added the checking for the wma in the memory test.
2009-09-25 03:31:28 -04:00
Yu Shan Emily Lau
a56e653130 Added the checking for the wma in the memory test. 2009-09-25 00:07:47 -07:00
Eric Laurent
af141d529f Fix issue 2142613: ToneGenerator: short tones sometimes don't play on sholes or over A2DP.
When the AudioTrack callback notification size is relatively high (Which is the case on Sholes and over A2DP), it is likely that the end of tone is reached during the first callback. In this case, the AudioTrack is stopped before exiting the callback which causes 2 problems:
- 1: If the AudioFlinger thread is scheduled before we exit the ToneGenerator callback, the track can be stopped and reset before the data is actually marked as present in the buffer by the AudioTrack callback => no audio will be processed by AudioFlinger.
- 2: In this case, the data write index in the AudioTrack buffer is incremented after the track was reset by the AudioFlinger which leaves unplayed data in the buffer. This data will be played the next time the AudioTrack is started if not flushed in between.

The fix consists in adding an intermediate state to ToneGenerator state machine so that we exit the callback function when the stop condition is reached and stop the AudioTrack the next time we execute the callback.
2009-09-24 23:49:40 -07:00
Ray Chen
d503453ca0 am 80d8ace4: Merge change 26997 into eclair
Merge commit '80d8ace484525f0272b8a56142ef838f5f4d38e4' into eclair-plus-aosp

* commit '80d8ace484525f0272b8a56142ef838f5f4d38e4':
  Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail.
2009-09-24 21:26:27 -07:00