summaryrefslogtreecommitdiffstats
path: root/media/java
Commit message (Collapse)AuthorAgeFilesLines
* Basic plumbing to retrieve metadata from the native player.Nicolas Catania2009-07-102-3/+47
| | | | | | | | | | | | | | | | | | | IMediaPlayer.h Added a getMetadata method that mirrors the on in MediaPlayer.java. MediaPlayer.java Added a native method to get the metadata from the native player. Parse the parcel into a Metadata object. Metadata.java Added a stub to parse the Parcel returned by the native player into a set of metadata. android_media_MediaPlayer.cpp JNI call to forward the getMetadata call. MediaPlayerService.cpp MediaPlayerService::Client implements the new getMetadata method added in IMediaPlayer.h
* Merge change 6636Android (Google) Code Review2009-07-092-9/+43
|\ | | | | | | | | * changes: Implemented the metadata changed notification filters.
| * Implemented the metadata changed notification filters.Nicolas Catania2009-07-092-9/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IMediaPlayer: new setMetadataFilter method so set a filter (2 lists of allowed and blocked metadata type) serialized in a Parcel. MediaPlayer.java/android_media_MediaPlayer.cpp/mediaplayer.cpp new setMetadataFilter that passes the filter down to the MediaPlayerService's binder interface. MediaPlayerService.cpp The Client inner class holds the allowed and blocked metadata types. These are in 2 vectors that get populated in the setMetadataFilter. A new shourldDropMetadata method returns true if a type of metadata should be dropped according to the filters. The notify method in run the metadata update notifications thru the filter and possibly drop them.
* | am b799616d: Merge change 6208 into donutAndroid (Google) Code Review2009-07-092-116/+522
|\ \ | |/ |/| | | | | | | | | Merge commit 'b799616d8f0f94e866767fa730f56d82543fb49b' * commit 'b799616d8f0f94e866767fa730f56d82543fb49b': Move ExifInterface to android.media package so we can reference it from MediaScanner.
| * Merge change 6208 into donutAndroid (Google) Code Review2009-07-082-116/+522
| |\ | | | | | | | | | | | | * changes: Move ExifInterface to android.media package so we can reference it from MediaScanner. Also hide public constructor and wrap common use cases as atomic operation to avoid race condition in jhead native codes.
| | * Move ExifInterface to android.media package so we can reference it from ↵repo sync2009-07-082-116/+522
| | | | | | | | | | | | | | | | | | | | | MediaScanner. Also hide public constructor and wrap common use cases as atomic operation to avoid race condition in jhead native codes.
* | | New Metadata API for the MediaPlayer.Nicolas Catania2009-07-082-1/+276
| | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer.java New method getMetadata to fetch metadata from the player. New method setMetadataFilter to filter metadata notification and fetches. Metadata.java Added basic interface. Implementation incomplete.
* | | am e9ac96f7: Merge change 6454 into donutAndroid (Google) Code Review2009-07-083-5/+63
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'e9ac96f76d513d2cee50dfea7d70b14669643ba9' * commit 'e9ac96f76d513d2cee50dfea7d70b14669643ba9': Fix issue 1967295: Add a method to request reloading of audio settings by AudioService.
| * | Fix issue 1967295: Add a method to request reloading of audio settings by ↵Eric Laurent2009-07-083-5/+63
| |/ | | | | | | AudioService.
* | am 88e209dc: Fix issue 1743700: AudioTrack: setPlaybackRate can not set the ↵Eric Laurent2009-07-071-14/+7
|\ \ | |/ | | | | | | | | | | | | | | playback rate to twice of the ouputSR Merge commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c' * commit '88e209dcf8c2ebddda5c272f46d1bd5478bc639c': Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
| * Fix issue 1743700: AudioTrack: setPlaybackRate can not set the playback rate ↵Eric Laurent2009-07-071-14/+7
| | | | | | | | | | | | | | | | to twice of the ouputSR Store sample rate on 32 bits instead of 16 bits in audio_track_cblk_t. Removed sampleRate() methods from AudioTrack and AudioRecord: replaced by getSampleRate(). AudioTrack::setSampleRate() no returns a status.
* | am ef1f21b3: Merge change 6231 into donutAndroid (Google) Code Review2009-07-061-1/+4
|\ \ | |/ | | | | | | | | | | Merge commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7' * commit 'ef1f21b34f5624adb7436d3da927660ed16c97c7': Don't trim() in the mediascanner, as that would remove the special "sort first" character.
| * Don't trim() in the mediascanner, as that would remove the special "sort ↵Marco Nelissen2009-07-061-1/+4
| | | | | | | | first" character.
* | am 899725b0: Make sure ringtones are sorted correctly.Marco Nelissen2009-07-061-4/+7
|\ \ | |/ | | | | | | | | | | Merge commit '899725b05dd5c8c51f9f802d4f0a7190532ce0a5' * commit '899725b05dd5c8c51f9f802d4f0a7190532ce0a5': Make sure ringtones are sorted correctly.
| * Make sure ringtones are sorted correctly.Marco Nelissen2009-07-061-4/+7
| |
* | Direct api to the native media player.Nicolas Catania2009-06-241-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer.java has 3 new methods: * newRequest creates a Parcel that can be used to send data to the native player using invoke. * invoke issues synchronous calls to the native player using opaque parcels for the request and reply. IMediaPlayer.h has 1 new abstract method: * invoke The Midi and Vorbis players have a stub for these. So far only PV makes use of that new feature. To avoid any copy overhead, the JNI interface uses Parcel as a java object (no serialization/copy happens at the JNI layer). The remote interface token is inserted when the Parcel is constructed in java. That way the parcel is already routable when it reaches IMediaPlayer.cpp (proxy). No extra copy is needed there.
* | am 1bee98af: Merge change 5100 into donutAndroid (Google) Code Review2009-06-231-168/+465
|\ \ | |/ | | | | | | | | | | Merge commit '1bee98af6532eba3c6cda636eee890530c95a2a7' * commit '1bee98af6532eba3c6cda636eee890530c95a2a7': Fill in CDMA gaps and clean up ToneGenerator code
| * Fill in CDMA gaps and clean up ToneGenerator codeDavid Krause2009-06-231-168/+465
| |
* | am 0e3d77af: Merge change 4324 into donutAndroid (Google) Code Review2009-06-161-4/+4
|\ \ | |/ | | | | | | | | | | Merge commit '0e3d77af4ec6cd4961cfb144045ee9dfe479ccf6' * commit '0e3d77af4ec6cd4961cfb144045ee9dfe479ccf6': AudioService: Fix routing problem recently introduced in setRouting().
| * AudioService: Fix routing problem recently introduced in setRouting().Mike Lockwood2009-06-161-4/+4
| | | | | | | | | | | | | | Do not disable a route unless routes is zero, to avoid accidentally disabling if the same route is enabled twice in a row. Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am 3d4b7065: Merge change 4047 into donutAndroid (Google) Code Review2009-06-121-18/+35
|\ \ | |/ | | | | | | | | | | Merge commit '3d4b7065e960cdaecc8d9fd609c2e508a1f9d8f5' * commit '3d4b7065e960cdaecc8d9fd609c2e508a1f9d8f5': Fix issue #899198 MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly
| * Merge change 4047 into donutAndroid (Google) Code Review2009-06-121-18/+35
| |\ | | | | | | | | | | | | * changes: Fix issue #899198 MODE_RINGER_STREAMS_AFFECTED does not restore volumes correctly
| | * Fix issue #899198 MODE_RINGER_STREAMS_AFFECTED does not restore volumes ↵Eric Laurent2009-06-121-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly The problem is that setRingerModeInt() does not handle streams not affected by ringer mode: when enabling "Alarm in silent mode" while in silent mode, setRingerModeInt is called after alarm streamis removed from ringer mode affected streams, and nothing is done. The fix constists in also processing streams that are not affected by ringer mode and to restore last audible volume for them. It does not arm reapplying the volume for streams the are never affected by ringer mode as we don't do this very often. The other problem noted in the bug report (ringer volume always restored to non zero value when exiting silent mode even if set to zero before) is also fixed: a new parameter is added to setIndex() and setStreamVolumeInt() to explicitely request to store the volume index as last audible instead of doing it automatically if index > 0.
* | | am d670b8c6: Merge change 3981 into donutAndroid (Google) Code Review2009-06-121-178/+178
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a' * commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a': Removed trailing whitespaces.
| * | Removed trailing whitespaces.Nicolas Catania2009-06-111-178/+178
| |/
* | am faf41044: Merge change 3644 into donutAndroid (Google) Code Review2009-06-091-0/+1
|\ \ | |/ | | | | | | | | | | Merge commit 'faf410443f0c2ab2d30a1c8ce90f83157b5e593b' * commit 'faf410443f0c2ab2d30a1c8ce90f83157b5e593b': Print a message to the log when a file can't be opened on the client side.
| * Print a message to the log when a file can't be opened on the client side.Marco Nelissen2009-06-091-0/+1
| |
* | am b2df1699: Merge change 1548 into donutAndroid (Google) Code Review2009-06-081-4/+72
|\ \ | |/ | | | | | | | | | | Merge commit 'b2df1699c996e62baa78877978cd2c5607ea4194' * commit 'b2df1699c996e62baa78877978cd2c5607ea4194': NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).
| * NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).Jianhong Jiang2009-06-081-4/+72
| |
* | am 0f5179c7: Merge change 2716 into donutAndroid (Google) Code Review2009-05-291-1/+11
|\ \ | |/ | | | | | | | | | | Merge commit '0f5179c7d333ddab729b5943766637c21d1b74db' * commit '0f5179c7d333ddab729b5943766637c21d1b74db': Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow
| * Merge change 2716 into donutAndroid (Google) Code Review2009-05-291-1/+11
| |\ | | | | | | | | | | | | * changes: Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow passing a null surface. The API is now enabled to change the surface while the video is playing. This could allow orientation changes during playback or to allow the audio track from a video to play in the background. NOTE: There are still changes required to pmem driver to allow remapping shared physical memory into a process in order for this to work. This change only enables the API to send the appropriate calls when the lower level code supports it.
| | * Update MediaPlayer to allow setVideoSurface calls after prepare. Also allowDave Sparks2009-05-291-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passing a null surface. The API is now enabled to change the surface while the video is playing. This could allow orientation changes during playback or to allow the audio track from a video to play in the background. NOTE: There are still changes required to pmem driver to allow remapping shared physical memory into a process in order for this to work. This change only enables the API to send the appropriate calls when the lower level code supports it.
* | | am f6355e24: Merge change 2399 into donutAndroid (Google) Code Review2009-05-281-40/+279
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'f6355e24f5382356ea197135fdeff827aabfdb90' * commit 'f6355e24f5382356ea197135fdeff827aabfdb90': Motorola additions for CDMA support without CdmaSuppConnTracker
| * | Motorola additions for CDMA support without CdmaSuppConnTrackerWink Saville2009-05-281-40/+279
| |/ | | | | | | | | There are corresponding changes to hardware/ril and packages/apps/Phone that are required to go with these changes.
* | am de8268d6: Merge change 2331 into donutAndroid (Google) Code Review2009-05-262-10/+19
|\ \ | |/ | | | | | | | | | | Merge commit 'de8268d6d1cd168510c490b17e93154d2eab767c' * commit 'de8268d6d1cd168510c490b17e93154d2eab767c': Fix issue 1846343 - part 1
| * Fix issue 1846343 - part 1Eric Laurent2009-05-262-10/+19
| | | | | | | | | | | | | | | | This change is the first part of a fix for issue 1846343, : - Added new enum values for input sources in AudioRecord and MediaRecorder for voice uplink, downlink and uplink+downlink sources. - renamed streamType to inputSource in all native functions handling audio record. A second change is required in opencore author driver and android audio input to completely fix the issue.
* | 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 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
| |
* | manual merge f3af740bdfc261b1cb25c0799af780d3753d4518The Android Open Source Project2009-05-061-8/+58
|\ \ | |/ | | | | Merge commit 'f3af740bdfc261b1cb25c0799af780d3753d4518'
| * Fixed issue 1709450: Requirements for CDMA Tone GeneratorEric Laurent2009-05-061-8/+58
| | | | | | | | | | | | | | | | | | | | 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
* | Merge donut into masterJean-Baptiste Queru2009-04-222-6/+7
|\ \ | |/
| * 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-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v1.1 at 2024-09-20 11:42:48 +0000