summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Add an OMX IL API for querying buffer usage flags.Jamie Gennis2011-02-282-0/+15
| | | | | | | | | | This change defines an OpenMAX IL API for querying from the IL component the gralloc buffer usage flags that should be used to allocate the buffers. It also adds the Stagefright plumbing for using the new OMX IL API. Change-Id: I046b5e7be70ce61e2a921dcdc6e3aa9324d19ea6 Related-Bug: 3479027
* Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink"Glenn Kasten2011-02-244-1/+76
|\
| * Bug 3438258 Add SurfaceTexture as MediaPlayer sinkGlenn Kasten2011-02-234-1/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables the use of a SurfaceTexture in place of a Surface as the video sink for an android.media.MediaPlayer. The new API MediaPlayer.setTexture is currently hidden. This includes: - New Java and C++ interfaces - C++ plumbing and implementation (JNI, Binder) - Stagefright AwesomePlayer and NuPlayer use ANativeWindow (either Surface or SurfaceTextureClient) Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
* | Merge "Add YV12 preview format to camera parameter constants."Wu-cheng Li2011-02-241-2/+1
|\ \ | |/ |/|
| * Add YV12 preview format to camera parameter constants.Wu-cheng Li2011-02-241-2/+1
| | | | | | | | | | bug:3463624 Change-Id: I8f2992dadfd3fb9e3c9d67743e52da7f3212827e
* | Merge "Application-managed callback buffer support for raw image"James Dong2011-02-232-14/+21
|\ \
| * | Application-managed callback buffer support for raw imageJames Dong2011-02-222-14/+21
| | | | | | | | | | | | | | | | | | bug - 3292153 Change-Id: I9789f7c5cde3a3889d7375e881181e9152d95fc2
* | | Merge "- Add method in MediaPlayerService to collect and pull codec usage ↵Gloria Wang2011-02-231-0/+16
|\ \ \ | |/ / |/| | | | | (duration) for the battery app - Collect MediaPlayer decoding usage data"
| * | - Add method in MediaPlayerService to collect and pullGloria Wang2011-02-221-0/+16
| |/ | | | | | | | | | | | | codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
* | Support more MPEG4-LATM audio functionality.Andreas Huber2011-02-221-1/+2
|/ | | | | | | related-to-bug: 3474610 Change-Id: I6dab40e8b465922c62be9ee7f168718822c6caac Now skipping extra header that the spec claimed shouldn't be present in LATM...
* A/V synchronization at the beginning of a recording sessionJames Dong2011-02-171-3/+3
| | | | | | | | | | | | | o do not use edts/elst boxes since these optional boxes are ignored o manipulate the first video/audio frame duration to make sure that the rest of the audio/video is in sync (ideally, we should only manipulate the vidoe frame duration, not the audio) o reduce the initial audio mute/suppression period, which is used to eliminate the "recording" sound. bug - 3405882 and 3362703 Change-Id: Ib0acfb4f3843b365157288951dc122b006299c18
* Decouple AudioRecord read and audio encodingJames Dong2011-02-161-6/+18
| | | | | | bug - 3313754 Change-Id: I951dd0e21e34aa1412c391f003bc32103d0424b0
* Merge "Add AAC extractor"Gloria Wang2011-02-151-0/+1
|\
| * Add AAC extractorGloria Wang2011-02-151-0/+1
| | | | | | | | Change-Id: Iedb08525ac72e65ba98e5c791734da0720a0e3f6
* | Make available h263 DSI information from MPEG4ExtractorJames Dong2011-02-111-0/+2
|/ | | | | | bug - 3446863 Change-Id: Idbaf7a564d544784fdbc36ed0339c98a519adc88
* Bug 3352047 Wrong message when adjusting volumeGlenn Kasten2011-02-102-0/+2
| | | | | | Add hidden AudioManager.getDevicesForStream and output device codes. Change-Id: I4d1c1d3b6a077cd117720817d1f733dda557b947
* Reduce blocking time in file writeJames Dong2011-02-091-5/+8
| | | | | | bug - 3418787 Change-Id: I4723662bf46ed07271be8468f84ae5d93cb793fa
* Merge "Handle some edge cases when seeking while starting up OMXCodec"Andreas Huber2011-02-081-0/+1
|\
| * Handle some edge cases when seeking while starting up OMXCodecAndreas Huber2011-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | These were exposed by the new preview-seekframe while paused code. In particular, the codec may have been in state RECONFIGURING when attempting to seek, or we may have initiated flushing of the output port and this may not have completed yet by the time we want to reconfigure the output port. Change-Id: Id7640ade11dbc7205a22f648ea0b5e3e9b49cf4b related-to-bug: 3392259
* | - Do not use global DrmManagerClientGloria Wang2011-02-072-2/+2
|/ | | | | | | - Release the DrmManagerClient and DecryptHandle in DataSource Fix for bug 3429811 Change-Id: I549f72b75225751877eb0e630ce8098f8ec6316f
* Improvements/fixes to ACodec.Andreas Huber2011-02-041-1/+1
| | | | | | | | | | | - Make sure ACodec reverts its state when it's shutdown - Defer "resume" to after handling the OutputPortSettingsChange - If the OMX_EventPortSettingsChanged event comes in while we're flushing, defer it and make sure the output port can be disabled by deleting all buffers not already owned by the component. Change-Id: I1f8cdffa71237b57d4275a48b834647a7b263e8b
* am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycombEric Laurent2011-02-033-5/+4
|\ | | | | | | | | * commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836': Fix issue 3371080
| * am 9c0a1003: Merge "Fix issue 3371080" into honeycombEric Laurent2011-02-033-5/+4
| |\ | | | | | | | | | | | | * commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5': Fix issue 3371080
| | * Fix issue 3371080Eric Laurent2011-02-033-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified default volume control logic in AudioService: 1 IN_CALL volume if in video/audio chat 2 NOTIFICATION if notification is playing or was playing less than 5s ago. 3 MUSIC Modified silent mode: - now also affect MUSIC stream type - entering silent mode when VOL- hard key is pressed once while selected stream volume is already at 0 (except for VOICE_CALL stream). - exiting silent mode when pressing VOL+ hard key while in silent mode Play sound FX (audible selections, keyboard clicks) at a fixed volume. Modified audio framework: - isStreamActive() method now implemented in AudioPolicyManagerBase (previously AudioFlinger) - iStreamActive() now specifies a time window during which the stream is considered active after it actually stopped. Change-Id: I7e5a0724099450b9fc90825224180ac97322785f
* | | Bug 1804058 FLAC extractorGlenn Kasten2011-02-031-0/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: dependent on external/flac for libFLAC Implemented and tested: * FLAC container * mono and stereo * standard sample rates * standard bit depths * sniffer * media scanner * Vorbis comment metadata including album art * random access seeking with "torture test" * web browser integration for audio/flac (not audio/x-flac), but note that most web servers don't correctly report the MIME type Not implemented: * 24-bit to 16-bit dither or noise shaping in AudioFlinger * 96 kHz to 44.1 or 48 kHz downsampling low pass filter in AudioFlinger * replay gain is better done in AudioFlinger * multi-channel, would need AudioFlinger support * Ogg container, does not seem to be very popular yet Change-Id: I300873e8c0cfc2e95403d9adb5064d16a2923f17
* | am 7fb232c4: Merge "Make sure that key frame is generated for timelapse ↵James Dong2011-01-262-1/+5
|\ \ | |/ | | | | | | | | | | video recording if there are at least two input video frames from camera source." into honeycomb * commit '7fb232c40cde91d0958be1694db2d97a126b95f9': Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.
| * Make sure that key frame is generated for timelapse video recording if there ↵James Dong2011-01-262-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are at least two input video frames from camera source. This will fix the stop failure issue where we have to wait n * time_interval before a key frame can be received by the file writer, where o n is the actual number of buffers advertised by the video encoder o time_interval is the interval settings for timelapse video recording specifying the time distance between neighboring input video frames The fix includes two parts: o OMXCodec will not submit all n buffers at one time, but instead submit one input frame at one time if it become available. o Timelapse camera source made available the first two input frames and do not skip them so that the first compressed output frame data can be received regardless the specified time_interval bug - 3367659 Change-Id: Ia68cc2cb0d71aa7dc54540e9ad82fae911ad530b
* | am a9f27fa6: Merge "Protect notification callback parameters with a mutex." ↵Andreas Huber2011-01-261-4/+14
|\ \ | |/ | | | | | | | | | | into honeycomb * commit 'a9f27fa631ab21d52c75842ccaacc1cbcd75fca0': Protect notification callback parameters with a mutex.
| * Protect notification callback parameters with a mutex.Andreas Huber2011-01-261-4/+14
| | | | | | | | | | | | | | | | This avoids the race condition where notifications are dispatched to a NULL receiver after notifications have been disabled. Change-Id: I6d351ffbee97616e2c35559c132a6c5e6a66948a related-to-bug: 3394139
* | am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after ↵Mike Lockwood2011-01-251-4/+0
|\ \ | |/ | | | | | | | | | | we are done scanning" into honeycomb * commit 'f10d940413000732f1cd35bcb113c41019c7e3b7': StagefrightMediaScanner: Close metadata retriever after we are done scanning
| * StagefrightMediaScanner: Close metadata retriever after we are done scanningMike Lockwood2011-01-251-4/+0
| | | | | | | | | | | | | | | | | | | | This prevents the mediaserver from leaking a file descriptor after the media scanner runs BUG: 3373546 Change-Id: I82a8bae82306de3da56a5c7da5b03ecf106a4efc Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am 63d64a14: Merge "Properly rotate video that\'s marked as such and decoded ↵Andreas Huber2011-01-211-0/+2
|\ \ | |/ | | | | | | | | | | to a surface." into honeycomb * commit '63d64a14790ae21db31b60747864b4a7565b33c3': Properly rotate video that's marked as such and decoded to a surface.
| * Properly rotate video that's marked as such and decoded to a surface.Andreas Huber2011-01-211-0/+2
| | | | | | | | | | Change-Id: I1e9144db3447e58c99aac3f47702ad471678789c related-to-bug: 3378148
* | am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into ↵Andreas Huber2011-01-211-1/+4
|\ \ | |/ | | | | | | | | | | honeycomb * commit '05aa082770d812c5921d6b2f9b3559f1fd1536a8': Some tweaks to HTTP live / nuplayer behaviour
| * Some tweaks to HTTP live / nuplayer behaviourAndreas Huber2011-01-211-1/+4
| | | | | | | | | | | | | | | | | | | | - play audio-only streams again - workaround for malformed streams that switch PIDs across bandwidths - attempt to pick a different bandwidth stream if the previously chosen one appears to be malformed/unsupported. Change-Id: I426d0a40dc725aa242f619d4c9d048b69aca55c9 related-to-bug: 2368598
* | am a423d868: Merge "clean-up unneeded code" into honeycombMathias Agopian2011-01-201-8/+1
|\ \ | |/ | | | | | | * commit 'a423d868009b9961597365ce7f190aef23f4b1cc': clean-up unneeded code
| * clean-up unneeded codeMathias Agopian2011-01-201-8/+1
| | | | | | | | | | | | | | | | | | | | now that we removed the notion of a "inUse" buffer in surfaceflinger a lot of code can be simplified / removed. noteworthy, the whole concept of "unlockClient" wrt. "compositionComplete" is also gone. Change-Id: I210413d4c8c0998dae05c8620ebfc895d3e6233d
* | am 4061c9aa: Merge "Fix the presentation video resolution when it is ↵James Dong2011-01-191-2/+4
|\ \ | |/ | | | | | | | | | | different from the actual image resolution of the video." into honeycomb * commit '4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18': Fix the presentation video resolution when it is different from the actual image resolution of the video.
| * Fix the presentation video resolution when it is different from the actual ↵James Dong2011-01-191-2/+4
| | | | | | | | | | | | | | | | image resolution of the video. bug - 3352413 Change-Id: I8f08f3896e9fb90f09119dccdb88b82af60f79f2
* | am 307003a8: Merge "integrate videoeditor preview player." into honeycombDharmaray Kundargi2011-01-171-0/+1
|\ \ | |/ | | | | | | * commit '307003a844c90458bcfd7398c44bbae734936238': integrate videoeditor preview player.
| * integrate videoeditor preview player.Dharmaray Kundargi2011-01-161-0/+1
| | | | | | | | Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
* | am 068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into ↵James Dong2011-01-123-55/+6
|\ \ | |/ | | | | | | | | | | honeycomb * commit '068b41d5d41a4a78c96586b85ea89d464d302548': Publish MediaMetadataRetriever.java as public API
| * Publish MediaMetadataRetriever.java as public APIJames Dong2011-01-123-55/+6
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 9e0bb6d5: am 0544d059: Merge "DRM Framework bug fixes."Gloria Wang2011-01-111-0/+3
|\ \ | |/ |/| | | | | * commit '9e0bb6d5eef5dfe2da60c50f3aaa39512307d11d': DRM Framework bug fixes.
| * am 0544d059: Merge "DRM Framework bug fixes."Gloria Wang2011-01-071-0/+3
| |\ | | | | | | | | | | | | * commit '0544d05990c0f43a143e98e71f7fc60277872806': DRM Framework bug fixes.
| | * Merge "DRM Framework bug fixes."Gloria Wang2011-01-071-0/+3
| | |\
| | | * DRM Framework bug fixes.Takeshi Aimi2010-11-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure to clean-up obsolete listeners. - Close cursor after using it. - Add virtual destructor to the base class of OnInfoListener. Changes are made by SEMC and Sony. Change-Id: Ibb6dd625ef48e3597188f0d7c90f9d4c780b6139
| * | | am ba77a3f9: Add support for the "compilation" tag in mp3, mp4 and ogg, and ↵Marco Nelissen2011-01-062-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also add support for two common ways of specifying album artist in ogg files. b/3311831 * commit 'ba77a3f9cb1d68b2ed4813aaae856444578e3a75': Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831
| | * | | Add support for the "compilation" tag in mp3, mp4 and ogg, and also addMarco Nelissen2011-01-062-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support for two common ways of specifying album artist in ogg files. b/3311831 Change-Id: Iba1152013b7577168af71f947d7249560419fa05
* | | | | Merge "NuPlayer now properly sends MEDIA_SET_VIDEOSIZE notifications." into ↵Andreas Huber2011-01-102-0/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | honeycomb