532 Commits

Author SHA1 Message Date
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
Ray Chen
343449f018 Fix issue 2128896 The thumbnail generated after picture capture with max zoom is overlapped with previous thumbnail. 2009-09-24 20:22:37 -07:00
Yu Shan Emily Lau
99c156cd9f am 7d0bdfaf: Merge change 26948 into eclair
Merge commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9' into eclair-plus-aosp

* commit '7d0bdfaf9adbdaee0b8979d3d23b5b7ecb8a90a9':
  Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
2009-09-24 16:59:59 -07:00
Android (Google) Code Review
7d0bdfaf9a Merge change 26948 into eclair
* changes:
  Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build
2009-09-24 19:53:57 -04:00
Yu Shan Emily Lau
5b0b63b674 Suppress the testPing as we moved the release test target to the userdebug. This test rely on a mock_media_player.so which build under the eng build 2009-09-24 16:17:14 -07:00
Dianne Hackborn
74468de20b am 9d31e1be: Merge change 26686 into eclair
Merge commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd' into eclair-plus-aosp

* commit '9d31e1bebaf3ae5d54751c32466edcea6e7433dd':
  Fix broken build.
2009-09-23 15:28:53 -07:00
Dianne Hackborn
a52b4d764e Fix broken build.
I -did- run it...  why did this later break on me?!?

Change-Id: I70db0279f9a1b499496f9808525d2b112495d6c7
2009-09-23 15:17:39 -07:00
Ray Chen
94cdc3d0e2 am 830207ca: Merge change 25635 into eclair
Merge commit '830207cab4047431d7a38443531a3a912bfecf3a' into eclair-plus-aosp

* commit '830207cab4047431d7a38443531a3a912bfecf3a':
  Add new thumbnail API.
2009-09-23 11:38:06 -07:00
Ray Chen
00c575a3fc Add new thumbnail API. 2009-09-23 11:23:45 -07:00
Yu Shan Emily Lau
5653e41e71 am 008fc5d1: Merge change 26332 into eclair
Merge commit '008fc5d142b58688a3827a544c524dff11204c62' into eclair-plus-aosp

* commit '008fc5d142b58688a3827a544c524dff11204c62':
  1) Add the wma / wmv profile reader.
2009-09-22 12:32:29 -07:00
Android (Google) Code Review
008fc5d142 Merge change 26332 into eclair
* changes:
  1) Add the wma / wmv profile reader. 2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases. 3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
2009-09-22 15:09:33 -04:00
Yu Shan Emily Lau
dc1af5befa 1) Add the wma / wmv profile reader.
2) Add the flag which check the wma/wmv enable properties. If the codec is not enable, then skip the wma / wmv related test cases.
3) Added a workaround which let the testcodecspecific test case continue even though there is a failure in the middle of the test. Besides, take out the remvoeFile for temporary usage.
2009-09-22 10:52:56 -07:00
Chih-Chung Chang
1e577ced7d am 7b7029e0: Merge change 26236 into eclair
Merge commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6' into eclair-plus-aosp

* commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6':
  Make media scanner read the jpeg orientation tag.
2009-09-22 09:59:46 -07:00
Chih-Chung Chang
b8f4725d1b Make media scanner read the jpeg orientation tag. 2009-09-22 04:42:02 +08:00
Yu Shan Emily Lau
58c243450d am 92b27daf: Merge change 25858 into eclair
Merge commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676' into eclair-plus-aosp

* commit '92b27dafe9418c5fdf63d23c6b19772fbcd74676':
  There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
2009-09-18 20:13:31 -07:00
Android (Google) Code Review
92b27dafe9 Merge change 25858 into eclair
* changes:
  There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension
2009-09-18 23:07:00 -04:00
Yu Shan Emily Lau
17d7ea4947 There is a know issue in PV regarding the video size return. Need to put a 1 second sleep before we get the video dimension 2009-09-18 16:27:24 -07:00
Yu Shan Emily Lau
5813b30974 am e785d180: Merge change 25826 into eclair
Merge commit 'e785d1804dbf67913aeb25896a420abebe731e80' into eclair-plus-aosp

* commit 'e785d1804dbf67913aeb25896a420abebe731e80':
  Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
2009-09-18 16:23:06 -07:00
Android (Google) Code Review
e785d1804d Merge change 25826 into eclair
* changes:
  Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore.
2009-09-18 19:14:32 -04:00
Yu Shan Emily Lau
9d7b2fa808 Suppressed the invalidFrameRate as the framework is not throwing the IOException anymore. 2009-09-18 14:58:56 -07:00
Chih-Chung Chang
8701202834 am f22b7410: Merge change 25464 into eclair
Merge commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776' into eclair-plus-aosp

* commit 'f22b74103a2ea2fecdb80deb6a0baffa84e66776':
  Improve ExifInterface API.
2009-09-18 12:02:50 -07:00
Chih-Chung Chang
872a30ec72 Improve ExifInterface API.
Change-Id: Ic6c4df8244b51b9a0d1c73c3797847220d86604d
2009-09-18 11:30:47 -07:00