summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-091-2/+2
|\
| * IOMX: work against metadata buffer spoofingLajos Molnar2016-09-271-2/+2
* | Merge tag 'android-6.0.1_r61' into HEADJessica Wagantall2016-08-022-1/+4
|\ \ | |/
| * DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleakEino-Ville Talvala2016-06-231-0/+3
| * Don't use sp<>&Marco Nelissen2016-06-231-1/+1
* | Merge tag 'android-6.0.1_r46' into HEADJessica Wagantall2016-06-072-5/+60
|\ \ | |/
| * Resolve merge conflict when cp'ing ag/931301 to mnc-mr1-releaseZach Jang2016-04-211-1/+60
| * Fix size check for OMX_IndexParamConsumerUsageBitsMarco Nelissen2016-04-211-4/+0
| * Get service by value instead of referenceMarco Nelissen2016-02-261-1/+1
* | audiopolicy: Add AudioSessionInfo APISteve Kondik2016-04-275-0/+86
* | audiopolicy: Revert all session callback patches.Steve Kondik2016-04-224-20/+0
* | video: Use boot clock for recording start timeSurajit Podder2016-04-131-0/+1
* | libstagefright: handle error when B-frame is sent to MPEG4Writerxiaoqiny2016-04-133-0/+6
* | libstagefright: Allow for MPEG4Writer extensionDeva Ramasubramanian2016-04-131-1/+8
* | audiopolicy: Be a little smarter with auto-attachSteve Kondik2016-04-072-5/+11
* | Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-051-1/+1
|\ \
| * | Get service by value instead of referenceMarco Nelissen2016-03-011-1/+1
| |/
* | video: Add metadata support for DataSourceSurajit Podder2016-03-081-2/+6
* | video: Add support to push blank buffers on surface switchSurajit Podder2016-03-081-0/+1
* | audiopolicy: Add notification when default effects are updatedSteve Kondik2016-03-084-0/+14
* | libmedia: Add support for LHR tonesKarthik Reddy Katta2016-01-231-0/+2
* | stagefright: Add deferred release optionSteve Kondik2016-01-051-0/+4
* | stagefright: Forward-port HFR and HSR supportSteve Kondik2016-01-051-0/+3
* | nuplayer: Enable PCM offload for any sourceSteve Kondik2015-12-291-1/+1
* | nuplayer: Pass along the sniffed metadata from GenericSourceSteve Kondik2015-12-281-1/+1
* | stagefright: Add more hardware codec support for our extractorSteve Kondik2015-12-281-0/+1
* | stagefright: Deal with output format of other AAC decodersSteve Kondik2015-12-211-1/+1
* | Move overflow checks into SkipCutBufferMarco Nelissen2015-12-181-3/+4
* | stagefright: Finish support for HEVC muxingSteve Kondik2015-12-131-0/+3
* | StagefrightRecorder: Add support for WAVE recordingMichael Bestas2015-12-121-0/+108
* | libstagefright: Fix for testExceptionManikanta Kanamarlapudi2015-12-091-0/+2
* | Merge tag 'android-6.0.1_r3' of https://android.googlesource.com/platform/fra...Steve Kondik2015-12-072-1/+8
|\ \ | |/
| * am 32ba6ec7: am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8:...Lajos Molnar2015-10-191-0/+4
| |\
| | * am 0378676b: am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stage...Lajos Molnar2015-10-191-0/+4
| | |\
| | | * am 92990810: am b1231923: am e550d213: am f70b69a8: Merge "stagefright: check...Lajos Molnar2015-10-191-0/+4
| | | |\
| | | | * am e550d213: am f70b69a8: Merge "stagefright: check bounds for MediaCodecList...Lajos Molnar2015-10-191-0/+4
| | | | |\
| | | | | * stagefright: check bounds for MediaCodecList.getCodecInfoLajos Molnar2015-10-121-0/+4
| | | * | | am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-081-0/+6
| | | |\ \ \ | | | | |/ /
| | | | * | resolved conflicts for 0b09da7a to lmp-mr1-devWei Jia2015-10-081-0/+6
| | | | |\ \ | | | | | |/
| | | | | * DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.Wei Jia2015-10-071-0/+6
| | | * | | am 8910f92a: am 2ea335b1: am fecbc5da: am 5b4a5cce: Merge "do not dequeue fro...Jon Larimer2015-08-201-0/+1
| | | |\ \ \ | | | | |/ /
| | | | * | am fecbc5da: am 5b4a5cce: Merge "do not dequeue from native window after we h...Jon Larimer2015-08-181-0/+1
| | | | |\ \ | | | | | |/
| | | | | * do not dequeue from native window after we hit fatal error -- DO NOT MERGEChong Zhang2015-08-171-0/+1
| * | | | | Merge "libstagefright: don't reclaim codec when there's buffer owned by clien...Ronghua Wu2015-10-131-1/+4
| |\ \ \ \ \
| | * | | | | libstagefright: don't reclaim codec when there's buffer ownedRonghua Wu2015-10-051-1/+4
* | | | | | | libstagefright: squash exynos4 supportSimon Shields2015-12-081-0/+3
* | | | | | | video: Add QHD & 2K profile for recorderXavier Varricatt2015-12-041-1/+5
* | | | | | | stagefright: Fix build breaksKeith Mok2015-12-021-0/+2
* | | | | | | stagefright: More HW codec support w/ FFMPEGExtractorSteve Kondik2015-12-021-0/+4
* | | | | | | Handle error result from DrmManagerClient correctlyPatrik Lindgren2015-12-011-1/+1