summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Expand)AuthorAgeFilesLines
* am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and Wind...Lajos Molnar2014-05-021-0/+110
|\
| * am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFit...Lajos Molnar2014-05-021-0/+110
| |\
| | * stagefright: add ClockEstimator API and WindowedLinearFitEstimatorLajos Molnar2014-05-011-0/+110
| * | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-293-0/+9
| |\ \ | | |/ | |/|
| | * am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-191-0/+1
| | |\
| | * \ am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" i...Chong Zhang2014-03-132-0/+2
| | |\ \
| | * \ \ am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position"...Eric Laurent2014-03-081-0/+1
| | |\ \ \
| | * \ \ \ am 2613347d: Merge "Added support to query ACodec whether adaptive playback i...Lajos Molnar2014-03-071-0/+3
| | |\ \ \ \
| | * \ \ \ \ am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-03-072-4/+4
| | |\ \ \ \ \
* | | \ \ \ \ \ am f131f873: Merge "Add private method NBLog::Reader::dumpLine()"Glenn Kasten2014-04-281-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add private method NBLog::Reader::dumpLine()Glenn Kasten2014-04-281-0/+6
* | | | | | | | am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-151-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | media: 64 bit compile issuesMark Salyzyn2014-04-151-1/+1
* | | | | | | | am 52a861d2: Merge "warnings be gone."Mark Salyzyn2014-04-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | warnings be gone.Andreas Huber2014-04-111-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | am 68d9d71a: Support CAST V2 Authentication in MediaDrmJeff Tinker2014-04-011-2/+12
|\ \ \ \ \ \ \
| * | | | | | | Support CAST V2 Authentication in MediaDrmJeff Tinker2014-03-291-2/+12
* | | | | | | | am 1000d426: am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more...Lajos Molnar2014-03-281-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am f780d28d: Merge "DO NOT MERGE: Revert "mediaplayer: keep more buffers with...Lajos Molnar2014-03-281-1/+0
| |\ \ \ \ \ \ \
| | * | | | | | | DO NOT MERGE: Revert "mediaplayer: keep more buffers with the BufferQueue"Lajos Molnar2014-03-271-1/+0
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | am 9cde5172: am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-191-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am b635b0e6: mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-191-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | mediaplayer: keep more buffers with the BufferQueueLajos Molnar2014-03-191-0/+1
| | | |_|_|_|/ | | |/| | | |
* | | | | | | am a671f943: am c69bc40a: Merge "Cap pts gap between adjacent frames to speci...Chong Zhang2014-03-132-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c69bc40a: Merge "Cap pts gap between adjacent frames to specified value" i...Chong Zhang2014-03-132-0/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Cap pts gap between adjacent frames to specified valueChong Zhang2014-03-112-0/+2
| | | |_|_|/ | | |/| | |
* | | | | | am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached playb...Eric Laurent2014-03-081-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position"...Eric Laurent2014-03-081-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "AudioTrack: When paused, return cached playback position" into klp-devEric Laurent2014-03-081-0/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | AudioTrack: When paused, return cached playback positionHaynes Mathew George2014-03-061-0/+1
* | | | | | am 72d09f62: am 2613347d: Merge "Added support to query ACodec whether adapti...Lajos Molnar2014-03-071-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2613347d: Merge "Added support to query ACodec whether adaptive playback i...Lajos Molnar2014-03-071-0/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Added support to query ACodec whether adaptive playback is enabled." i...Lajos Molnar2014-03-071-0/+3
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-03-061-0/+3
| | * | | | stagefright: do not offload LD-AAC decodingEric Laurent2014-03-061-0/+1
| | |/ / /
| | * | | update offloaded audio track sampling rateEric Laurent2014-03-053-2/+3
| * | | | am 6b260425: am 85b3013e: fix deadlock issues that arise when there are simul...jpadmana2014-03-051-24/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | am 85b3013e: fix deadlock issues that arise when there are simultaneous effec...jpadmana2014-03-051-24/+0
| | |\ \ \ | | | |/ /
| | | * | fix deadlock issues that arise when there are simultaneousjpadmana2014-03-041-24/+0
* | | | | am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"Narayan Kamath2014-02-112-4/+4
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Make frameworks/av 64-bit compatibleKévin PETIT2014-02-112-4/+4
* | | | | am dd432ce0: [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-041-0/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | [DO NOT MERGE] Support TS + AC3 for ATSC standardChangwan Ryu2014-02-031-0/+2
* | | | | am 90903383: [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-042-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | [DO NOT MERGE] Support AC3 in stagefrightChangwan Ryu2014-02-032-0/+3
| | |/ / | |/| |
* | | | am c4eef29a: Merge "fix deadlock issues that arise when there are simultaneou...Eric Laurent2014-02-031-24/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | fix deadlock issues that arise when there are simultaneousjpadmana2014-01-311-24/+0
* | | am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-171-0/+2
|\ \ \ | |/ /
| * | Added support for ID3v2 meta data in 3gp filesOscar Rydhé2014-01-161-0/+2
* | | am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"Eric Laurent2013-12-201-0/+1
|\ \ \ | |/ /