drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,025 Commits 1 Branch 0 Tags
Commit Graph

3080 Commits

Author SHA1 Message Date
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
The Android Open Source Project
284e9b2753 Merge commit 'korg/donut' 2009-04-24 13:54:57 -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
Dave Sparks
89e2782d71 Merge branch 'readonly-p4-master' 2009-04-18 22:26:57 -07:00
Dave Sparks
32346a89c3 AI 146671: am: CL 146668 am: CL 146667 Add advice in MediaRecorder Java docs about using MPEG-4 container format 
Original author: davidsparks
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146671
 2009-04-18 22:25:38 -07:00
Dave Sparks
ec9cacad76 Merge branch 'readonly-p4-master' 2009-04-18 22:21:29 -07:00
Dave Sparks
40a9d16087 AI 146658: am: CL 146655 am: CL 146654 Add java docs for SoundPool 
Original author: davidsparks
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146658
 2009-04-18 22:20:18 -07:00
Dave Sparks
6cb9900e6f AI 146755: am: CL 146754 Fix some problems in the SoundPool docs and add additional text. 
Original author: davidsparks
  Merged from: //branches/cupcake/...

Automated import of CL 146755
 2009-04-17 11:48:25 -07:00
Jean-Michel Trivi
ff14c25339 AI 146752: am: CL 146751 Finalize AudioTrack javadoc. 
Original author: jmtrivi
  Merged from: //branches/cupcake/...

Automated import of CL 146752
 2009-04-17 11:45:30 -07:00
Dave Sparks
2170312ab0 AI 146668: am: CL 146667 Add advice in MediaRecorder Java docs about using MPEG-4 container format 
Original author: davidsparks
  Merged from: //branches/cupcake/...

Automated import of CL 146668
 2009-04-16 19:54:16 -07:00
Dave Sparks
6cb76f6c23 AI 146667: Add advice in MediaRecorder Java docs about using MPEG-4 container format 
BUG=1753020

Automated import of CL 146667
 2009-04-16 18:35:51 -07:00
Dave Sparks
cef302d095 AI 146655: am: CL 146654 Add java docs for SoundPool 
Original author: davidsparks
  Merged from: //branches/cupcake/...

Automated import of CL 146655
 2009-04-16 17:50:27 -07:00
Dave Sparks
b1520e9333 AI 146654: Add java docs for SoundPool 
BUG=1795461

Automated import of CL 146654
 2009-04-16 17:49:25 -07:00
The Android Open Source Project
5e8c31ac31 Merge commit 'korg/cupcake' 2009-04-14 18:18:03 -07:00
Android (Google) Code Review
894fa6cc14 Merge change 79 
* changes:
  Squashed commit of the following:
 2009-04-14 11:54:14 -07:00
Jianhong Jiang
3ca47d101d Squashed commit of the following: 
commit b6cf47306b642f7cf7e1b55cce448e0deff38f36
Author: Jianhong Jiang <jianhong@google.com>
Date:   Mon Apr 13 11:07:01 2009 -0700

    Change tabs into 4 spaces.

commit 93c5890dbcc68e37aa0ef039b4a203acddca8968
Author: Jianhong Jiang <jianhong@google.com>
Date:   Fri Apr 10 14:15:23 2009 -0700

    OpenCore 2.02 related changes.
 2009-04-13 19:01:51 -07:00
Dianne Hackborn
75534fbe24 Merge branch 'readonly-p4-master' 2009-04-13 16:13:37 -07:00
Dianne Hackborn
935ae463d4 AI 145994: Integrate #145778 from Donut. 
Automated import of CL 145994
 2009-04-13 16:11:55 -07:00
Patrick Scott
9536d0b413 Merge branch 'readonly-p4-master' 2009-04-13 09:59:09 -07:00
Patrick Scott
3156bb00dd AI 145870: Add a build property for the default alarm alert. Update the various 
framework classes to deal with the new property. Also update various
  documentation that mentions the default ringtones.
  Use the build property as the default alert when the user has not chosen
  an alert for an alarm. This is also used if the alarm alert is null when
  the alarm fires.
  BUG=1723684

Automated import of CL 145870
 2009-04-13 09:57:38 -07:00
Andy Stadler
f8a7ceaef2 AI 145778: Manual merge changes 145382-145384 from cupcake. 
Automated import of CL 145778
 2009-04-10 16:24:47 -07:00
Dianne Hackborn
48276ab989 AI 145383: API review: clean up a bunch of @hides that have been pending API review. 
Either expose them, or official hide them with an explanation for why.
  BUG=1779439

Automated import of CL 145383
 2009-04-09 12:32:19 -07:00
Jean-Baptiste Queru
bb038d1604 Revert "Changes required to accommodate OpenCORE 2.0" 
This reverts commit ea780b689f8ee3dff355deab2434bbd4ae04d208.

Conflicts:

	media/libmediaplayerservice/Android.mk
 2009-04-08 14:40:48 -07:00
Jean-Michel Trivi
73cf2a11eb Merge branch 'readonly-p4-master' 2009-04-02 23:27:19 -07:00
Jean-Michel Trivi
e398e3bf22 AI 144409: am: CL 144327 am: CL 144326 Start the thread that initializes the camera for the test under lock to make sure the monitor is notified after it has started waiting. 
Original author: jmtrivi
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144409
 2009-04-02 23:26:11 -07:00
Xia Wang
e7e370369d Merge branch 'readonly-p4-master' 2009-04-02 23:22:15 -07:00
Xia Wang
74e77fba25 AI 144407: am: CL 144314 am: CL 144313 Add two test cases for AudioTrack.java 
getMinBufferSize() returns ERROR_BAD_VALUE if
  sampleRateInHz < 4000 or > 48000.
  Original author: xiaw
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144407
 2009-04-02 23:21:07 -07:00
Jean-Michel Trivi
655434763f AI 144327: am: CL 144326 Start the thread that initializes the camera for the test under lock to make sure the monitor is notified after it has started waiting. 
Original author: jmtrivi
  Merged from: //branches/cupcake/...

Automated import of CL 144327
 2009-04-02 16:14:14 -07:00
Jean-Michel Trivi
36951ab6c2 AI 144326: Start the thread that initializes the camera for the test under lock to make sure the monitor is notified after it has started waiting. 
BUG=1731117

Automated import of CL 144326
 2009-04-02 16:11:58 -07:00