summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
* Bump up the max number of items in an AMessage, remove overly stringentAndreas Huber2012-04-251-3/+1
| | | | | | | CHECK() limiting us to just audio/* or video/* tracks. related-to-bug: 6399405 Change-Id: I9bdaf7e709665ecc22da8839c8b16c081dbf4535
* Merge "Software AVC encoder is now OMX-based"James Dong2012-04-244-0/+1037
|\
| * Software AVC encoder is now OMX-basedJames Dong2012-04-244-0/+1037
| | | | | | | | | | | | o related-to-bug: 6383440 Change-Id: I0b1ae50a704b0979857ea447585eabe86602149a
* | Make sure OMXCodec and ACodec both accept more than 2 channels of audioAndreas Huber2012-04-242-15/+67
|/ | | | | | and fill in the OMX channel mask properly. Change-Id: I915950a0b252142b9eb3277cf7c6e0d9f5875305
* Make sure NuMediaExtractor is thread safe.Andreas Huber2012-04-231-0/+24
| | | | Change-Id: If261c4d87d5569a0d7cfd75afe311803a6ce0109
* Merge "Make sure we restore our input buffer to its original state if we ↵Andreas Huber2012-04-232-10/+26
|\ | | | | | | want to revisit it."
| * Make sure we restore our input buffer to its original state if we want to ↵Andreas Huber2012-04-202-10/+26
| | | | | | | | | | | | revisit it. Change-Id: Iab62562c4dea13520751c37c9448c0b19c82d739
* | Merge "Add support for deep audio buffers"Eric Laurent2012-04-202-2/+20
|\ \ | |/ |/|
| * Add support for deep audio buffersEric Laurent2012-04-202-2/+20
| | | | | | | | | | | | | | | | | | | | Allow AudioSink to use deep audio buffering when the source is audio only and its duration is more than a certain threshold. This helps improve battery life but implies higher audio latency. Change-Id: Ie79915b61c370292f05aabda9779356570e03cbb
* | Add the ability to query the amount of cached data to NuMediaExtractor.Andreas Huber2012-04-193-6/+90
|/ | | | | Change-Id: I0966270a2bd36698330beaa03f47d02fc6a40c44 related-to-bug: 6364341
* Merge "Allow propagation of error information and description from the ↵Andreas Huber2012-04-191-7/+26
|\ | | | | | | CryptoPlugin to"
| * Allow propagation of error information and description from the CryptoPlugin toAndreas Huber2012-04-191-7/+26
| | | | | | | | | | | | | | the higher layers. Change-Id: I9f434ad55cdf575803c208bedf47b607baff2330 related-to-bug: 6365261
* | Merge "Revert "Temporary revert of new AAC codec to fix build""Dave Burke2012-04-191-1/+1
|\ \
| * | Revert "Temporary revert of new AAC codec to fix build"Dave Burke2012-04-191-1/+1
| | | | | | | | | | | | This reverts commit f356cc9c9995ba292bf116f1cb28a6caa1b65fd2.
* | | Merge "Make timed text source type explicit in TimedTextDriver"James Dong2012-04-191-4/+4
|\ \ \ | |_|/ |/| |
| * | Make timed text source type explicit in TimedTextDriverJames Dong2012-04-181-4/+4
| | | | | | | | | | | | | | | | | | o related-to-bug: 5542712 Change-Id: Ifdc730e616336e8b16783e8a5766f27df62a0592
* | | Merge "Temporary revert of new AAC codec to fix build"Dave Burke2012-04-191-1/+1
|\ \ \ | | |/ | |/|
| * | Temporary revert of new AAC codec to fix buildDave Burke2012-04-191-1/+1
| | | | | | | | | | | | Change-Id: I5c7f0360883fc68e313d10b1aa5dac1463fae7fb
* | | Merge "Remove new camera connect API."Wu-cheng Li2012-04-191-1/+1
|\ \ \ | |/ / |/| |
| * | Remove new camera connect API.Wu-cheng Li2012-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Applications are not resumed under the lock screen now. This API is not needed anymore. bug:5584464 Change-Id: I115daf6b647348617ec0fc05b626878c945b9b29
* | | Merge "Make AAC 5.1 work Fix bug with pausing audio"Dave Burke2012-04-183-32/+18
|\ \ \ | |/ / |/| |
| * | Make AAC 5.1 workDave Burke2012-04-173-32/+18
| | | | | | | | | | | | | | | | | | Fix bug with pausing audio Change-Id: Icd6b095dac8d1a68b027de853d11ae02cc070b10
* | | rename audio policy output flagsEric Laurent2012-04-181-1/+1
| | | | | | | | | | | | Change-Id: I27c46bd1d1b2b5f96b87af7d05b951fef18a1312
* | | Merge "Set gralloc consumer usage bits in SurfaceMediaSource."Eino-Ville Talvala2012-04-181-0/+2
|\ \ \
| * | | Set gralloc consumer usage bits in SurfaceMediaSource.Eino-Ville Talvala2012-04-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BufferQueue is no longer setting these for its endpoints; set the bits to GRALLOC_USAGE_HW_VIDEO_ENCODER | GRALLOC_USAGE_HW_TEXTURE. In the longer term, the set flags should be just GRALLOC_USAGE_HW_VIDEO_ENCODER, but that requires other changes. Change-Id: I4170658de49bf88d829d34605a15684e72a90706
* | | | Merge "Some refactoring and cleanup of now obsolete crypto fields."Andreas Huber2012-04-182-39/+4
|\ \ \ \
| * | | | Some refactoring and cleanup of now obsolete crypto fields.Andreas Huber2012-04-182-39/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | codec commandline tool no longer supports decryption. Change-Id: I7b10be6524631b20ac5d361d47949b00addf4a93
* | | | Merge "Fixed leaks in SurfaceMediaSource_test"Eddy Talvala2012-04-181-0/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed leaks in SurfaceMediaSource_testDaniel Lam2012-04-161-0/+9
| | |/ | |/| | | | | | | | | | | | | | | | mEglSurface was being reused which resulted in EGLSurfaces being lost. Change-Id: Ica07cd24b0e4f3d4b2156f55b7de8e83d5466136
* | | Merge "Fix for multiple audio/timed track feature implementation - part one"James Dong2012-04-173-61/+148
|\ \ \
| * | | Fix for multiple audio/timed track feature implementation - part oneJames Dong2012-04-163-61/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o getTrackInfo now returns all tracks, rather than just the timed text tracks. o the index of the track info is kept to the same as the track index if the track is not from an external source o correctly maps the selectTrack() and unselectTrack() calls to the right track index o TODO: 1) note that the selectTrack() and unselectTrack() only works for timed text track at present; 2) the lock is timed text specific o related-to-bug: 6110705 Change-Id: Ib1feeef2184bc992930ace0d1197b6c00a2636d7
* | | | NuMediaExtractor accidentally returned what looked like errors to the caller...Andreas Huber2012-04-171-1/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: Iec0c62ba98c8a8afc5cb423a76b8f53778aeb867 related-to-bug: 6276111
* | | | Support widevine:// URLs in NuMediaExtractor / java MediaExtractor.Andreas Huber2012-04-173-17/+59
| |/ / |/| | | | | | | | | | | | | | | | | Allow anyone to talk to drm services. Change-Id: I5c2f3c419d01de30c3d6e2bc85b1fe5c9c37b392 related-to-bug: 6276111
* | | Merge "Change NuMediaExtractor's API to support different kinds of data ↵Andreas Huber2012-04-162-3/+47
|\ \ \ | | | | | | | | | | | | sources."
| * | | Change NuMediaExtractor's API to support different kinds of data sources.Andreas Huber2012-04-132-3/+47
| | |/ | |/| | | | | | | | | | Change-Id: I080aa2ce28300a72a85751509334dbdc491936c6 related-to-bug: 6276111
* | | Merge "Make mediascanner use filedescriptors instead of paths"Marco Nelissen2012-04-131-1/+14
|\ \ \ | |_|/ |/| |
| * | Make mediascanner use filedescriptors instead of pathsMarco Nelissen2012-04-131-1/+14
| |/ | | | | | | | | | | | | | | | | Media scanner needs to open the files now, because media server doesn't have the required permission. b/6330061 Change-Id: I2364d93dcc0530c15676664fc4a8c306351dde08
* | To return default track info even if there's no metadata for aInsun Kang2012-04-131-9/+8
| | | | | | | | | | | | | | | | subtitle track. It would rather return empty data than return NULL data for an existing track. Change-Id: Ie0c18e6851bfbe2c471041589670a3012605b584
* | Merge "Add external timed text source using a passed file descriptor"James Dong2012-04-132-11/+22
|\ \ | |/ |/|
| * Add external timed text source using a passed file descriptorJames Dong2012-04-132-11/+22
| | | | | | | | | | | | | | | | o Also fixed a minor issue where the file length should be of type off64_t rather than size_t o related-to-bug: 5542712 Change-Id: I35fd8ceea0bc75e553b7f4a99932cf58ea560c4e
* | Merge "Add support for a new AAC decoder library."Dave Burke2012-04-113-172/+770
|\ \
| * | Add support for a new AAC decoder library.Dave Burke2012-04-023-172/+770
| | | | | | | | | | | | Change-Id: I867bf95f7c20503e55b38d0087ac027647834f37
* | | Merge "Changes to add support for H263-1999/2000 formats for streaming"Andreas Huber2012-04-111-5/+7
|\ \ \
| * | | Changes to add support for H263-1999/2000 formats for streamingAndreas Huber2012-04-111-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | contributed by sureshc@nvidia.com (and subsequently simplified) Change-Id: Ia1c2ac9233f5414ce3e4a70e42e68c1c5c35eb9d
* | | | Better error logging during meta data retrieval. Fixed the stagefrightAndreas Huber2012-04-112-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commandline tool to open the file to extract thumbnails from itself since mediaserver may not have permission to open files. Change-Id: Iabe16b3248e9bb0f266b0866a8d2ccba2ab7d2a8 related-to-bug: 6321237
* | | | Merge "Cache the file size in favour of extraneous seek requests."Andreas Huber2012-04-111-7/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Cache the file size in favour of extraneous seek requests.Andreas Huber2012-04-111-7/+5
| | |/ | |/| | | | | | | | | | Change-Id: Ia922b13179c69749d09cd3fccbd5c30109c28bd7 related-to-bug: 6321952
* | | Merge "Refactored SurfaceMediaSource"Mathias Agopian2012-04-102-644/+151
|\ \ \ | |/ / |/| |
| * | Refactored SurfaceMediaSourceDaniel Lam2012-04-092-644/+151
| | | | | | | | | | | | | | | | | | | | | SurfaceMediaSource takes advantage of BufferQueue to avoid duplicated code. Change-Id: I5e60b8eca21e6c3cf728d363cd8f3786125182d1
* | | New API to support submitting encrypted buffers to the decoder.Andreas Huber2012-04-061-20/+69
|/ / | | | | | | | | Change-Id: I69dd60e43078c4211c6123cf6e0ce90e676bf873 related-to-bug: 6275919