summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Collapse)AuthorAgeFilesLines
* Change OMXCodec::Create to return an sp<MediaSource> instead of an ↵Andreas Huber2009-12-071-1/+1
| | | | sp<OMXCodec>, this is more general and does not sacrifice any functionality as the remaining OMXCodec APIs are not meant to be public anyway.
* Enable proper cleanup of OMX nodes managed through stagefright.Andreas Huber2009-12-041-0/+3
|
* Merge change I74bf38a0 into eclair-mr2Android (Google) Code Review2009-12-032-0/+54
|\ | | | | | | | | * changes: Squashed commit of the following:
| * Squashed commit of the following:Andreas Huber2009-12-032-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 543e192bf2ae13f573dc4c4e53b239ed4ea00e81 Author: Andreas Huber <andih@google.com> Date: Thu Dec 3 11:33:57 2009 -0800 stagefright now acts as the OMX Master, vendors supply their own plugins through libstagefrighthw. In OpenCore-enabled builds we now sit on top of PVMaster... commit 3cbfdbd9cecadbb77b63125c62883bf1065884fe Author: Andreas Huber <andih@google.com> Date: Wed Dec 2 12:39:07 2009 -0800 More OMX infrastructure, stagefright is now taking over the OMX Master, multiplexing all contributing OMX implementations under a common interface.
* | Refactor MediaScanner. Some steps on the way towards being able to build the ↵Andreas Huber2009-12-031-20/+27
|/ | | | tree without OpenCore.
* A small sample tool to encode pcm audio data to amr, decode it again and ↵Andreas Huber2009-12-011-2/+1
| | | | play it. Some changes to OMXCodec to properly configure the AMR decoder(s).
* Squashed commit of the following:Andreas Huber2009-11-234-182/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 1efc38dc3c33fef57b759002db3965ed07a28cb0 Author: Andreas Huber <andih@google.com> Date: Thu Nov 19 14:36:14 2009 -0800 Sending the SEEK-COMPLETE notification temporarily broke seeking backwards in time behaviour. This is now fixed. Also, get rid of the semi-random delay after posting buffers to surface flinger in favour of delaying the buffer release until the next frame is displayed. commit 51973062eb5ee63fd64b845d72bac517cc3369cf Author: Andreas Huber <andih@google.com> Date: Wed Nov 18 14:01:43 2009 -0800 Fix one more unit test, properly send seek-complete notification only after seek actually completed. commit cb22250b34b1fcfe1bf459723a761fd003950229 Author: Andreas Huber <andih@google.com> Date: Wed Nov 18 12:31:36 2009 -0800 Fix seek-while-paused in AwesomePlayer, revert to using FileSource if MmapSource fails. commit 25eb9241138ddf7bb27ce90657116c5f8a94d880 Author: Andreas Huber <andih@google.com> Date: Wed Nov 18 12:30:40 2009 -0800 Support seeking and duration in AMRExtractor, assuming all frames are the same size. commit 44192f2ebb7ea3bbd3ba5910025692dbc6a08faa Author: Andreas Huber <andih@google.com> Date: Wed Nov 18 10:21:44 2009 -0800 MediaPlayerImpl is dead, long live AwesomePlayer. commit c5b52d3c0674f5dc94db506afbce52401cceddac Author: Andreas Huber <andih@google.com> Date: Wed Nov 18 09:42:23 2009 -0800 New implementation of the stagefright mediaplayer.
* am e7800946: Merge change I49f02be9 into eclairEric Laurent2009-11-211-3/+4
|\ | | | | | | | | | | | | Merge commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff' into eclair-mr2 * commit 'e7800946a42c0ebe8e0b3f6eba04a96a9641aaff': Issue 2265163: Audio still reported routed through earpiece on sholes
| * Merge change I49f02be9 into eclairAndroid (Google) Code Review2009-11-211-3/+4
| |\ | | | | | | | | | | | | * changes: Issue 2265163: Audio still reported routed through earpiece on sholes
| | * Issue 2265163: Audio still reported routed through earpiece on sholesEric Laurent2009-11-191-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a second attempt to fix the audio routed to earpiece syndrom. The root cause identified this time is the crash of an application having an active AudioTrack playing on the VOICE_CALL stream type. When this happens, the AudioTrack destructor is not called and the audio policy manager is not notified of the track stop. Results a situation where the VOICE_CALL stream is considered as always in use by audio policy manager which makes that audio is routed to earpiece. The fix consists in moving the track start/stop/close notification to audio policiy manager from AudioTrack to AudioFlinger Track objet. The net result is that in the case of a client application crash, the AudioFlinger TrackHandle object (which implements the remote side of the IAudioTrack binder interface) destructor is called which in turn destroys the Track object and we can notify the audio policy manager of the track stop and removal. The same modification is made for AudioRecord although no bug related to record has been reported yet. Also fixed a potential problem if record stop is called while the record thread is exiting.
| * | DO NOT MERGE: Instead of inserting semi-random delays after submission to ↵Andreas Huber2009-11-191-1/+3
| |/ | | | | | | surface flinger, delay releasing buffers to the next display time to avoid flickering.
* | Merge change Iea6a38c6 into eclair-mr2Android (Google) Code Review2009-11-176-25/+95
|\ \ | | | | | | | | | | | | * changes: Squashed commit of the following:
| * | Squashed commit of the following:Andreas Huber2009-11-166-25/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 333057b355f8c260c549553b9a0634755c838b6a Author: Andreas Huber <andih@google.com> Date: Fri Nov 13 15:35:48 2009 -0800 Some more tweaks to AVC encoding on sholes. commit 9981d0ee52ec5b8b0182aae733d1571e3ebb8390 Author: Andreas Huber <andih@google.com> Date: Thu Nov 12 16:36:57 2009 -0800 Support for avc encoding, including sholes specific tweaks to pick the right colorspace for the camera to not require transcoding. commit 5ba0ebbbd4efca51f3ae1f60e2ca31e7d2cf136d Author: Andreas Huber <andih@google.com> Date: Wed Nov 11 09:50:03 2009 -0800 Enable actual (camera) video-only recording using h.263 or mpeg4 encoding. commit 3fd59c3526a37fe7c696f4a978925d1831c09313 Author: Andreas Huber <andih@google.com> Date: Tue Nov 10 14:57:48 2009 -0800 Allow switching between the PV recorder implementation and one supported by stagefright. This is controlled through the property "media.stagefright.enable-record".
* | | Update FileSource to also accept a file descriptor and a range.Andreas Huber2009-11-171-0/+5
|/ /
* | am 1aa9f3ca: Merge change I923d7d72 into eclairEric Laurent2009-11-121-5/+1
|\ \ | |/ | | | | | | | | | | Merge commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54' into eclair-mr2 * commit '1aa9f3cac31a7c2b50fcb3c9259cead8d638ae54': Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
| * Merge change I923d7d72 into eclairAndroid (Google) Code Review2009-11-121-5/+1
| |\ | | | | | | | | | | | | * changes: Fix issue 2242614: Wired headset not recognized: bogus "state" in ACTION_HEADSET_PLUG broadcast.
| | * Fix issue 2242614: Wired headset not recognized: bogus "state" in ↵Eric Laurent2009-11-121-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACTION_HEADSET_PLUG broadcast. The headset state indicated by HeadsetObserver in the broadcast intent ACTION_HEADSET_PLUG was not 0 or 1 as specified in the java doc but contained a bit field indicating the type of headset connected. Modified HeadsetObserver to broacast a state conforming to java doc. Added an extra to intent ACTION_HEADSET_PLUG to indicate if headset has a microphone or not. Removed handling of non standard headset indications from HeadsetObserver. Removed platform specific devices from output devices defined in AudioSystem. Modified AudioService to use new ACTION_HEADSET_PLUG intent extra instead of bitfield in state.
* | | resolved conflicts for merge of c66d53f9 to eclair-mr2Andreas Huber2009-11-121-0/+35
|\ \ \ | |/ /
| * | Delegate the platform dependent hardware renderer implementation to a shared ↵Andreas Huber2009-11-123-116/+35
| |/ | | | | | | library provided by the vendor.
| * DO NOT MERGE: Squashed commit of the following:Andreas Huber2009-11-054-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 08259dd3dc9026887f9bbfedaf45866eb56ea9bc Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 12:02:31 2009 -0800 DO NOT MERGE: Use PV for metadata extraction even if stagefright is used for playback. commit 991832fe4dc012e51d3d9ed8d647c7f09991858f Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 11:24:11 2009 -0800 DO NOT MERGE: Do not assert if we encounter OMX_StateInvalid. All bets are off though. commit cec45cf302d9218fe79956cbe8a462d7ca3a10bb Author: Andreas Huber <andih@google.com> Date: Mon Oct 26 16:11:54 2009 -0700 DO NOT MERGE: When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers. commit 34a1e885ef9113d68acbc26d36fcc47fdebbed84 Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 11:10:49 2009 -0800 DO NOT MERGE: Fix heap corruptin in OMXNodeInstance. commit 5a47f7439a1298b330541a7e4e647a8b44487388 Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 11:08:19 2009 -0800 DO NOT MERGE: Fix seek-on-initial-read behaviour of OMXCodec. commit 45bed64722501b9f411a2940aff5aff4cc4d2e98 Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 11:02:23 2009 -0800 DO NOT MERGE: Renaming string.h to stagefright_string.h to avoid conflicts. commit 6738e306a50196f31a73d4fc7b7c45faff639903 Author: Andreas Huber <andih@google.com> Date: Thu Oct 15 13:46:54 2009 -0700 DO NOT MERGE: Reimplement the OMX backend for stagefright. Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup. Changed APIs to conform to the rest of the system.
* | am 67b69292: Merge change I93f500a5 into eclairEric Laurent2009-11-053-1/+16
|\ \ | |/ | | | | | | | | | | Merge commit '67b692920c18f99b096dce285adc6f7439fa866c' into eclair-mr2 * commit '67b692920c18f99b096dce285adc6f7439fa866c': Fix issue 2203561: Sholes: audio playing out of earpiece.
| * Merge change I93f500a5 into eclairAndroid (Google) Code Review2009-11-053-1/+16
| |\ | | | | | | | | | | | | * changes: Fix issue 2203561: Sholes: audio playing out of earpiece.
| | * Fix issue 2203561: Sholes: audio playing out of earpiece.Eric Laurent2009-11-043-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new IAudioTrack interface to AudioFlinger when start() fails due to a broken pipe error. Do the same if start fails due to the same error after time out in obtainBuffer(). Do not indicate that the AudioTrack is started to AudioPolicyManager if IAudioTrack start fails. This avoids that an AudioTrack keeps a dead IAudioTrack after a media server crash. Same modifications for AudioRecord. Add a flag to ToneGenerator indicating that the callback thread can call Java. Without it, when the media server crashes and restarts, the AudioSystem error callback will crash in JNI if the IAudiotrack is created from AudioTrack callback thread.
* | | am 7ed0ceeb: Merge change I6869df3a into eclairJean-Michel Trivi2009-11-041-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488' into eclair-mr2 * commit '7ed0ceeba54712f76e9a4f2dd4c9197d76813488': Add new audio sources to support the A1026 recording configurations.
| * | Add new audio sources to support the A1026 recording configurations.Jean-Michel Trivi2009-11-031-1/+2
| |/
* | Adds a WAVExtractor for 16-bit signed PCM audio wave files.Andreas Huber2009-11-031-0/+1
| |
* | am ee98c240: Merge change I73680cd9 into eclairEric Laurent2009-11-022-2/+4
|\ \ | |/ | | | | | | | | | | Merge commit 'ee98c24020c1634b02cde6d333968f04a0de941f' into eclair-mr2 * commit 'ee98c24020c1634b02cde6d333968f04a0de941f': Fix 2194140: [Passion] Support Audience chip.
| * Fix 2194140: [Passion] Support Audience chip.Eric Laurent2009-11-022-2/+4
| | | | | | | | | | Added new input device DEVICE_IN_BACK_MIC. Added new audio source AUDIO_SOURCE_CAMCORDER.
* | Revive support for video encoding in OMXCodec.Andreas Huber2009-10-291-0/+2
| |
* | Merge change I155e2ad0 into eclair-mr2Android (Google) Code Review2009-10-281-13/+13
|\ \ | | | | | | | | | | | | * changes: Re-enable CameraSource.
| * | Re-enable CameraSource.Andreas Huber2009-10-281-13/+13
| | |
* | | am bf96aaad: Merge change Icf10db28 into eclairEric Laurent2009-10-242-2/+5
|\ \ \ | |/ / |/| / | |/ | | | | | | Merge commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba' into eclair-mr2 * commit 'bf96aaadd46fb5b0884070177faa16ec4f22e2ba': Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
| * Fix issue 2192181: AudioFlinger must provide separated methods to set ↵Eric Laurent2009-10-212-2/+5
| | | | | | | | | | | | | | VOICE_CALL stream volume and down link audio volume. Added setVoiceVolume() method to AudioSystem, AudioFlinger, IAudioFlinger, AudioPolicyService. Removed call to AudioHardwareInterface::setVoiceVolume() from AudioFlinger::setStreamVolume().
| * do not merge: The qcom video decoders always output yuv data after adjusting ↵Andreas Huber2009-10-201-0/+1
| | | | | | | | | | | | dimensions to be a multiple of 16. Add a quirk mode to OMXCodec that makes it aware of this fact for proper display. Also integrate back a change from eclair-mr2 that delays releasing an output buffer briefly after posting it to surface flinger, as we don't know how long it'll take it to actually display the buffer's content.
* | New API to instantiate a MediaExtractor given a URI and optional MIME type.Andreas Huber2009-10-237-15/+27
| | | | | | | | | | | | Also DataSources now must provide a method initCheck() and DataSource::reat_at has been renamed to readAt to conform to standard API naming guidelines.
* | Moving the individual extractor headers files to the private include directory.Andreas Huber2009-10-233-178/+0
| |
* | Prefer software decoders over hardware for thumbnail extraction.Andreas Huber2009-10-231-1/+13
| | | | | | | | | | | | While our hardware decoders clearly outperform the software decoders in terms of raw throughput, their startup latency makes them less suitable for thumbnail extraction.
* | Extract video thumbnails from the largest sync sample among the first 20.Andreas Huber2009-10-225-4/+11
| | | | | | | | Also fixes OMXCodec seek behaviour on the very first call to OMXCodec::read()
* | Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers ↵Andreas Huber2009-10-211-1/+0
| | | | | | | | in the metadata retriever.
* | Reimplement the OMX backend for stagefright.Andreas Huber2009-10-162-20/+20
| | | | | | | | | | | | Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup. Changed APIs to conform to the rest of the system.
* | Separated private from public header files.Andreas Huber2009-10-139-584/+3
| |
* | Fix various compiler warnings accumulated over time.Andreas Huber2009-10-131-5/+5
| |
* | OMXCodec now notifies the reader of changes in the output format by ↵Andreas Huber2009-10-133-0/+7
| | | | | | | | returning a special result/error code.
* | Change to a int64_t usecs representation for timestamps and duration ↵Andreas Huber2009-10-121-8/+11
| | | | | | | | throughout stagefright.
* | Fixing the build.Andreas Huber2009-10-091-0/+2
| |
* | Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.Andreas Huber2009-10-082-9/+67
| |
* | Some decoders will return an error on OMX_EmptyThisBuffer to indicate that ↵Andreas Huber2009-10-081-2/+2
| | | | | | | | they don't support the media format, deal with this.
* | The vendor is about to check in a fix for this issue, the workaround is no ↵Andreas Huber2009-10-081-1/+0
| | | | | | | | longer needed
* | Workaround for avc decoder misreporting output buffer size requirements if ↵Andreas Huber2009-10-071-0/+1
|/ | | | the content is not a multiple-16 width/height.
* Fix issue 2139634: DTMF tones on Sholes popping, hissing (audio latency too ↵Eric Laurent2009-10-061-0/+1
| | | | | | | | | | high). This change is a complement to the main fix in kernel driver for the same issue (partner change #1250). It removes clicks sometimes heard after the end of the tones while audio flinger is sending 0s to the audio output stream. The problem was that the sleep time between two writes was more than the duration of one audio output stream buffer which could cause some underrun. Also fixed a recent regression in ToneGenerator that made that the end of previous tone was repeated at the beginning of current one under certain timing circumstances when the maximum tone duration was specified.