summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am c1c82509: Merge change 2163 into donutAndroid (Google) Code Review2009-05-201-0/+4
|\ | | | | | | | | | | | | Merge commit 'c1c82509fb78403a969040cf057a66cbe3bfa538' * commit 'c1c82509fb78403a969040cf057a66cbe3bfa538': Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder
| * Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorderDave Sparks2009-05-201-0/+4
| | | | | | | | | | | | | | | | implementation to the mediaserver process. The permission check was previously enforced only at the AudioRecord binder interface for clients not in the same process. This change adds an additional check when the client tries to set the audio source. Bug 1868334
* | move libbinder's header files under includes/binderMathias Agopian2009-05-2020-40/+40
| |
* | checkpoint: split libutils into libutils + libbinderMathias Agopian2009-05-203-2/+4
| |
* | am b85c374: Merge change 1155 into donutAndroid (Google) Code Review2009-05-071-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit 'b85c37432b3836fd30c81191425d7e00dcf2082c' * commit 'b85c37432b3836fd30c81191425d7e00dcf2082c': Don't allow negative numbers in ToneGenerator toneType parameter
| * Don't allow negative numbers in ToneGenerator toneType parameterDave Sparks2009-05-071-1/+1
| | | | | | | | Bug 1836596
* | manual merge f3af740bdfc261b1cb25c0799af780d3753d4518The Android Open Source Project2009-05-061-85/+342
|\ \ | |/ | | | | Merge commit 'f3af740bdfc261b1cb25c0799af780d3753d4518'
| * Fixed issue 1709450: Requirements for CDMA Tone GeneratorEric Laurent2009-05-061-85/+342
| | | | | | | | | | | | | | | | | | | | 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
| * Change 79 in git master branchJames Dong2009-04-301-14/+14
| |
* | am 7fe3b06: Merge change 740 into donutAndroid (Google) Code Review2009-04-291-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '7fe3b064d3645fcebd09b162c5989e0d702112e2' * commit '7fe3b064d3645fcebd09b162c5989e0d702112e2': MIDI render thread was nice 0, should be nice -16.
| * Merge change 740 into donutAndroid (Google) Code Review2009-04-291-1/+1
| |\ | | | | | | | | | | | | * 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
| | * MIDI render thread was nice 0, should be nice -16.Dave Sparks2009-04-291-1/+1
| | | | | | | | | | | | | | | | | | | | | 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
* | | am 9f98f79: Merge change 739 into donutAndroid (Google) Code Review2009-04-291-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '9f98f79f8eb41889dec36e0a76aaf0414b39bb3a' * commit '9f98f79f8eb41889dec36e0a76aaf0414b39bb3a': Vorbis render thread was nice 0, should be nice -16.
| * | Vorbis render thread was nice 0, should be nice -16.Dave Sparks2009-04-291-1/+1
| |/ | | | | | | | | | | | | 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
* | Merge donut into masterJean-Baptiste Queru2009-04-224-14/+14
|\ \ | |/
| * Fix issue 1745312: Various cleanups in media frameworkEric Laurent2009-04-214-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * AI 144054: am: CL 144053 Fix issue #1751242 A2DP playback fails first time: ↵Eric Laurent2009-04-011-16/+17
| | | | | | | | | | | | | | | | | | | | | | Invalid buffer size: minFrameCount 10240, frameCount 4800 The problem comes from the fact that AudioSystem::getOutputFrameCount() calls getOutput() to retrieve the active output (A2DP or Hardware) before calling get_audio_flinger(). If it is the first time AudioSystem::getOutputFrameCount() is called in a given process, getOutput() will return a wrong value because gA2dpEnabled has not yet been updated by get_audio_flinger(). The fix consists in calling get_audio_flinger() in getOutput() to be sure that gA2dpEnabled is valid when getOutput() reads it. Original author: elaurent Merged from: //branches/cupcake/... Automated import of CL 144054
| * AI 143267: am: CL 143127 Media recorder service requires ↵Dave Sparks2009-03-271-0/+16
| | | | | | | | | | | | | | | | | | android.permission.CAMERA to record video Original author: davidsparks Merged from: //branches/cupcake/... Automated import of CL 143267
| * Automated import from //branches/donutburger/...@142065,142065Eric Laurent2009-03-241-1/+8
| |
| * Automated import from //branches/donutburger/...@141711,141711Andreas Huber2009-03-241-3/+8
| |
| * Automated import from //branches/donutburger/...@141593,141593Dave Sparks2009-03-241-0/+1
| |
| * Automated import from //branches/donutburger/...@141200,141200Jean-Michel Trivi2009-03-241-2/+7
| |
| * Automated import from //branches/donutburger/...@140867,140867Jean-Michel Trivi2009-03-241-1/+1
| |
| * Automated import from //branches/donutburger/...@140866,140866Jason Sams2009-03-241-5/+23
| |
| * Automated import from //branches/donutburger/...@140663,140663Jean-Michel Trivi2009-03-241-2/+13
| |
* | Squashed commit of the following:Jianhong Jiang2009-04-131-26/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Revert "Changes required to accommodate OpenCORE 2.0"Jean-Baptiste Queru2009-04-081-2/+2
| | | | | | | | | | | | | | | | This reverts commit ea780b689f8ee3dff355deab2434bbd4ae04d208. Conflicts: media/libmediaplayerservice/Android.mk
* | Merge branch 'readonly-p4-master'Eric Laurent2009-04-021-16/+17
|\ \
| * | AI 144097: am: CL 144054 am: CL 144053 Fix issue #1751242 A2DP playback ↵Eric Laurent2009-04-021-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fails first time: Invalid buffer size: minFrameCount 10240, frameCount 4800 The problem comes from the fact that AudioSystem::getOutputFrameCount() calls getOutput() to retrieve the active output (A2DP or Hardware) before calling get_audio_flinger(). If it is the first time AudioSystem::getOutputFrameCount() is called in a given process, getOutput() will return a wrong value because gA2dpEnabled has not yet been updated by get_audio_flinger(). The fix consists in calling get_audio_flinger() in getOutput() to be sure that gA2dpEnabled is valid when getOutput() reads it. Original author: elaurent Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 144097
| * | AI 143396: am: CL 143267 am: CL 143127 Media recorder service requires ↵Dave Sparks2009-03-271-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android.permission.CAMERA to record video Original author: davidsparks Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143396
| * | Automated import from //branches/master/...@142066,142066Eric Laurent2009-03-241-1/+8
| | |
| * | Automated import from //branches/master/...@141712,141712Andreas Huber2009-03-241-3/+8
| | |
| * | Automated import from //branches/master/...@141595,141595Dave Sparks2009-03-241-0/+1
| | |
| * | Automated import from //branches/master/...@141201,141201Jean-Michel Trivi2009-03-241-2/+7
| | |
| * | Automated import from //branches/master/...@140869,140869Jean-Michel Trivi2009-03-241-1/+1
| | |
| * | Automated import from //branches/master/...@140868,140868Jason Sams2009-03-241-5/+23
| | |
| * | Automated import from //branches/master/...@140665,140665Jean-Michel Trivi2009-03-241-2/+13
| |/
* | Merge commit 'goog/cupcake'The Android Open Source Project2009-03-271-0/+16
|\ \
| * | AI 143127: Media recorder service requires android.permission.CAMERA to ↵Dave Sparks2009-03-271-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | record video BUG=1742392 Automated import of CL 143127
* | | Merge commit 'korg/cupcake'The Android Open Source Project2009-03-276-18/+74
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: core/java/android/webkit/WebView.java core/java/android/widget/TwoLineListItem.java preloaded-classes
| * | Automated import from //branches/cupcake/...@142064,142064Eric Laurent2009-03-241-1/+8
| | |
| * | Automated import from //branches/cupcake/...@141708,141708Andreas Huber2009-03-241-3/+8
| | |
| * | Automated import from //branches/cupcake/...@141591,141591Dave Sparks2009-03-241-0/+1
| | |
| * | auto import from //branches/cupcake_rel/...@141571The Android Open Source Project2009-03-194-10/+44
| |/
| * auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-183-6/+15
| |
* | Deal better with situations where OpenCORE is disabled.Jean-Baptiste Queru2009-03-233-3/+25
| |
* | Merge commit 'remotes/korg/cupcake' into mergeJean-Baptiste Queru2009-03-1817-280/+833
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: core/java/android/view/animation/TranslateAnimation.java core/jni/Android.mk core/res/res/values-en-rGB/strings.xml libs/audioflinger/AudioFlinger.cpp libs/surfaceflinger/LayerScreenshot.cpp packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
| * auto import from //branches/cupcake_rel/...@138607The Android Open Source Project2009-03-134-0/+46
| |
| * auto import from //branches/cupcake/...@137873The Android Open Source Project2009-03-112-1/+17
| |
| * auto import from //branches/cupcake/...@137197The Android Open Source Project2009-03-091-4/+8
| |