summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* am edf6131d: am 075c8f6e: am a69d6f52: Merge "stagefright: add ↵Lajos Molnar2014-05-021-0/+1
|\ | | | | | | | | | | | | ClockEstimator API and WindowedLinearFitEstimator" * commit 'edf6131d1eca1fdff3b151805d241a1cc81b52ca': stagefright: add ClockEstimator API and WindowedLinearFitEstimator
| * stagefright: add ClockEstimator API and WindowedLinearFitEstimatorLajos Molnar2014-05-011-0/+1
| | | | | | | | Change-Id: I74474c385848a8eab2ac0da7c069510378e2b217
* | Merge commit 'c250980f' into manualmergeGlenn Kasten2014-03-191-2/+0
|\ \ | |/ | | | | Change-Id: I254d456e8cb6c580dd77d602b391bed09110454e
| * libstagefright is no longer 32 bit only.Narayan Kamath2014-03-191-2/+0
| | | | | | | | Change-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b Signed-off-by: Glenn Kasten <gkasten@android.com>
* | resolved conflicts for merge of 3c780188 to masterGlenn Kasten2014-03-141-0/+2
|\ \ | |/ | | | | Change-Id: Ic579d346c27ff05ea6444faaa60fa6caaec86fbf
| * mediaserver and associated services are 32-bit onlyGlenn Kasten2014-03-121-0/+2
| | | | | | | | | | | | also 32-bit only command-line apps Change-Id: I9ac557a8d02bbf6986a9b5c3cdce23d400b306a3
* | Stagefright: added WebM muxer.Robert Shih2014-03-061-0/+1
| | | | | | | | Change-Id: I50bbf9c6f089b205d5ecef1371bfdd2028b3b358
* | Opus Matroska support in OpenMaxVignesh Venkatasubramanian2014-03-031-0/+1
| | | | | | | | | | | | | | | | Adding Openmax component for libopus software decoder. This can decode opus audio files embedded in matroska containers. Change-Id: I7e0691cfc6d719c4e927b9efbd05a3143be49abc Note: This CL is part of adding Opus support to Android.
* | Remove unused FragmentedMP4Parser and friends. The functionality has beenAndreas Huber2014-02-131-2/+0
| | | | | | | | | | | | subsumed into MP4Extractor. Change-Id: Ic1b6445660adfb985c604f1ca6f0c86585f8de04
* | fix the OS X builds until we can fix compiler warnings that apparentlyAndreas Huber2014-02-111-1/+1
| | | | | | | | | | | | trigger only on that platform... Change-Id: I9555d7e2efbe3e349e8af60528b7b9d131a257e3
* | Merge "warnings be gone."Andreas Huber2014-02-111-1/+1
|\ \
| * | warnings be gone.Andreas Huber2014-02-111-1/+1
| | | | | | | | | | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* | | Support "data:" URIs again in mediaplayer...Andreas Huber2014-02-111-0/+1
|/ / | | | | | | | | Change-Id: I6dac35c7e606f738a60f985f6dca977dc92c82a4 related-to-bug: 12957757
* | Merge "Change StagefrightRecorder to use MediaCodec"Chong Zhang2014-02-061-0/+1
|\ \
| * | Change StagefrightRecorder to use MediaCodecChong Zhang2014-02-051-0/+1
| | | | | | | | | | | | | | | Bug: 12305192 Change-Id: I72d7cb571be5bd348b58ad650f3269d24c15d350
* | | Remove no longer needed http proxy handling code, it's obsolete nowAndreas Huber2014-02-051-7/+0
|/ / | | | | | | | | | | | | | | since we started to use java's HTTPConnection instead of the native implementation. Also remove other remnants of the previous http implementation, such as accounting for the http user's uid. Change-Id: I60bfd31381ea40d2220db587ec5c433093b60034
* | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-041-0/+1
|/ | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* TimedEventQueue takes a wake lockEric Laurent2013-10-041-0/+1
| | | | | | | | | Take a wake lock when events present in a TimedEventQueue to prevent from going idle before all delayed events are processed. Bug: 11057387. Change-Id: I26a17df68068fde5e879a2fe7568dec439fc540f
* stagefright: offload playback supportRichard Fitzgerald2013-07-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Offloading of compressed audio decoding to audio DSP is implemented for audio only, non streamed content. when the datasource is AudioPlayer: - Create an offloaded sink when playing a compressed source - Send metadata to audio HAL - Return sink start error to AwesomePlayer so that a new player for PCM audio can be created in case of problem. - Forward stream end and tear down callback events to AwesomePlayer - Stop the sink and wait for stream end callback when EOS is reached. - Pause and restart the sink if needed before flushing when seeking (otherwise flush is a no op). - For current media time, directly query the render position from the sink and offset by the start position (seek to time) AwesomePlayer: - When initializing the audio decoder, check with audio policy manager if offloading is supported. If yes, create the software decoder in case a reconfiguration is needed but connect the audio track directly to the AudioPlayer. - In case of error when starting the AudioPlayer, reconnect the software decoder (OMXSource) and recreate a PCM AudioPlayer. - Handle AudioPlayer tear down event by detroying and recreating the AudioPlayer to allow transitions between situations were offloading is supported or not. - Force tear down of offloaded AudioPlayer when paused for a certain time: This will close the sink and allow the DSP to power down. Utils: - Added helper methods: - send meta data to audio ia sink setParameters - query audio policy manager if offloading is supported for a given audio content Change-Id: I115842ce424f947b966d45e253a74d3fd5df9aae Signed-off-by: Eric Laurent <elaurent@google.com>
* Add routing sockets for the requesting userChad Brubaker2013-07-191-0/+2
| | | | | | | Mediaserver sockets are now routed as if the connection was in the requesting app in per user routing. Change-Id: I60f4649c3c4145a65264b54c1aa2c6c7741efaba
* New HLS implementation supporting independent stream sources, audio-only streamsAndreas Huber2013-05-311-2/+0
| | | | | | and more. Change-Id: Icfc45a0100243b2f7a14a9e65696be45b67d6495
* Remove FragmentedMP4ExtractorMarco Nelissen2013-02-151-1/+0
| | | | | | MPEG4Extractor now supports fragmented mp4 files. Change-Id: I5659a51f4e5e4407a12535e69238fe3abffda7dc
* Add the native MediaMuxer support.ztenghui2013-02-121-0/+2
| | | | | | | | | MediaAdapter: a helper class to convert the push model to pull model. MediaMuxer: the real muxer. bug:7991013 Change-Id: If3b79551bc6332bc81f5c2740885e579a5c4abf9
* Merge "Match new paths and organization in external/libvpx"Ying Wang2012-12-121-0/+1
|\
| * Match new paths and organization in external/libvpxJohann2012-10-291-0/+1
| | | | | | | | | | | | See I739f99d48b8d7e6354c416ef2ca79c954826307f Change-Id: I42b51e2845a696a6e211dde00951afc8f571336f
* | Remove obsolete references to libmedia_nativeGlenn Kasten2012-10-301-1/+0
|/ | | | | Bug: 6654403 Change-Id: I3993d62987cf0dd85db10bf002a5cce53d4f01bd
* am e7c992c6: am 5abc91d6: Merge "Fix libmedia and libstagefright to get ↵Elliott Hughes2012-09-091-1/+0
|\ | | | | | | | | | | | | expat header files from the approved location." * commit 'e7c992c675e0075cd60b0b11c06d5956e3ddd7a3': Fix libmedia and libstagefright to get expat header files from the approved location.
| * Fix libmedia and libstagefright to get expat header files from the approved ↵Elliott Hughes2012-09-091-1/+0
| | | | | | | | | | | | | | | | location. Found during a libexpat upgrade. Change-Id: I9e5abd502a884975d898486edde374fb2519164e
* | Fragmented mp4 extractorMarco Nelissen2012-09-051-0/+1
| | | | | | | | | | | | | | Still experimental. Set property "media.stagefright.use-fragmp4" to true to enable. Change-Id: I210b9c5b5164b5c5eefc31309845ee881ac7db8e
* | Move fragmented mp4 parser to libstagefrightMarco Nelissen2012-08-311-0/+2
| | | | | | | | | | and rename it from Parser to FragmentedMP4Parser Change-Id: I986f50d0c5c93648aac675d6160e18623b031541
* | Remove circular dependency.Ying Wang2012-08-031-4/+2
| | | | | | | | | | | | | | | | libstagefright_chromium_http is added to build/target/product/core.mk instead. Bug: 6933259 Change-Id: I2e87037eea0f1f2a56936dd02419cde564c8670d
* | Update ANativeWindow client code for syncJamie Gennis2012-06-211-0/+1
| | | | | | | | | | | | | | This change updates all the uses of ANativeWindow to use the new ANW functions that accept and return Sync HAL fence file descriptors. Change-Id: Id7db42d8d6380f8b440d88476ce9211c6225fb16
* | libstagefright: dynamically load libstagefright_chromium_httpColin Cross2012-06-151-5/+5
|/ | | | | | | dlopen libstagefright_chromium_http to allow it to be on the platform side of the pdk without getting overwritten during a pdk fusion build. Change-Id: I391e81d98beab165c3313bc8a71bb370ebb8584d
* Remove unused VideoSourceDownSampler classJames Dong2012-05-111-1/+0
| | | | | Change-Id: I2faf5962ff4cc366c688ef5bb27f53596f08fe0a related-to-bug: 6484217
* Remove/Disable the AVI extractor.Andreas Huber2012-05-071-1/+0
| | | | | Change-Id: I47dcae710df9c66688a937fb1e648f9b00ca0f65 related-to-bug: 5717242
* Removed software video encoders that are not OMX-based.James Dong2012-04-301-2/+0
| | | | | | o related-to-bug: 5933287 Change-Id: I63635375e2bef00733b61adc3fa12c29df7e2155
* AV Android make files changesJames Dong2012-03-281-2/+2
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* stagefright: compile without chromium for pdk buildsColin Cross2012-03-261-5/+8
| | | | Change-Id: I7d85e04fb9f0caa8460a111ca6181bba6f6497ac
* Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.James Dong2012-03-241-1/+0
| | | | | | o related-to-bug: 6214141 Change-Id: Ic88d1732b3e014af47532a0809e01f6086e8464d
* Support gapless playback for mp3 and m4aMarco Nelissen2012-03-221-0/+1
| | | | | | | | | Gapless playback for appropriately tagged mp3 and m4a files. Currently this is implemented in OMXCodec, which most players use, but should be easy to support in other players as well by using the SkipCutBuffer utility class. Change-Id: I748c669adc1cfbe5ee9a7dea2fad945d48882551
* Add libmedia_nativeGlenn Kasten2012-03-161-0/+1
| | | | Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
* Switched to use the header files in /frameworks/nativeJames Dong2012-03-121-1/+2
| | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* Remove unused code - MediaSourceSplitterJames Dong2012-03-051-1/+0
| | | | Change-Id: Icf37832a1c234501ee3ff91ff13eece2242425ae
* Instead of hardcoding OMX component names in our code, supportAndreas Huber2012-03-011-14/+17
| | | | | | a config file instead. Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
* Moves TimedTextDriver.h into include/media/stagefright/timedtext.Insun Kang2012-02-271-0/+1
| | | | | | So that other players can include TimedTextDriver.h properly. Change-Id: I15e72bf655de8555eef6244a6c853c27a0828a1d
* Merge "Drop support for Android HTTP stack"Steve Block2012-02-231-51/+20
|\
| * Drop support for Android HTTP stackSteve Block2012-02-221-51/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All future releases will use the Chromium HTTP stack and maintaining two HTTP stacks adds maintenance overhead. The Chromium HTTP stack requires V8, but we now use V8 in all build targets (b/5495373), so we can safely drop the Android HTTP stack. LoadListener, HttpAuthHandlerImpl, Network, SslErrorHandlerImpl, WebViewWorker - Android-stack specific, removed StreamLoader, FrameLoader - Require LoadListener, removed CacheLoader, ContentLoader, DataLoader, FileLoader - Extend StreamLoader, removed BrowserFrame - Removed methods that create LoadListener - BrowserFrame.startLoadingResource() is called from native CallbackProxy, WebView - Removed calls to Network methods CacheManager, CookieManager, CookieSyncManager, WebViewCore, WebResourceResponse - Removed other Android-stack specific code JniUtlil - Removed useChromiumHttpStack() WebViewDatabase - Removed all code to create cookies and cache databases for Android HTTP stack See corresponding WebKit change https://android-git.corp.google.com/g/166327. Bug: 5495616 Change-Id: If491675516f6eb187077af4220214bb6e6a8d045
* | Implementation of a java media codec interface and associated tools.Andreas Huber2012-02-221-0/+2
|/ | | | Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
* Update stagefright makefile after dropping support for JSCSteve Block2012-02-211-7/+1
| | | | | Bug: 5495373 Change-Id: Ibb81196edd3a6eaa4999cf0e30a78368afb66360
* Keep AACEncoder around for a bit longer to have more time fix issues related ↵James Dong2012-02-031-0/+1
| | | | | | | | | to video editor engine o this should be reverted after the problem is fixed. o related-to-bug: 5947347 Change-Id: Iaec4b59d2c99c975e83f0588a813e9a4bfcb7ee2