summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* am de12c3cf: am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery ↵Eric Laurent2010-09-301-0/+8
|\ | | | | | | | | | | | | | | | | time" into gingerbread Merge commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9' * commit 'de12c3cf56e3f27b2efc60eeae8b5e422747f2b9': Issue 3032913: improve AudioTrack recovery time
| * am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into ↵Eric Laurent2010-09-301-0/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '220ab8877b234e6807b7f6d9028ba55d23220301' into gingerbread-plus-aosp * commit '220ab8877b234e6807b7f6d9028ba55d23220301': Issue 3032913: improve AudioTrack recovery time
| | * Issue 3032913: improve AudioTrack recovery timeEric Laurent2010-09-301-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue showed that when an AudioTrack underruns during a too long period of time and is therefore disabled by audioflinger mixer, it takes an additional delay of up to 3 seconds to recover. This fix adds a simple mechanism to recover immediately when the client application is ready to write data again in the AudioTrack buffer Also throttle warnings on record overflows Change-Id: I8b2c71578dd134b9e60a15ee4d91b70f3799cb3d
* | | am 1b37df95: am 9627847d: Merge "Fix error in AudioEffect command status ↵Eric Laurent2010-09-272-11/+21
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | reporting." into gingerbread Merge commit '1b37df95ec9d03aaa5f4055c6cd86db42f9c9727' * commit '1b37df95ec9d03aaa5f4055c6cd86db42f9c9727': Fix error in AudioEffect command status reporting.
| * | am 9627847d: Merge "Fix error in AudioEffect command status reporting." into ↵Eric Laurent2010-09-272-11/+21
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '9627847d588cd969f60dcc79d165209184a90069' into gingerbread-plus-aosp * commit '9627847d588cd969f60dcc79d165209184a90069': Fix error in AudioEffect command status reporting.
| | * Fix error in AudioEffect command status reporting.Eric Laurent2010-09-242-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioEffect::command() should not interpret the status returned in pReplyData unless the command is ENABLE or DISABLE. Also fixed: - bug in Visualizer::getWAveForm() status reporting. - wrong initialization value for capture buffer in visualizer engine. Change-Id: I60fb0011f9dba96ee74661dec1e8ef441edcaf35
* | | am 5c9f3579: am f30fae63: Merge "Add a check to track a problem the monkey ↵Marco Nelissen2010-09-171-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | script has been triggering." into gingerbread Merge commit '5c9f35799422d818f34f814c76c2acd8c939a40c' * commit '5c9f35799422d818f34f814c76c2acd8c939a40c': Add a check to track a problem the monkey script has been triggering.
| * | am f30fae63: Merge "Add a check to track a problem the monkey script has ↵Marco Nelissen2010-09-171-0/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | been triggering." into gingerbread Merge commit 'f30fae63389a2216faf55636b95a08f35b5c3620' into gingerbread-plus-aosp * commit 'f30fae63389a2216faf55636b95a08f35b5c3620': Add a check to track a problem the monkey script has been triggering.
| | * Add a check to track a problem the monkey script has been triggering.Marco Nelissen2010-09-171-0/+3
| | | | | | | | | | | | Change-Id: If3896946d993cbab2442e17740f18efd7e753a3b
* | | Adding default profiles for specific levels.Nipun Kwatra2010-09-171-24/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The low and high profiles should each match one of the specific profiles. So we need to add the specific profiles corresponding to the low/high profiles. This makes the default profile compliant to documentation + cts. Also fixed javadoc to account time lapse profiles. Change-Id: I34e7307d00ce261c69dc10ead2900025c7f6d428
* | | Media scanner support for tracking files of arbitrary type.Mike Lockwood2010-09-121-26/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native media scanner no longer filters files based on file extension. Audio, video, image and playlist files are handled as before, but non-media files are now inserted into the "files" table, which was originally added to support MTP. Change-Id: I9053218fb6d2671a3bb181405c34442b94678afc Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Exposing specific profile levels + hasProfile().Nipun Kwatra2010-09-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Exposing the specific resolution profile levels QUALITY_{QCIF,CIF,480P,720P,1080P} and the new time lapse profiles QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,CIF,480P,720P,1080P} - Unhiding the hasProfile() function used to test if a given profile exists. Change-Id: I5d8b9e1ba61718f304235e76d85244e428e68643
* | | Merge "Adding hasProfile."Nipun Kwatra2010-09-101-6/+17
|\ \ \
| * | | Adding hasProfile.Nipun Kwatra2010-09-101-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added hasProfile to CamcorderProfile and JNI. - Added hasCamcorderProfile to MediaProfiles. - using android.hardware.Camera.CAMERA_ID_DEFAULT for default camera in get(). Change-Id: Ib57bb49ae79492d7cbc0ec6c7b6efcbf74f80013
* | | | Merge "Added specific resolution and time lapse profiles."Nipun Kwatra2010-09-101-1/+48
|\ \ \ \ | |/ / /
| * | | Added specific resolution and time lapse profiles.Nipun Kwatra2010-09-101-1/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added enums QUALITY_{QCIF,480P,720P,1080P} QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,480P,720P,1080P} in CamcorderProfile and corresponding ones in MediaProfiles. - Added functions createDefaultCamcorderTimeLapseLowProfile, createDefaultCamcorderTimeLapseHighProfile to set default values. - Moved javadoc for constants to the get() function. Change-Id: Ib8b3f8d29395dff77a397d1e6b44cfaf8c481d4d
* | | | Add the new Stagefright ANativeWindow OMX codec API.Jamie Gennis2010-09-031-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change defines the two OMX_SetParameter calls that enable OMX codecs to interact with ANativeWindows. It also adds the plumbing to the IOMX, OMX, and OMXNodeInstance classes to use these new APIs. This is try 2 for this change, after reverting the first one because it broke the build. Change-Id: I94249b72bdb5d5719360f03d7935fcca4ece5028
* | | | Revert "Merge "Add the new Stagefright ANativeWindow OMX codec API.""Jamie Gennis2010-09-011-73/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 8a643b411e1802977f742709113ce01b06a18e12, reversing changes made to 73ea9beaf8eb3d0027e78cbc0ac5e626c3f8deb4.
* | | | Merge "Add the new Stagefright ANativeWindow OMX codec API."Jamie Gennis2010-09-011-0/+73
|\ \ \ \ | |/ / / |/| | |
| * | | Add the new Stagefright ANativeWindow OMX codec API.Jamie Gennis2010-09-011-0/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change defines the two OMX_SetParameter calls that enable OMX codecs to interact with ANativeWindows. It also adds the plumbing to the IOMX, OMX, and OMXNodeInstance classes to use these new APIs. Change-Id: Ibfbf893dc3513db0b3d3221bec5708c77287cddc
* | | | Added setAuxiliaryOutputFile to MediaRecorder and JNINipun Kwatra2010-08-312-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | added setAuxiliaryOutputFile to allow setting of an auxiliary output file. Also added the JNI support. Change-Id: I8c3335192bd6f7fcbfdfc8552cfd0848f2ad2a5d
* | | | am 1577e629: am 12006013: fixedfft: Only includes cpu-features.h when ↵Chia-chi Yeh2010-08-311-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | __arm__ is defined. Merge commit '1577e629866b2700e31c9467478e05ebffcc69a1' * commit '1577e629866b2700e31c9467478e05ebffcc69a1': fixedfft: Only includes cpu-features.h when __arm__ is defined.
| * | am 12006013: fixedfft: Only includes cpu-features.h when __arm__ is defined.Chia-chi Yeh2010-08-301-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '12006013cc2cd0a076855ed068f5f782b24631c3' into gingerbread-plus-aosp * commit '12006013cc2cd0a076855ed068f5f782b24631c3': fixedfft: Only includes cpu-features.h when __arm__ is defined.
| | * fixedfft: Only includes cpu-features.h when __arm__ is defined.Chia-chi Yeh2010-08-311-1/+1
| | | | | | | | | | | | Change-Id: Ifb6c03b38eff3c94a507ceb5043fcc48b364c25c
* | | am 74ede9e4: am 67b50606: Merge "Fix the simulator build." into gingerbreadEric Laurent2010-08-251-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64' * commit '74ede9e4fd3f5ab3c139abd95a22abf9f33c2d64': Fix the simulator build.
| * | am 67b50606: Merge "Fix the simulator build." into gingerbreadEric Laurent2010-08-251-0/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9' into gingerbread-plus-aosp * commit '67b506065e9fe3c56e3d1b47eedfa01170d574f9': Fix the simulator build.
| | * Fix the simulator build.Eric Laurent2010-08-251-0/+2
| | | | | | | | | | | | | | | | | | Fixes the sim build broken by commit 58d3bd08107f44cba79938dd8430e69c0fda4202. Change-Id: I5a63623363d558783dc5254fdd322080cc2f3525
* | | am a102871c: am b80e610b: Merge "Visualizer: replace the FFT implementation ↵Chia-chi Yeh2010-08-243-31/+177
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | with a faster one." into gingerbread Merge commit 'a102871c7cbb74ebddc53231a871145de61351b0' * commit 'a102871c7cbb74ebddc53231a871145de61351b0': Visualizer: replace the FFT implementation with a faster one.
| * | am b80e610b: Merge "Visualizer: replace the FFT implementation with a faster ↵Chia-chi Yeh2010-08-223-31/+177
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | one." into gingerbread Merge commit 'b80e610b070c2cec98a228a8aec450dc24a5f90a' into gingerbread-plus-aosp * commit 'b80e610b070c2cec98a228a8aec450dc24a5f90a': Visualizer: replace the FFT implementation with a faster one.
| | * Visualizer: replace the FFT implementation with a faster one.Chia-chi Yeh2010-08-193-31/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | This implementation uses fixed points instead of floating points. It is slightly inaccurate compared to the old one but still perfect for visualization purpose. It runs 40% faster on passion, 5 times faster on sholes, and of course 14 times faster on sapphire. Change-Id: I1e868417bcffda091becf106a7b941d02813faec
| * | resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aospJean-Baptiste Queru2010-08-171-2/+2
| |\ \ | | |/ | |/| | | | Change-Id: I55c1689c7d0737c943efec28d8164d6a5360621c
| | * Fix compilation errors in libmedia, libstagefright.Rene Bolldorf2010-08-171-2/+2
| | | | | | | | | | | | | | | | | | (invalid conversion from 'const char*' to 'char*') Change-Id: Idef85606b7cff629b2778ed8134c79c892af54c2
* | | Change the framework to use the new camera preview path.Jamie Gennis2010-08-232-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the camera HAL interface take an ANativeWindow interface from which all the camera preview buffers will be allocated. The framework code running in application processes now passes a Surface object rather than an ISurface to the camera server via Binder when setting the preview surface. The camera server then forwards that Surface object (which implements the ANativeWindow interface) to the camera HAL, which uses it to communicate with SurfaceFlinger to allocate the camera preview buffers. Change-Id: Ie438f721559cd7de5e4f848a26d96360dda07b5f
* | | Squashed commit of the following:Andreas Huber2010-08-232-6/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 35cc68814a9537c31fde146e171e7b0bbdfe211e Author: Andreas Huber <andih@google.com> Date: Mon Aug 16 08:48:42 2010 -0700 Only enable support for yuv to yuv conversion on passion, where it's available, use the slower yuv->rgb565 path everywhere else. commit d8ac5a8814103e60d11d2acf61997fc31a1dc58d Author: Andreas Huber <andih@google.com> Date: Fri Aug 13 13:56:44 2010 -0700 The software renderer takes over all rendering, converting from yuv to yuv if possible and rgb565 otherwise. commit 684972074b74318bdcb826ed9b5b0864d2d2e273 Author: Andreas Huber <andih@google.com> Date: Fri Aug 13 09:34:35 2010 -0700 A first shot at supporting the new rendering APIs. Change-Id: Iea9b32856da46950501f1a700f616b5feac710fd
* | | am 0386d04b: am 581581fe: Merge "Fix all fd leaks in authoring engine" into ↵James Dong2010-08-121-0/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '0386d04b19619b03b6bce830010e11d31d3f8a5c' * commit '0386d04b19619b03b6bce830010e11d31d3f8a5c': Fix all fd leaks in authoring engine
| * | Fix all fd leaks in authoring engineJames Dong2010-08-111-0/+2
| | | | | | | | | | | | Change-Id: I17798543f9dd41cc8bef6f6086e66932f9f97be8
* | | am 1ece7d68: am 2a6b80bc: Fixed several audio effects problems.Eric Laurent2010-08-091-3/+22
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1ece7d6873027068a3e7b055597045e9387b217c' * commit '1ece7d6873027068a3e7b055597045e9387b217c': Fixed several audio effects problems.
| * | Fixed several audio effects problems.Eric Laurent2010-08-091-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed constant inversions in AudioEffect.java - Do not return error when enabling an already enabled effect - Update cached effect state in native AudioEffect class when effect is enabled/disabled by command() method - Remove click when restarting effect during disable sequence - Fixed problem in master mute management when volume control is delegated to effect. Change-Id: I6df4ce9fcc54fdc7345df858f639d20d802d6712
* | | am 1f513d88: am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 ↵Andreas Huber2010-08-051-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation." into gingerbread Merge commit '1f513d8821670a33d6361ea521b6756163a3f9bf' * commit '1f513d8821670a33d6361ea521b6756163a3f9bf': Support for Gtalk video, includes AMR/H.263 assembler and packetization support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation.
| * | Support for Gtalk video, includes AMR/H.263 assembler and packetization ↵Andreas Huber2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation. Change-Id: I95b8dd487061add9bade15749e563b01cd99d9a6
* | | am eec3fca6: am 7629e8dd: Merge "Fix issue 2876124." into gingerbreadEric Laurent2010-08-051-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067' * commit 'eec3fca6277296f354ee2b1af0f4b3dceddb3067': Fix issue 2876124.
| * | Fix issue 2876124.Eric Laurent2010-08-041-1/+2
| | | | | | | | | | | | | | | | | | Allow calls to MediaPlayer::notify() in idle state to signal errors from JNI. Change-Id: I1515fe69766f0a926b76e15c4971317da2acd6a0
| * | resolved conflicts for merge of 27eecb70 to gingerbreadJean-Baptiste Queru2010-07-301-1/+1
| |\ \ | | | | | | | | | | | | Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
| | * | fix inaccurate copyrightsJean-Baptiste Queru2010-07-291-1/+1
| | | | | | | | | | | | | | | | Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
* | | | am 0c51c98f: am 4506c62a: fix inaccurate copyrightsJean-Baptiste Queru2010-07-291-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf' * commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf': fix inaccurate copyrights
| * \ \ \ am 4506c62a: fix inaccurate copyrightsJean-Baptiste Queru2010-07-291-1/+1
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp * commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625': fix inaccurate copyrights
| | * | fix inaccurate copyrightsJean-Baptiste Queru2010-07-291-1/+1
| | |/ | | | | | | | | | Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
* | | am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter ↵Eric Laurent2010-07-284-16/+32
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | types." into gingerbread Merge commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf' * commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf': Audio effects: modified command() parameter types.
| * | Audio effects: modified command() parameter types.Eric Laurent2010-07-284-16/+32
| | | | | | | | | | | | | | | | | | | | | 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
* | | am 34161132: am 7070b365: Added support for auxiliary audio effects to ↵Eric Laurent2010-07-213-3/+67
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | AudioTrack and MediaPlayer. Merge commit '34161132030254bac7dd64c9713832e2f961a061' * commit '34161132030254bac7dd64c9713832e2f961a061': Added support for auxiliary audio effects to AudioTrack and MediaPlayer.