148 Commits

Author SHA1 Message Date
Android (Google) Code Review
c6b58959b3 am 379d3bd9: Merge change 2016 into donut
Merge commit '379d3bd974cfde9480fda733d4f442311924cbb9'

* commit '379d3bd974cfde9480fda733d4f442311924cbb9':
  Replaced the old test media files with the new open source test media files.
2009-05-19 16:52:31 -07:00
Android (Google) Code Review
379d3bd974 Merge change 2016 into donut
* changes:
  Replaced the old test media files with the new open source test media files. Fix the bug in testGetThumbnail test.
2009-05-19 16:51:29 -07:00
Yu Shan Emily Lau
be467b579e Replaced the old test media files with the new open source test media files.
Fix the bug in testGetThumbnail test.
2009-05-19 15:46:22 -07:00
Android (Google) Code Review
6a88955135 am 988c4d1a: Merge change 2005 into donut
Merge commit '988c4d1a3ece97c078658a67b15949db900641e0'

* commit '988c4d1a3ece97c078658a67b15949db900641e0':
  Added the write sdcard permission so that the mediarecorder test
2009-05-19 15:22:35 -07:00
Yu Shan Emily Lau
f30c700e13 Added the write sdcard permission so that the mediarecorder test
can write the new recorded video into sdcard.
2009-05-19 15:14:51 -07:00
Android (Google) Code Review
6f3cbac7eb am 65ff54c4: Merge change 1967 into donut
Merge commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9'

* commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9':
  Document the media scanner's flow through native and java code, since
2009-05-19 14:04:04 -07:00
Marco Nelissen
77f2c4c1f9 Document the media scanner's flow through native and java code, since
I always forget how it works after a while.
2009-05-19 10:00:33 -07:00
Android (Google) Code Review
86a99b9ad2 am b3af6b48: Merge change 1748 into donut
Merge commit 'b3af6b4805040ea42c01765387c99089822bbe7e'

* commit 'b3af6b4805040ea42c01765387c99089822bbe7e':
  Add a tool to play all kinds of media files saved in /sdcard/media_api/samples/. It also tests the seeking functionality during the play of each sample file.
2009-05-15 16:25:42 -07:00
Xia Wang
55eef638fa Add a tool to play all kinds of media files saved in /sdcard/media_api/samples/. It also tests the seeking functionality during the play of each sample file. 2009-05-15 15:03:33 -07:00
Android (Google) Code Review
4ae6aa232b am 109b21ba: Merge change 1677 into donut
Merge commit '109b21bab5a9eb6c17e067b11784ade36129f24f'

* commit '109b21bab5a9eb6c17e067b11784ade36129f24f':
  Findbugs fixes.
2009-05-14 14:53:35 -07:00
Marco Nelissen
d282ac8610 Findbugs fixes. 2009-05-14 13:18:16 -07:00
Android (Google) Code Review
10fd73a238 am 7f2ae49: Merge change 1370 into donut
Merge commit '7f2ae493c58e221b2961ccbd92de24565665633c'

* commit '7f2ae493c58e221b2961ccbd92de24565665633c':
  Fix a JNI layer crash due to null camera object passed to get_native_camera()
2009-05-11 12:20:20 -07:00
Android (Google) Code Review
7f2ae493c5 Merge change 1370 into donut
* changes:
  Fix a JNI layer crash due to null camera object passed to get_native_camera() The fix will check on the camera object and if it is a null object, we throw a NullPointerException; application layer should also avoid passing a null java object to MediaRecorder.setCamera().
2009-05-11 12:18:55 -07:00
James Dong
429a3b5f1d Fix a JNI layer crash due to null camera object passed to get_native_camera()
The fix will check on the camera object and if it is a null object, we
throw a NullPointerException; application layer should also avoid passing a null
java object to MediaRecorder.setCamera().
2009-05-11 10:58:03 -07:00
Android (Google) Code Review
30f91d6e10 am b85c374: Merge change 1155 into donut
Merge commit 'b85c37432b3836fd30c81191425d7e00dcf2082c'

* commit 'b85c37432b3836fd30c81191425d7e00dcf2082c':
  Don't allow negative numbers in ToneGenerator toneType parameter
2009-05-07 11:54:50 -07:00
Android (Google) Code Review
b85c37432b Merge change 1155 into donut
* changes:
  Don't allow negative numbers in ToneGenerator toneType parameter Bug 1836596
2009-05-07 11:52:06 -07:00
Android (Google) Code Review
2bbaaf72ea am 0efb086: Merge change 1120 into donut
Merge commit '0efb0868841cc1c2b5a669b39880d931f54f705a'

* commit '0efb0868841cc1c2b5a669b39880d931f54f705a':
  Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest
2009-05-07 09:34:39 -07:00
Android (Google) Code Review
0efb086884 Merge change 1120 into donut
* changes:
  Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest (Currently not supported by OpenCore 2.0)
2009-05-07 09:34:28 -07:00
Dave Sparks
4c92247098 Don't allow negative numbers in ToneGenerator toneType parameter
Bug 1836596
2009-05-07 09:26:06 -07:00
Android (Google) Code Review
7c6b6fbe4c am a6706b3: Merge change 1131 into donut
Merge commit 'a6706b3c8f7e8759d5165535c95f6cd7147ab5e2'

* commit 'a6706b3c8f7e8759d5165535c95f6cd7147ab5e2':
  fix issue 1641535: SoundPool should use AudioTrack with shared memory buffer
2009-05-07 07:50:07 -07:00
Eric Laurent
9648e4b677 fix issue 1641535: SoundPool should use AudioTrack with shared memory buffer
Enabled USE_SHARED_MEM_BUFFER switch in SoundPool.cpp
2009-05-07 03:14:31 -07:00
Xia Wang
fe1766474b Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest
(Currently not supported by OpenCore 2.0)
2009-05-06 21:12:39 -07:00
The Android Open Source Project
56b7eeaa01 manual merge f3af740bdfc261b1cb25c0799af780d3753d4518
Merge commit 'f3af740bdfc261b1cb25c0799af780d3753d4518'
2009-05-06 15:48:33 -07:00
The Android Open Source Project
761daf7550 manual merge for b9c9d260f21b321527c4622a123af9767630d94d
Merge commit 'b9c9d260f21b321527c4622a123af9767630d94d'
2009-05-06 15:43:48 -07:00
Eric Laurent
f3af740bdf Fixed issue 1709450: Requirements for CDMA Tone Generator
Added new tone types for CDMA IS-95 specific tones.
Automatic selection between IS-95, CEPT and JAPAN version base on operator
country code for call supervisory tones.
Also improved tone generator capabilities:
- Each tone segment can now generate its own set of frequencies
- A tone does not have to be a succession of alternating ON/OFF segments
- The sequence repetition does not have to start from first segment
2009-05-06 11:35:46 -07:00
Eric Laurent
b9c9d260f2 fix issue 1713090: After a Bluetooth call, MusicPlayer starts playing on speaker rather than wired external audio.
Temporary fix until audio routing is refactored in Eclair release:
- centralized and synchronized all audio routing control in AudioService.setRouting()
- deprecated AudioManager.setRouting() and AudioManager.getRouting() methods
2009-05-06 10:52:19 -07:00
Android (Google) Code Review
0d8f5a3f4f am e556248: Merge change 1017 into donut
Merge commit 'e556248e859e7197d5f97c6c0724806d5913da24'

* commit 'e556248e859e7197d5f97c6c0724806d5913da24':
  Changes in mediaframework test for the OpenCore 2.0 integration. Changes included:
2009-05-06 01:31:31 -07:00
Yu Shan Emily Lau
c1b80cb7e3 Changes in mediaframework test for the OpenCore 2.0 integration. Changes included:
1) The default value for the metatData
2) Add the videoSizedChange callback to get the video dimension
Added the test cases for the async reset callback test case for the Qualcomm new realease.
2009-05-05 17:29:53 -07:00
Xia Wang
568d91bddc fix the bug of testStartupTime in MediaPlayerPerformance test throws exception for an existing table 2009-05-04 20:30:04 -07:00
James Dong
c02cac481c Change 79 in git master branch 2009-04-30 23:42:56 -07:00
Android (Google) Code Review
c2bc16cd5a am 7fe3b06: Merge change 740 into donut
Merge commit '7fe3b064d3645fcebd09b162c5989e0d702112e2'

* commit '7fe3b064d3645fcebd09b162c5989e0d702112e2':
  MIDI render thread was nice 0, should be nice -16.
2009-04-29 15:43:34 -07:00
Android (Google) Code Review
7fe3b064d3 Merge change 740 into donut
* changes:
  MIDI render thread was nice 0, should be nice -16. Seems like a recent change sets the thread priority to 0. Previously it inherited priority from the parent thread. This change sets the MIDI render thread priority to the default for audio threads. Reference bug 1800905
2009-04-29 15:27:15 -07:00
Android (Google) Code Review
ef77be9526 am 9f98f79: Merge change 739 into donut
Merge commit '9f98f79f8eb41889dec36e0a76aaf0414b39bb3a'

* commit '9f98f79f8eb41889dec36e0a76aaf0414b39bb3a':
  Vorbis render thread was nice 0, should be nice -16.
2009-04-29 13:41:22 -07:00
Android (Google) Code Review
9d9f28b828 am ba2eba4: Merge change 539 into donut
Merge commit 'ba2eba40fe24eca6af1563181ce07e4e006a4f5d'

* commit 'ba2eba40fe24eca6af1563181ce07e4e006a4f5d':
  Modify and turn on the test case for video recording in portrait mode.
2009-04-29 13:35:24 -07:00
Dave Sparks
c082769b67 MIDI render thread was nice 0, should be nice -16.
Seems like a recent change sets the thread priority to 0. Previously it
inherited priority from the parent thread. This change sets the MIDI
render thread priority to the default for audio threads.
Reference bug 1800905
2009-04-29 12:59:33 -07:00
Dave Sparks
0e051b189f Vorbis render thread was nice 0, should be nice -16.
Seems like a recent change sets the thread priority to 0. Previously it
inherited priority from the parent thread. This change sets the Vorbis
render thread priority to the default for audio threads.
Reference bug 1800905
2009-04-29 12:42:28 -07:00
Yu Shan Emily Lau
2071043512 Modify and turn on the test case for video recording in portrait mode. 2009-04-23 21:46:55 -07:00
Jean-Baptiste Queru
74008f608a Merge donut into master 2009-04-22 17:12:34 -07:00
Marco Nelissen
9f0b1a4850 Do case-insensitive matching when determining whether something is music, an alarm sound, notification sound, etc. 2009-04-22 10:34:12 -07:00
Eric Laurent
ef02827d4c Fix issue 1745312: Various cleanups in media framework
AudioTrack, AudioRecord:
  - remove useless mAudioFlinger member of AudioTrack and AudioRecord.
  - signal cblk.cv condition in stop() method to speed up stop completion.
  - extend wait condition timeout in obtainBuffer() when waitCount is -1 to avoid waking up callback thread unnecessarily

AudioFlinger:
  - remove some warnings in AudioFlinger.cpp.
  - remove function AudioFlinger::MixerThread::removetrack_l()  as its content is never executed.
  - remove useless call to setMasterVolume in AudioFlinger::handleForcedSpeakerRoute().
  - Offset VOICE_CALL stream volume to reflect actual volume that is never 0 in hardware (this fix has been made in the open source): 0.01 + v * 0.99.

AudioSystem.java:
  - correct typo in comment

IAudioflinger, IAudioFlingerClient:
  - make AudioFlinger binder interfaces used for callbacks ONEWAY.

AudioHardwareInterface:
  - correct routeStrings[] table in AudioHardwareInteface.cpp
2009-04-21 07:56:33 -07:00
Jean-Michel Trivi
486d95f714 Merge branch 'readonly-p4-master' 2009-04-20 16:33:36 -07:00
Jean-Michel Trivi
f3af6a0267 AI 147036: am: CL 147035 am: CL 147032 Finalize JetPlayer javadoc.
Original author: jmtrivi
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147036
2009-04-20 16:32:18 -07:00
Jean-Michel Trivi
6fb5a1d0ee AI 147035: am: CL 147032 Finalize JetPlayer javadoc.
Original author: jmtrivi
  Merged from: //branches/cupcake/...

Automated import of CL 147035
2009-04-20 16:30:18 -07:00
Jean-Michel Trivi
e796cfaef8 Merge branch 'readonly-p4-master' 2009-04-20 10:48:16 -07:00
Jean-Michel Trivi
954bbe9fa3 AI 146941: am: CL 146938 am: CL 146937 Finalize AudioRecord javadoc.
Original author: jmtrivi
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146941
2009-04-20 10:46:26 -07:00
Jean-Michel Trivi
ea63a41d26 AI 146938: am: CL 146937 Finalize AudioRecord javadoc.
Original author: jmtrivi
  Merged from: //branches/cupcake/...

Automated import of CL 146938
2009-04-20 10:45:23 -07:00
Dave Sparks
094c065cbb Merge branch 'readonly-p4-master' 2009-04-18 23:02:23 -07:00
Dave Sparks
1bc5c2645d AI 146833: am: CL 146755 am: CL 146754 Fix some problems in the SoundPool docs and add additional text.
Original author: davidsparks
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146833
2009-04-18 23:01:09 -07:00
Jean-Michel Trivi
d4fd29e02c Merge branch 'readonly-p4-master' 2009-04-18 22:59:37 -07:00
Jean-Michel Trivi
3946a2b75b AI 146832: am: CL 146752 am: CL 146751 Finalize AudioTrack javadoc.
Original author: jmtrivi
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146832
2009-04-18 22:58:18 -07:00