summaryrefslogtreecommitdiffstats
path: root/media/libmedia
Commit message (Collapse)AuthorAgeFilesLines
* am 4b440268: am c929677e: Merge "Increase the number of useful bits in the ↵Marco Nelissen2011-01-251-2/+7
|\ | | | | | | | | | | | | spectrum." into gingerbread * commit '4b44026879723d924ddc306ea1e330a9e87c3a1c': Increase the number of useful bits in the spectrum.
| * am c929677e: Merge "Increase the number of useful bits in the spectrum." ↵Marco Nelissen2011-01-251-2/+7
| |\ | | | | | | | | | | | | | | | | | | into gingerbread * commit 'c929677e017759047d94599faa1b80ebe278fefb': Increase the number of useful bits in the spectrum.
| | * Increase the number of useful bits in the spectrum.Marco Nelissen2011-01-241-2/+7
| | | | | | | | | | | | Change-Id: I3efc2ac8db689285566df35cb6f594aab41141db
| * | merge 83fdc69e from gingerbread - do not mergeJean-Baptiste Queru2011-01-142-64/+14
| |\ \ | | |/ | | | | | | Change-Id: Ib1e9e12244a44f75a93d66142e71915de6386680
| | * Squash commits of the following patches, cherry-picked from other branch - ↵James Dong2011-01-122-64/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not merge. o Prepare for publishing MediaMetadataRetriever as public API step one: o replaced captureFrame with getFrameAtTime o removed getMode o Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime() as part of the preparation for publishing MediaMetadataRetriever as public Java API o Remove captureFrame from MediaMetadataRetriever.java class It has been replaced by getFrameAtTime() method o Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java o Publish MediaMetadataRetriever.java as public API o Removed setMode() methods and related mode constants o Removed some of the unused the metadata keys o Updated the javadoc o part of a multi-project change. bug - 3309041 Change-Id: I2efb6e8b8d52897186b016cb4efda6862f5584c4
| * | am 5a756fb0: Merge "Fix issue 2712130: Sholes: problem when playing audio ↵Eric Laurent2010-12-161-1/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | while recording over bluetooth SCO." into gingerbread * commit '5a756fb0f1f3f8cd7612284c889dfc69875577a8': Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.
| | * Fix issue 2712130: Sholes: problem when playing audio while recording over ↵Eric Laurent2010-12-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bluetooth SCO. The problem is that when an input stream is opened for record over bluetooth SCO, the kernel mono audio device should be opened in RW mode to allow further use of this same device by an output stream also routed to bluetooth SCO. This does not happen because of a bug in AudioSystem::isBluetoothScoDevice() that does not return true when the device is DEVICE_IN_BLUETOOTH_SCO_HEADSET (input device for blurtooth SCO). Change-Id: Ic78bf324b4a68e65721d763dc7682ce7a8f14f75
* | | Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests.Andreas Huber2011-01-191-58/+20
| | | | | | | | | | | | | | | | | | Refactor the logic a little. Change-Id: Idd7a26678d846c96b0b11f096305e7467381bda3
* | | Publish MediaMetadataRetriever.java as public APIJames Dong2011-01-122-27/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Removed setMode() methods and related mode constants o Removed some of the unused the metadata keys o Updated the javadoc o part of a multi-project change. bug - 2433195 Change-Id: I5ed167f1fd6a53cb143b7dc385b149431d434438
* | | Increase cache size and low-watermark threshold, alsoAndreas Huber2011-01-111-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer now sends out MEDIA_INFO,MEDIA_INFO_VIDEO_TRACK_LAGGING messages to the JAVA client informing it how much (if at all) the video lags behind audio (arg2 is the media delay in ms). Change-Id: I6933f573d8597a35112e4b5ee0fcb826a7f6ddd1 related-to-bug: 3335220
* | | MediaScanner: Add support for scanning empty directoriesMike Lockwood2010-12-161-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the media scanner does not create database entries for directories unless they contain a file that is scanned. Fixing this so we provide a consistent view of the world to MTP. Change-Id: Ia776acfeae23192183e7192d63cdc34d830ea889 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | API Support for both synchronous and queued commands, optionally associated ↵Andreas Huber2010-12-062-6/+25
| | | | | | | | | | | | | | | | | | metadata. Change-Id: Idb90d64cb638942210c5822b3cba2f05b087d601
* | | Prepare for publishing MediaMetadataRetriever as public APIJames Dong2010-12-032-37/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | step one: o replaced captureFrame with getFrameAtTime o removed getMode bug - 2433195 Change-Id: I38a8cecef29014692f0b08b8818326e3ebb40a12
* | | am 4f93f08d: am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit ↵Chia-chi Yeh2010-11-301-4/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | sample to 16-bit sample." into gingerbread * commit '4f93f08d8c8b8067ff2176d9ec15c76c0e4cc0c2': Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
| * | am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to ↵Chia-chi Yeh2010-11-301-4/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | 16-bit sample." into gingerbread * commit '683a7ff922409d2aa6c944bc4e08de32029e80e5': Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
| | * Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." ↵Chia-chi Yeh2010-11-291-4/+4
| | |\ | | | | | | | | | | | | into gingerbread
| | | * Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.Chia-chi Yeh2010-11-011-4/+4
| | | | | | | | | | | | | | | | Change-Id: Ie6d77b0f61a37333e05cdcdb6ef29d6f6c345a9d
| * | | resolved conflicts for merge of 31dc911a to gingerbread-plus-aospAndreas Huber2010-11-081-6/+14
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
| | * | Support post-decode video rotation.Andreas Huber2010-11-051-6/+14
| | |/ | | | | | | | | | Change-Id: Ia371316e73a57e44610de86adce3eaa560afbf84
* | | Support streaming data across binder boundaries.Andreas Huber2010-11-233-0/+207
| | | | | | | | | | | | Change-Id: Ifbac61406dcb81343765f99ccba08bd90f9274cc
* | | Fix issue 3157123.Eric Laurent2010-11-193-40/+45
| | | | | | | | | | | | | | | | | | | | | Use a Mutex wherever atomic operations were used in AudioTrack, AudioRecord, AudioFlinger and AudioEffect classes. Change-Id: I6f55b2cabdcd93d64ef19446735b8f33720f8dbc
* | | Fix an issue wherre error notification will not be sent after mediaplayer resetJames Dong2010-11-181-0/+3
| | | | | | | | | | | | | | | | | | bug - 3198642 Change-Id: Ieab13e12af9fdd0ad0873c522885e1350e7cd24c
* | | Remove all traces of legacy renderer support in stagefright.Andreas Huber2010-11-163-151/+0
| | | | | | | | | | | | Change-Id: I17b8e0dbf53fca37c96830c41131b4bc0c24ca6d
* | | Add support for audio recording source in generic audio policy mgr.Jean-Michel Trivi2010-11-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update the platform-independent audio policy manager to pass the nature of the audio recording source to the audio policy client interface through the AudioPolicyClientInterface::setParameters() method. Change-Id: I6b4fd0f8a3acea0d7d30bbad98edd1977dc012bf
* | | Squashed commit of the following:Andreas Huber2010-10-292-42/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0d5694ba2d399dd0869532a4d6256448185a1be0 Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:59:23 2010 -0700 suspend() and resume() methods on VideoView are back but don't do anything. They need to be back because they were public before. Change-Id: Iddfd1021ffcf341f26e8d55ba761fd33701e2425 commit 16192891ed7d349ee97e47d1729d20a2d0d247b8 Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:47:05 2010 -0700 Revert "New API on VideoView widget to suspend/resume a session. Do not release the MediaPlayer client for video suspending/resuming." This reverts commit 2e1818a4d16c3309660f27286c77d8d1eee95a25. Conflicts: api/current.xml Change-Id: I68dd1d05871044faf3f832d0838aa40bc7f890e5 commit 8f934dc1a3ae4e60f0790fcf97671e063fa20fad Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:44:16 2010 -0700 Revert "Release mediaplayer if the current state is not suspending. Fix for bug 2480093." This reverts commit efb882cf75eef39ecaf9f8920ed302a019fa629f. commit f2ed03550887986f39d36b5dabcd9e919949c7cf Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:44:08 2010 -0700 Revert "Release MediaPlayer if suspend() returns false." This reverts commit 047212fd4ea360675e94d3ce83c7f5544f65b268. commit 441ecce678bd24e9660a72c8627b5bd94433ff8b Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:40:46 2010 -0700 manually. Change-Id: I4fdd43c9f7c8b3eedddb31a196da4984e1c58e87 Change-Id: I60d4b10e7a9e4ed8d9a796f1711618f557eb6e89
* | | OMX extension to support storing meta data in video input buffers during ↵James Dong2010-10-211-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | recording bug - 3042125 Change-Id: I7543809fa4ff61d48da35eec6c2bd5eaa7e8cead
* | | Merge fb474872 from gingerbread-plus-aospJean-Baptiste Queru2010-10-181-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
| * | am b04f356d: Merge "Include the framework copy of the OpenMAX headers ↵Andreas Huber2010-10-151-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | instead of referencing external/opencore." into gingerbread Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp * commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678': Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
| | * Include the framework copy of the OpenMAX headers instead of referencing ↵Andreas Huber2010-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | external/opencore. Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6 related-to-bug: 3101573
* | | am 27c7fb1a: am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted ↵Andreas Huber2010-10-151-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | out of sync. This change remedies that." into gingerbread Merge commit '27c7fb1a861776b4fdc2632697e4e25eee83617f' * commit '27c7fb1a861776b4fdc2632697e4e25eee83617f': Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
| * | am 90d59d18: Merge "Metadata.cpp and Metadata.java had drifted out of sync. ↵Andreas Huber2010-10-131-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | This change remedies that." into gingerbread Merge commit '90d59d180bd963f00161e6bfaabfda432960cab6' into gingerbread-plus-aosp * commit '90d59d180bd963f00161e6bfaabfda432960cab6': Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.
| | * Metadata.cpp and Metadata.java had drifted out of sync. This change remedies ↵Andreas Huber2010-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | that. Change-Id: I48175666857ab0fb1519777bdb6f7f0b6b5cc599 related-to-bug: 3073955
* | | resolved conflicts for merge of a127c07c to masterKenny Root2010-10-141-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
| * | am 312644cd: Merge "Support for writing to MPEG2 transport stream files." ↵Andreas Huber2010-10-131-1/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp * commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7': Support for writing to MPEG2 transport stream files.
| | * Support for writing to MPEG2 transport stream files.Andreas Huber2010-10-121-1/+1
| | | | | | | | | | | | Change-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97
* | | am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" ↵Eric Laurent2010-10-101-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '4f21e517d09b9d793d20d64547df330fba705b3c' * commit '4f21e517d09b9d793d20d64547df330fba705b3c': Added getter for session Id to AudioSink
| * | am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbreadEric Laurent2010-10-081-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5' into gingerbread-plus-aosp * commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5': Added getter for session Id to AudioSink
| | * Added getter for session Id to AudioSinkEric Laurent2010-10-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a method to expose the audio session id at AudioSink interface so that the AudioPlayer in stagefright can retrieve it. Also: - Fixed audio effect send level not being initialized in mediaplayer. - Fixed compilation error when LOGV is enabled in mediaplayer JNI Change-Id: I4bb55454fd63d646e0e677692d737c4843fb05fb
* | | 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
generated by cgit v1.1 at 2025-01-31 11:20:49 +0000