summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 3d7b8d1a: Merge change 5158 into donutAndroid (Google) Code Review2009-06-241-1/+1
|\ | | | | | | | | | | | | Merge commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282' * commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282': Use a ref-counted callback interface for Camera.
| * Use a ref-counted callback interface for Camera.Dave Sparks2009-06-241-1/+1
| | | | | | | | | | | | | | | | | | This allows the camera service to hang onto the callback interface until all callbacks have been processed. This prevents problems where pending callbacks in binder worker threads are processed after the Java camera object and its associated native resources have been released. Bug 1884362
* | am 9efba9d2: Merge change 5176 into donutAndroid (Google) Code Review2009-06-241-3/+46
|\ \ | |/ | | | | | | | | | | Merge commit '9efba9d29f32daf1b6ee6485bae6764ab24f04e9' * commit '9efba9d29f32daf1b6ee6485bae6764ab24f04e9': Export the output to a text file and save to sdcard
| * Merge change 5176 into donutAndroid (Google) Code Review2009-06-231-3/+46
| |\ | | | | | | | | | | | | * changes: Export the output to a text file and save to sdcard
| | * Export the output to a text file and save to sdcardYu Shan Emily Lau2009-06-231-3/+46
| | |
* | | Direct api to the native media player.Nicolas Catania2009-06-2410-5/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-232-303/+1146
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1bee98af6532eba3c6cda636eee890530c95a2a7' * commit '1bee98af6532eba3c6cda636eee890530c95a2a7': Fill in CDMA gaps and clean up ToneGenerator code
| * | Merge change 5100 into donutAndroid (Google) Code Review2009-06-232-303/+1146
| |\ \ | | | | | | | | | | | | | | | | * changes: Fill in CDMA gaps and clean up ToneGenerator code
| | * | Fill in CDMA gaps and clean up ToneGenerator codeDavid Krause2009-06-232-303/+1146
| | |/
* | | am 843f5eb3: Merge change 5054 into donutAndroid (Google) Code Review2009-06-231-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '843f5eb36a67367ae76800f74e184f00af50ef54' * commit '843f5eb36a67367ae76800f74e184f00af50ef54': Rollback the number of loop in the memory stress test
| * | Rollback the number of loop in the memory stress testYu Shan Emily Lau2009-06-221-2/+2
| |/
* | am 11348cff: Merge change 4885 into donutAndroid (Google) Code Review2009-06-221-39/+47
|\ \ | |/ | | | | | | | | | | Merge commit '11348cffef46585027ba3035357370177a554826' * commit '11348cffef46585027ba3035357370177a554826': Merge the output file into one.
| * Merge the output file into one.Yu Shan Emily Lau2009-06-221-39/+47
| |
* | Renamed all android.hardware.IMedia* strings to android.media.IMedia*niko2009-06-225-8/+5
| | | | | | | | | | | | | | | | | | | | The android.hardware.ICamera string have not been changed (but is looks like the camera service and client one should undergo the same procedure) The implementation of the interface must provide a unique string for it's interface name. Currently all these strings in the media framework start with 'android.hardware' when it should really be 'android.media', the interface token has nothing to do with hardware.
* | 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-124-186/+185
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a' * commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a': Removed trailing whitespaces.
| * | Removed trailing whitespaces.Nicolas Catania2009-06-114-186/+185
| |/
* | am 1d7d5db7: Merge change 3799 into donutAndroid (Google) Code Review2009-06-101-7/+1
|\ \ | |/ | | | | | | | | | | Merge commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf' * commit '1d7d5db74f14e871c7be719a0cddf52a5a40dcbf': Turned on the windows media related test cases as the binary already integrated.
| * Merge change 3799 into donutAndroid (Google) Code Review2009-06-101-7/+1
| |\ | | | | | | | | | | | | * changes: Turned on the windows media related test cases as the binary already integrated.
| | * Turned on the windows media related test cases as the binary already integrated.Yu Shan Emily Lau2009-06-101-7/+1
| | |
* | | 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-083-12/+105
|\ \ | |/ | | | | | | | | | | Merge commit 'b2df1699c996e62baa78877978cd2c5607ea4194' * commit 'b2df1699c996e62baa78877978cd2c5607ea4194': NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).
| * Merge change 1548 into donutAndroid (Google) Code Review2009-06-083-12/+105
| |\ | | | | | | | | | | | | * changes: 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-083-12/+105
| | |
* | | am bdf90a08: Merge change 3462 into donutAndroid (Google) Code Review2009-06-081-0/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3' * commit 'bdf90a08a22189254274078ed39ec5a1db37a0b3': Capture the memory output before the playback and record start.
| * | Capture the memory output before the playback and record start.Yu Shan Emily Lau2009-06-081-0/+7
| |/
* | am 162c9d0e: Merge change 2805 into donutAndroid (Google) Code Review2009-06-011-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '162c9d0e90eaa71adc8c7d1456d1a9a95e638c47' * commit '162c9d0e90eaa71adc8c7d1456d1a9a95e638c47': base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
| * Merge change 2805 into donutAndroid (Google) Code Review2009-06-011-1/+1
| |\ | | | | | | | | | | | | * changes: base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGE
| | * base: Rename WRITE_SDCARD -> WRITE_EXTERNAL_STORAGESan Mehat2009-06-011-1/+1
| | | | | | | | | | | | Signed-off-by: San Mehat <san@google.com>
* | | am 450ad31b: Merge change 2774 into donutAndroid (Google) Code Review2009-06-011-6/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '450ad31b62af468aa0fb308a5c983b8f8334ae4e' * commit '450ad31b62af468aa0fb308a5c983b8f8334ae4e': Limit check on maxChannels for SoundPool.
| * | Merge change 2774 into donutAndroid (Google) Code Review2009-06-011-6/+10
| |\ \ | | |/ | |/| | | | | | | * changes: Limit check on maxChannels for SoundPool. Bug 1838724
| | * Limit check on maxChannels for SoundPool.Dave Sparks2009-06-011-6/+10
| | | | | | | | | | | | Bug 1838724
* | | get rid of utils.hMathias Agopian2009-05-312-2/+8
| | |
* | | am 0f5179c7: Merge change 2716 into donutAndroid (Google) Code Review2009-05-292-8/+34
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '0f5179c7d333ddab729b5943766637c21d1b74db' * commit '0f5179c7d333ddab729b5943766637c21d1b74db': Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow
| * | Merge change 2716 into donutAndroid (Google) Code Review2009-05-292-8/+34
| |\ \ | | | | | | | | | | | | | | | | * 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-292-8/+34
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge change 2399 into donutAndroid (Google) Code Review2009-05-281-40/+279
| |\ \ | | | | | | | | | | | | | | | | * changes: 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 2af7e639: Merge change 2654 into donutAndroid (Google) Code Review2009-05-281-9/+97
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '2af7e639906981b1562f3187a60b6c848b7da17c' * commit '2af7e639906981b1562f3187a60b6c848b7da17c': Added the two validations for the memory stress test
| * | Added the two validations for the memory stress testYu Shan Emily Lau2009-05-281-9/+97
| |/ | | | | | | | | 1) Set the maximum memory leakage to 150K in 200 loops of playback. 2) Check the pid of the meidaserver.
* | am f3288f17: Merge change 2468 into donutAndroid (Google) Code Review2009-05-261-0/+2
|\ \ | |/ | | | | | | | | | | Merge commit 'f3288f178ae2b2c7910b234f54f43475a83eb860' * commit 'f3288f178ae2b2c7910b234f54f43475a83eb860': setVolume did not check interface descriptor
| * setVolume did not check interface descriptorDave Sparks2009-05-261-0/+2
| | | | | | | | DO NOT MERGE
* | some work to try to reduce the code size of some native librariesMathias Agopian2009-05-269-54/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - make sure that all binder Bn classes define a ctor and dtor in their respective library. This avoids duplication of the ctor/dtor in libraries where these objects are instantiated. This is also cleaner, should we want these ctor/dtor to do something one day. - same change as above for some Bp classes and various other non-binder classes - moved the definition of CHECK_INTERFACE() in IInterface.h instead of having it everywhere. - improved the CHECK_INTERFACE() macro so it calls a single method in Parcel, instead of inlining its code everywhere - IBinder::getInterfaceDescriptor() now returns a "const String16&" instead of String16, which saves calls to String16 and ~String16 - implemented a cache for BpBinder::getInterfaceDescriptor(), since this does an IPC. HOWEVER, this method never seems to be called. The cache makes BpBinder bigger, so we need to figure out if we need this method at all.
* | am de8268d6: Merge change 2331 into donutAndroid (Google) Code Review2009-05-265-21/+36
|\ \ | |/ | | | | | | | | | | Merge commit 'de8268d6d1cd168510c490b17e93154d2eab767c' * commit 'de8268d6d1cd168510c490b17e93154d2eab767c': Fix issue 1846343 - part 1