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-2021-42/+42
| |
* | checkpoint: split libutils into libutils + libbinderMathias Agopian2009-05-205-2/+6
| |
* | am 379d3bd9: Merge change 2016 into donutAndroid (Google) Code Review2009-05-195-39/+39
|\ \ | |/ | | | | | | | | | | Merge commit '379d3bd974cfde9480fda733d4f442311924cbb9' * commit '379d3bd974cfde9480fda733d4f442311924cbb9': Replaced the old test media files with the new open source test media files.
| * Merge change 2016 into donutAndroid (Google) Code Review2009-05-195-39/+39
| |\ | | | | | | | | | | | | * changes: Replaced the old test media files with the new open source test media files. Fix the bug in testGetThumbnail test.
| | * Replaced the old test media files with the new open source test media files.Yu Shan Emily Lau2009-05-195-39/+39
| | | | | | | | | | | | Fix the bug in testGetThumbnail test.
* | | am 988c4d1a: Merge change 2005 into donutAndroid (Google) Code Review2009-05-191-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '988c4d1a3ece97c078658a67b15949db900641e0' * commit '988c4d1a3ece97c078658a67b15949db900641e0': Added the write sdcard permission so that the mediarecorder test
| * | Added the write sdcard permission so that the mediarecorder testYu Shan Emily Lau2009-05-191-0/+1
| |/ | | | | | | can write the new recorded video into sdcard.
* | am 65ff54c4: Merge change 1967 into donutAndroid (Google) Code Review2009-05-191-1/+39
|\ \ | |/ | | | | | | | | | | Merge commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9' * commit '65ff54c44bbd8c1dd6818d42b7c91c634c644aa9': Document the media scanner's flow through native and java code, since
| * Document the media scanner's flow through native and java code, sinceMarco Nelissen2009-05-191-1/+39
| | | | | | | | I always forget how it works after a while.
* | am b3af6b48: Merge change 1748 into donutAndroid (Google) Code Review2009-05-153-6/+103
|\ \ | |/ | | | | | | | | | | 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.
| * Add a tool to play all kinds of media files saved in ↵Xia Wang2009-05-153-6/+103
| | | | | | | | /sdcard/media_api/samples/. It also tests the seeking functionality during the play of each sample file.
* | am 109b21ba: Merge change 1677 into donutAndroid (Google) Code Review2009-05-143-8/+5
|\ \ | |/ | | | | | | | | | | Merge commit '109b21bab5a9eb6c17e067b11784ade36129f24f' * commit '109b21bab5a9eb6c17e067b11784ade36129f24f': Findbugs fixes.
| * Findbugs fixes.Marco Nelissen2009-05-143-8/+5
| |
* | am 7f2ae49: Merge change 1370 into donutAndroid (Google) Code Review2009-05-111-0/+5
|\ \ | |/ | | | | | | | | | | Merge commit '7f2ae493c58e221b2961ccbd92de24565665633c' * commit '7f2ae493c58e221b2961ccbd92de24565665633c': Fix a JNI layer crash due to null camera object passed to get_native_camera()
| * Merge change 1370 into donutAndroid (Google) Code Review2009-05-111-0/+5
| |\ | | | | | | | | | | | | * 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().
| | * Fix a JNI layer crash due to null camera object passed to get_native_camera()James Dong2009-05-111-0/+5
| | | | | | | | | | | | | | | | | | 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().
* | | 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
| * | Merge change 1155 into donutAndroid (Google) Code Review2009-05-071-1/+1
| |\ \ | | |/ | |/| | | | | | | * changes: Don't allow negative numbers in ToneGenerator toneType parameter Bug 1836596
| | * Don't allow negative numbers in ToneGenerator toneType parameterDave Sparks2009-05-071-1/+1
| | | | | | | | | | | | Bug 1836596
* | | am 0efb086: Merge change 1120 into donutAndroid (Google) Code Review2009-05-072-3/+13
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '0efb0868841cc1c2b5a669b39880d931f54f705a' * commit '0efb0868841cc1c2b5a669b39880d931f54f705a': Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest
| * | Merge change 1120 into donutAndroid (Google) Code Review2009-05-072-3/+13
| |\ \ | | |/ | |/| | | | | | | * changes: Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTest (Currently not supported by OpenCore 2.0)
| | * Suppress all tests on Windows Media in MediaPlayerApiTest and MediaMetadataTestXia Wang2009-05-062-3/+13
| | | | | | | | | | | | (Currently not supported by OpenCore 2.0)
* | | am a6706b3: Merge change 1131 into donutAndroid (Google) Code Review2009-05-071-1/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'a6706b3c8f7e8759d5165535c95f6cd7147ab5e2' * commit 'a6706b3c8f7e8759d5165535c95f6cd7147ab5e2': fix issue 1641535: SoundPool should use AudioTrack with shared memory buffer
| * | fix issue 1641535: SoundPool should use AudioTrack with shared memory bufferEric Laurent2009-05-071-1/+4
| |/ | | | | | | Enabled USE_SHARED_MEM_BUFFER switch in SoundPool.cpp
* | manual merge f3af740bdfc261b1cb25c0799af780d3753d4518The Android Open Source Project2009-05-063-94/+413
|\ \ | |/ | | | | Merge commit 'f3af740bdfc261b1cb25c0799af780d3753d4518'
| * Fixed issue 1709450: Requirements for CDMA Tone GeneratorEric Laurent2009-05-063-94/+413
| | | | | | | | | | | | | | | | | | | | 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
* | manual merge for b9c9d260f21b321527c4622a123af9767630d94dThe Android Open Source Project2009-05-062-36/+217
|\ \ | |/ | | | | Merge commit 'b9c9d260f21b321527c4622a123af9767630d94d'
| * fix issue 1713090: After a Bluetooth call, MusicPlayer starts playing on ↵Eric Laurent2009-05-062-36/+217
| | | | | | | | | | | | | | | | 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
* | am e556248: Merge change 1017 into donutAndroid (Google) Code Review2009-05-064-42/+109
|\ \ | |/ | | | | | | | | | | Merge commit 'e556248e859e7197d5f97c6c0724806d5913da24' * commit 'e556248e859e7197d5f97c6c0724806d5913da24': Changes in mediaframework test for the OpenCore 2.0 integration. Changes included:
| * Changes in mediaframework test for the OpenCore 2.0 integration. Changes ↵Yu Shan Emily Lau2009-05-054-42/+109
| | | | | | | | | | | | | | | | 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.
| * Change 79 in git master branchJames Dong2009-04-303-34/+35
| |
* | fix the bug of testStartupTime in MediaPlayerPerformance test throws ↵Xia Wang2009-05-041-2/+8
| | | | | | | | exception for an existing table
* | 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
* | am ba2eba4: Merge change 539 into donutAndroid (Google) Code Review2009-04-292-5/+28
|\ \ | |/ | | | | | | | | | | Merge commit 'ba2eba40fe24eca6af1563181ce07e4e006a4f5d' * commit 'ba2eba40fe24eca6af1563181ce07e4e006a4f5d': Modify and turn on the test case for video recording in portrait mode.
| * Modify and turn on the test case for video recording in portrait mode.Yu Shan Emily Lau2009-04-232-5/+28
| |
* | Merge donut into masterJean-Baptiste Queru2009-04-226-20/+21
|\ \ | |/
| * Do case-insensitive matching when determining whether something is music, an ↵Marco Nelissen2009-04-221-5/+6
| | | | | | | | alarm sound, notification sound, etc.
| * Fix issue 1745312: Various cleanups in media frameworkEric Laurent2009-04-215-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 147035: am: CL 147032 Finalize JetPlayer javadoc.Jean-Michel Trivi2009-04-201-8/+165
| | | | | | | | | | | | | | Original author: jmtrivi Merged from: //branches/cupcake/... Automated import of CL 147035
| * AI 146938: am: CL 146937 Finalize AudioRecord javadoc.Jean-Michel Trivi2009-04-201-35/+46
| | | | | | | | | | | | | | Original author: jmtrivi Merged from: //branches/cupcake/... Automated import of CL 146938
| * AI 146755: am: CL 146754 Fix some problems in the SoundPool docs and add ↵Dave Sparks2009-04-171-38/+95
| | | | | | | | | | | | | | | | | | additional text. Original author: davidsparks Merged from: //branches/cupcake/... Automated import of CL 146755
| * AI 146752: am: CL 146751 Finalize AudioTrack javadoc.Jean-Michel Trivi2009-04-171-44/+67
| | | | | | | | | | | | | | Original author: jmtrivi Merged from: //branches/cupcake/... Automated import of CL 146752
| * AI 146668: am: CL 146667 Add advice in MediaRecorder Java docs about using ↵Dave Sparks2009-04-161-0/+4
| | | | | | | | | | | | | | | | | | MPEG-4 container format Original author: davidsparks Merged from: //branches/cupcake/... Automated import of CL 146668
| * AI 146655: am: CL 146654 Add java docs for SoundPoolDave Sparks2009-04-161-1/+189
| | | | | | | | | | | | | | Original author: davidsparks Merged from: //branches/cupcake/... Automated import of CL 146655