summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Don't build libmediandk for PDKMarco Nelissen2014-05-051-1/+5
* WIP: MediaCodec and friends NDK APIs, plain C versionMarco Nelissen2014-05-055-0/+709
* Merge "Fix bug for direct track with PCM != 16-bit"Glenn Kasten2014-05-021-1/+2
|\
| * Fix bug for direct track with PCM != 16-bitGlenn Kasten2014-05-021-1/+2
* | am 63249d6e: am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queu...Lajos Molnar2014-05-021-7/+10
|\ \
| * \ am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| |\ \
| | * \ am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| | |\ \
| | | * \ Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| | | |\ \
| | | | * | AwesomePlayer: use PTS for queueBufferLajos Molnar2014-05-011-7/+10
* | | | | | am 113f2122: am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
| |\ \ \ \ \ | | |/ / / /
| | * | | | am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
| | | |\ \ \ | | | | |/ /
| | | | * | Smooth out AwesomePlayerLajos Molnar2014-05-012-4/+25
* | | | | | am 9e0922ba: am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduli...Lajos Molnar2014-05-021-3/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video e...Lajos Molnar2014-05-021-3/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"Lajos Molnar2014-05-021-3/+7
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "AwesomePlayer: improve scheduling of video event to hit PTS"Lajos Molnar2014-05-021-3/+7
| | | |\ \ \ | | | | |/ /
| | | | * | AwesomePlayer: improve scheduling of video event to hit PTSLajos Molnar2014-05-011-3/+7
* | | | | | am edf6131d: am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator...Lajos Molnar2014-05-022-0/+178
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and Wind...Lajos Molnar2014-05-022-0/+178
| |\ \ \ \ | | |/ / /
| | * | | am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFit...Lajos Molnar2014-05-022-0/+178
| | |\ \ \ | | | |/ /
| | | * | Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"Lajos Molnar2014-05-022-0/+178
| | | |\ \ | | | | |/
| | | | * stagefright: add ClockEstimator API and WindowedLinearFitEstimatorLajos Molnar2014-05-012-0/+178
* | | | | resolved conflicts for merge of 47c888a9 to masterGlenn Kasten2014-05-027-39/+39
|\ \ \ \ \ | |/ / / /
| * | | | am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use 64-bit...Glenn Kasten2014-05-027-35/+35
| |\ \ \ \ | | |/ / /
| | * | | am 86438382: Merge "When passing a size_t via binder, use 64-bits uncondition...Glenn Kasten2014-05-027-35/+35
| | |\ \ \ | | | |/ /
| | | * | Merge "When passing a size_t via binder, use 64-bits unconditionally"Glenn Kasten2014-05-027-35/+35
| | | |\ \ | | | | |/ | | | |/|
| | | | * When passing a size_t via binder, use 64-bits unconditionallyGlenn Kasten2014-02-137-35/+35
* | | | | Merge "Use AUDIO_INTERLEAVE_* constants"Glenn Kasten2014-05-011-1/+1
|\ \ \ \ \
| * | | | | Use AUDIO_INTERLEAVE_* constantsGlenn Kasten2014-04-301-1/+1
* | | | | | am f38e1908: am 3d9164da: am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 3d9164da: am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| | | |\ \ \
| | | | * | | Add missing includeIgor Chernyshev2014-04-021-0/+1
* | | | | | | am ee46bd37: am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop s...Lajos Molnar2014-05-011-0/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2b0b701f: am 0c388650: Merge "ACodec: add frame render/drop systrace"Lajos Molnar2014-05-011-0/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 0c388650: Merge "ACodec: add frame render/drop systrace"Lajos Molnar2014-05-011-0/+7
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "ACodec: add frame render/drop systrace"Lajos Molnar2014-05-011-0/+7
| | | |\ \ \ \
| | | | * | | | ACodec: add frame render/drop systraceLajos Molnar2014-04-301-0/+7
* | | | | | | | am b4eacebf: am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam"Glenn Kasten2014-05-011-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | |
| * | | | | | am 1afedc4d: am 6eafba6b: Merge "Temporary workaround for log spam"Glenn Kasten2014-05-011-0/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 6eafba6b: Merge "Temporary workaround for log spam"Glenn Kasten2014-05-011-0/+5
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Temporary workaround for log spamGlenn Kasten2014-05-011-0/+5
| | | |/ / /
* | | | | | resolved conflicts for merge of 0d79b935 to masterGlenn Kasten2014-04-301-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b27ce2fb: am 416685d0: Merge "Fix format warnings"Glenn Kasten2014-04-301-3/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 416685d0: Merge "Fix format warnings"Glenn Kasten2014-04-301-3/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix format warningsGlenn Kasten2014-04-281-3/+3
| | * | | | Merge commit '91820d46b5f3065c2fded3cdf65d305715b33bb1' into HEADBill Yi2014-04-2924-507/+1894
| | |\ \ \ \ | | | |/ / / | | |/| | |