summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am e67332f8: am 92e847ed: Audio effects: aligned Equalizer API argument ↵Eric Laurent2010-07-303-63/+124
|\ | | | | | | | | | | | | | | | | types on OpenSL ES SLEqualizerItf. Merge commit 'e67332f879b3f97baaac2252b53ac64686aebdbb' * commit 'e67332f879b3f97baaac2252b53ac64686aebdbb': Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
| * am 92e847ed: Audio effects: aligned Equalizer API argument types on OpenSL ↵Eric Laurent2010-07-303-63/+124
| |\ | | | | | | | | | | | | | | | | | | | | | | | | ES SLEqualizerItf. Merge commit '92e847ed8e455dca3b2d33d92999e3960404d9af' into gingerbread-plus-aosp * commit '92e847ed8e455dca3b2d33d92999e3960404d9af': Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.
| | * Audio effects: aligned Equalizer API argument types on OpenSL ES SLEqualizerItf.Eric Laurent2010-07-303-63/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modified types of some arguments and returned values of the Equalizer class from int to short to match those defined by OpenSL ES SLEqualizerItf interface. Also fixed a problem with set properties in equalizer engine implementation. Change-Id: I75894bad0cb67b01c18ca5e22f9687e75ee491b8
* | | am 0c51c98f: am 4506c62a: fix inaccurate copyrightsJean-Baptiste Queru2010-07-293-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf' * commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf': fix inaccurate copyrights
| * | am 4506c62a: fix inaccurate copyrightsJean-Baptiste Queru2010-07-293-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp * commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625': fix inaccurate copyrights
| | * | fix inaccurate copyrightsJean-Baptiste Queru2010-07-293-3/+3
| | | | | | | | | | | | | | | | Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
| | * | move native services under services/Mathias Agopian2010-07-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moved surfaceflinger, audioflinger, cameraservice all native services should now reside in this location. Change-Id: Icd7336f7289db35df9c8c1857a5122bb8a6f1c86
* | | | Support for video size to be different from captured picture size.Nipun Kwatra2010-07-292-19/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding support to allow video size to be different than the supported picture sizes. A picture size larger than the demanded video size is chosen. Captured pictures are then cropped to the size of the desired video size. Cropping is done from the the center portion of the picture. Change-Id: I6bcbe16f94b6ecbcf28b7f46826a81b4b6b8cbc3
* | | | Adding YUVImage and YUVCanvas.Nipun Kwatra2010-07-293-0/+500
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | YUVImage is a container class to hold YUV data and provide various utilities, e.g. to set/get pixel values for different YUV formats, fast copying routines, etc. Currently supported YUV420 Planar and YUV420 Semi Planar. YUVCanvas holds a reference to a YUVImage on which it can do various drawing operations. Change-Id: I052a57b7fbc834efe1626914f76c04c091996cac
* | | | am 42556025: am 6dea6f4e: am 16263d9f: Squashed commit of the following:Andreas Huber2010-07-291-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '425560259c6d41e7f413fdd0f517dc47f350c533' * commit '425560259c6d41e7f413fdd0f517dc47f350c533': Squashed commit of the following:
| * | | am 6dea6f4e: am 16263d9f: Squashed commit of the following:Andreas Huber2010-07-291-0/+1
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit '6dea6f4e71b53e421564d783c227cbe0a2469183' into gingerbread-plus-aosp * commit '6dea6f4e71b53e421564d783c227cbe0a2469183': Squashed commit of the following:
| | * | am 16263d9f: Squashed commit of the following:Andreas Huber2010-07-291-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '16263d9f8cc01392c2f3678b381ce897647c8c81' into gingerbread * commit '16263d9f8cc01392c2f3678b381ce897647c8c81': Squashed commit of the following:
| | | * | Squashed commit of the following:Andreas Huber2010-07-293-48/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 4abf16bb04dc9695fedf4007a84f903074312ccd Author: Andreas Huber <andih@google.com> Date: Tue Jul 20 09:21:17 2010 -0700 Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly. Change-Id: Icc790122744745e9a88099788d4818ca1e265a82 related-to-bug: 2826841 commit 09c74da63e6ad5cb5dafb70f62696d75d2978967 Author: James Dong <jdong@google.com> Date: Sun Jul 18 17:57:01 2010 -0700 Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled. Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8 commit f672bf2a782dc7d5fb6325d611a7fe17045dfe9a Author: James Dong <jdong@google.com> Date: Thu Jul 8 20:56:13 2010 -0700 Enable the support for decoding audio with AAC+ and eAAC+ features bug - 282684 Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b Change-Id: I012f1179e933b6d1345d2368f357576c722485f7
| | | * | Fix issue 2811538: System server crash when disconnecting BT headset after ↵Eric Laurent2010-07-011-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using SCO off call. Problem: When the bluetooth device is removed, the AudioService clears all active SCO connections and unlinks from the client application's binder interface death. The problem is that the unlinking is done even if no more connections are active for a given client, which throws a runtime exception that is not catched causing the system server to crash. The fix consists in calling unlinkToDeath() in ScoClient.clearCount() only if the number of active SCO connections for this client is not 0. The NoSuchElementException exception is also catched when calling unlinkToDeath() Change-Id: I7086424301fc63a5666da61c38169349d3e078f4
* | | | | am 8ddb8f81: am bc1daf01: Merge "Eliminate the linear cost associated with ↵James Dong2010-07-281-9/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mSampleSizes.size()" into gingerbread Merge commit '8ddb8f81902045ec8a53ec14b8fb936fd42517e0' * commit '8ddb8f81902045ec8a53ec14b8fb936fd42517e0': Eliminate the linear cost associated with mSampleSizes.size()
| * | | | am bc1daf01: Merge "Eliminate the linear cost associated with ↵James Dong2010-07-281-9/+15
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mSampleSizes.size()" into gingerbread Merge commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d' into gingerbread-plus-aosp * commit 'bc1daf016020ce022ceb971f09e862da5ee82b1d': Eliminate the linear cost associated with mSampleSizes.size()
| | * | | Eliminate the linear cost associated with mSampleSizes.size()James Dong2010-07-281-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The linear cost associated with mSampleSizes.size() call causes the CPU load to increase overtime as more and more audio/video samples are recorded. - Other Lists used in the MP4 file writer may have similar issues, but the size() call is not made for each output audio/video output sample, or the size of the list is bounded (not linear to the total number of audio/video output samples). As for now, we can live with the small cost (tested with 30 minutes long recording). Change-Id: I23bd93ea4256cb0be0c1649760e39e6809eb4946
* | | | | Merge changes I00d6980a,I814221b4,Id88603a5Mike Lockwood2010-07-282-0/+55
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: CameraBrowser: Launch itself when a camera is attached to USB. Send Intents when PTP compatible devices are connected/disconnected to USB Give system server permission to access USB.
| * | | | | CameraBrowser: Launch itself when a camera is attached to USB.Mike Lockwood2010-07-272-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00d6980a1f8e6607c1368cbf78d8e824514c666b Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | am 84665f6d: am 7e397842: Reduce memory usage by the MP4 file writer - ↵James Dong2010-07-281-42/+44
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don\'t store timestamp for each output sample - Don\'t store timestamp for statistical data collection if the collection of statistical data is not requested Merge commit '84665f6dc2d0b5dfa6a46463677c51f2b670e511' * commit '84665f6dc2d0b5dfa6a46463677c51f2b670e511': Reduce memory usage by the MP4 file writer
| * | | | | am 7e397842: Reduce memory usage by the MP4 file writer - Don\'t store ↵James Dong2010-07-281-42/+44
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timestamp for each output sample - Don\'t store timestamp for statistical data collection if the collection of statistical data is not requested Merge commit '7e397842d53a4242a019daa4b234910273121c30' into gingerbread-plus-aosp * commit '7e397842d53a4242a019daa4b234910273121c30': Reduce memory usage by the MP4 file writer
| | * | | | Reduce memory usage by the MP4 file writerJames Dong2010-07-281-42/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't store timestamp for each output sample - Don't store timestamp for statistical data collection if the collection of statistical data is not requested TODO: 1. Reduce CPU load by elimnating the list cost associated with List.size() call. Change-Id: I590bc17176596a65952c982574b82ee3b15b7d1c
* | | | | | am cb51115c: am 5587bb7e: Merge "Interleave the audio and video by default - ↵James Dong2010-07-282-4/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default interleave duration is set to 1 second" into gingerbread Merge commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b' * commit 'cb51115cca81ba47d00aa344f6ed16d1056b056b': Interleave the audio and video by default
| * | | | | am 5587bb7e: Merge "Interleave the audio and video by default - default ↵James Dong2010-07-282-4/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interleave duration is set to 1 second" into gingerbread Merge commit '5587bb7e375c17c1320918e6f473625af1f5e5ac' into gingerbread-plus-aosp * commit '5587bb7e375c17c1320918e6f473625af1f5e5ac': Interleave the audio and video by default
| | * | | | Merge "Interleave the audio and video by default - default interleave ↵James Dong2010-07-282-4/+6
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | duration is set to 1 second" into gingerbread
| | | * | | | Interleave the audio and video by defaultJames Dong2010-07-282-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - default interleave duration is set to 1 second This can dramatically reduce the memory usage by the MP4 file writer. Change-Id: Ia3ff202cabfcd2d3f183065d31e4596617c2dded
* | | | | | | am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter ↵Eric Laurent2010-07-2811-32/+67
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | types." into gingerbread Merge commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf' * commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf': Audio effects: modified command() parameter types.
| * | | | | am 62d83a0c: Merge "Audio effects: modified command() parameter types." into ↵Eric Laurent2010-07-2811-32/+67
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '62d83a0c894b72d9abda1340d278d2aeec11e0fb' into gingerbread-plus-aosp * commit '62d83a0c894b72d9abda1340d278d2aeec11e0fb': Audio effects: modified command() parameter types.
| | * | | | Audio effects: modified command() parameter types.Eric Laurent2010-07-2811-32/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type of the cmd, cmdSize and *pReplySize parameters of the effect control interface command() function have been modified from int to uint32_t. This is more consistent with their role. Change-Id: I84d289fc262d6753747910f06f485597dfee6591
* | | | | | MTP host: Reduce buffer size for readObject so we don't clog our pipe.Mike Lockwood2010-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I24d2b1551af5843e48c0a63b84925b3a6451e36a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | MTP: Turn off excessive loggingMike Lockwood2010-07-277-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib0dd8cb99efa324d0b4e742bffeb913d6122ace2 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | Try to fix the sim build.Mike Lockwood2010-07-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6e94c938263b2fd1931ed60c26af1134ff035455 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | resolved conflicts for merge of d306cc81 to masterEric Laurent2010-07-2710-104/+621
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
| * | | | | am ca57d1cc: Audio Effects: added methods to effects java classes to store ↵Eric Laurent2010-07-2711-100/+622
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and load current effect settings in a single call. Merge commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3' into gingerbread-plus-aosp * commit 'ca57d1cc89d65dfbd59c749c5736574cd08c7bd3': Audio Effects: added methods to effects java classes to store and load current effect settings in
| | * | | | Audio Effects: added methods to effects java classes to store and load ↵Eric Laurent2010-07-2711-100/+622
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | current effect settings in a single call. Addional changes: - Fixed simulator build - Use effect interface UUIDs from OpenSL ES includes when available - Added cleanspec rules to remove now obsolete test effect libraries - Fixed bug in AudioEffect JNI setParameter function. Change-Id: Ic25ddb135e2cec5a68c181d727321f5ac7a1ab6b
* | | | | | Merge "Simple command line test tool for MTP host."Mike Lockwood2010-07-264-0/+671
|\ \ \ \ \ \
| * | | | | | Simple command line test tool for MTP host.Mike Lockwood2010-07-264-0/+671
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifd13e1ca5d49a5477a9850d94d443a50bbc32ff1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | Merge "CameraBrowser: Add support for copying files from camera to internal ↵Mike Lockwood2010-07-265-51/+143
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | storage."
| * | | | | | CameraBrowser: Add support for copying files from camera to internal storage.Mike Lockwood2010-07-265-51/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00b765afec0558dfe27961bd0b2e01473c29fc22 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | Merge "MTP host: Add support for reading files from an MTP device via ↵Mike Lockwood2010-07-266-2/+333
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | ParcelFileDescriptor"
| * | | | | | MTP host: Add support for reading files from an MTP device via ↵Mike Lockwood2010-07-266-2/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ParcelFileDescriptor Also added some support for sending files to the device that hasn't been debugged yet. Add locking to MtpDevice to prevent it from attempting multiple transactions simultaneously. Change-Id: I2b995ba0af086cc6920bd6b8c869f540ad78560a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | Merge "MTP: Don't request thumbnails for folder objects in MtpCursor"Mike Lockwood2010-07-262-13/+19
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MTP: Don't request thumbnails for folder objects in MtpCursorMike Lockwood2010-07-262-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I75a0a834ab746bed0a35883539c8dbc104789157 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | Merge "MTP: Add hard coded support to recognize a couple MTP music players ↵Mike Lockwood2010-07-261-3/+37
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | for testing purposes."
| * | | | | | MTP: Add hard coded support to recognize a couple MTP music players for ↵Mike Lockwood2010-07-261-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing purposes. Change-Id: I2d09d78e83d13cfb3edff02372a6fc34b1e4d8b1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | am e80c30c6: am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper ↵Eric Laurent2010-07-261-33/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effect init function." into gingerbread Merge commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338' * commit 'e80c30c6b557fab2f5fc7a87c51018f5a8074338': Fixed bug in vlm effect bunde wrapper effect init function.
| * | | | | | am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init ↵Eric Laurent2010-07-261-33/+7
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | function." into gingerbread Merge commit '00de721859ca291d0e212a6970f0bd8b3a2f8428' into gingerbread-plus-aosp * commit '00de721859ca291d0e212a6970f0bd8b3a2f8428': Fixed bug in vlm effect bunde wrapper effect init function.
| | * | | | | Merge "Fixed bug in vlm effect bunde wrapper effect init function." into ↵Eric Laurent2010-07-261-33/+7
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | Fixed bug in vlm effect bunde wrapper effect init function.Eric Laurent2010-07-261-33/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The status in the command reply field was not initialized by Effect_command() for EFFECT_CMD_INIT causing unpredictable failures when initializing an effect. Change-Id: I7dccb094c9244fad4ed9aea3062a395db295e082
* | | | | | | | am df5c3b50: am 739bf285: Merge "LVM release 1.04." into gingerbreadEric Laurent2010-07-2613-112/+97
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Merge commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365' * commit 'df5c3b5024276af8b44d00bb28ce620ab31e2365': LVM release 1.04.
generated by cgit v1.1 at 2025-01-27 04:36:54 +0000