summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Use of fast capture by normal captureGlenn Kasten2014-06-021-4/+11
* Merge "MPEG4Extractor: guard against missing stbl."Robert Shih2014-06-021-1/+2
|\
| * MPEG4Extractor: guard against missing stbl.Robert Shih2014-05-191-1/+2
* | Merge "Disable verbose logging"Marco Nelissen2014-06-026-6/+6
|\ \
| * | Disable verbose loggingMarco Nelissen2014-05-306-6/+6
* | | resolved conflicts for merge of b52c152d to masterEric Laurent2014-05-304-2/+129
|\ \ \
| * | | audio policy: add routing update client interfaceEric Laurent2014-05-294-2/+129
| * | | DO NOT MERGE: libstagefright: Add Opus support to ACodec::getPortFormatVignesh Venkatasubramanian2014-05-291-0/+18
| * | | DO NOT MERGE - IAudioPolicyService interface extension for patch panelEric Laurent2014-05-282-2/+275
| * | | DO NOT MERGE - IAudioFlinger interface extension for patch panelEric Laurent2014-05-281-1/+171
* | | | am 0289d545: am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
|\ \ \ \
| * \ \ \ am 6ed77c13: am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
| |\ \ \ \
| | * \ \ \ am 2d0e8d8f: Merge "libcpustats: Turn on -Werror"Mark Salyzyn2014-05-302-3/+4
| | |\ \ \ \
| | | * | | | libcpustats: Turn on -WerrorMark Salyzyn2014-05-302-3/+4
* | | | | | | Merge "AAC decoder: compensate limiter delay"Jean-Michel Trivi2014-05-295-218/+973
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | AAC decoder: compensate limiter delayJean-Michel Trivi2014-05-295-218/+973
* | | | | | | Merge "getSampletime -> getSampleTime"Marco Nelissen2014-05-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | getSampletime -> getSampleTimeMarco Nelissen2014-05-291-1/+1
* | | | | | | | Merge "libstagefright: Add Opus support to ACodec::getPortFormat"Lajos Molnar2014-05-291-0/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | libstagefright: Add Opus support to ACodec::getPortFormatVignesh Venkatasubramanian2014-05-291-0/+18
* | | | | | | | Fix some NuPlayer issues.Marco Nelissen2014-05-282-7/+10
* | | | | | | | Merge "IAudioPolicyService interface extension for patch panel"Eric Laurent2014-05-282-2/+275
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | IAudioPolicyService interface extension for patch panelEric Laurent2014-05-272-2/+275
* | | | | | | | Merge "IAudioFlinger interface extension for patch panel"Eric Laurent2014-05-281-1/+171
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | IAudioFlinger interface extension for patch panelEric Laurent2014-05-271-1/+171
| |/ / / / / /
* | | | | | | Merge "Remove codec callback for now."Marco Nelissen2014-05-271-1/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove codec callback for now.Marco Nelissen2014-05-231-1/+3
* | | | | | | Merge "Move validation of frameCount from set to openRecord_l"Glenn Kasten2014-05-271-18/+24
|\ \ \ \ \ \ \
| * | | | | | | Move validation of frameCount from set to openRecord_lGlenn Kasten2014-05-221-18/+24
| | |_|_|_|/ / | |/| | | | |
* | | | | | | am 79262cfc: am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/ato...Elliott Hughes2014-05-231-3/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 5b756bfd: am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-3/+2
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | am 8b187f4a: Merge "Move frameworks/av off <sys/atomics.h>."Elliott Hughes2014-05-221-3/+2
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Move frameworks/av off <sys/atomics.h>.Elliott Hughes2014-05-221-3/+2
* | | | | | | resolved conflicts for merge of f285c91e to masterElliott Hughes2014-05-221-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | am c10b874c: am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dp...Calin Juravle2014-05-221-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | am d5516339: Merge "Move frameworks/av from fdprintf to POSIX dprintf."Calin Juravle2014-05-221-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Move frameworks/av from fdprintf to POSIX dprintf.Elliott Hughes2014-05-221-1/+1
* | | | | | resolved conflicts for merge of c0bf836f to masterElliott Hughes2014-05-211-31/+31
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am ad71caf2: am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-221-31/+31
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 3b6da6bf: Merge "Move frameworks/av off private API."Elliott Hughes2014-05-221-31/+31
| | |\ \ \ \ | | | |/ / /
| | | * | | Move frameworks/av off private API.Elliott Hughes2014-05-211-31/+31
* | | | | | resolved conflicts for merge of b1080917 to masterElliott Hughes2014-05-211-10/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am acbd9492: am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-221-10/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | am d084206d: Merge "Move frameworks/av off __futex_syscall3."Elliott Hughes2014-05-221-10/+10
| | |\ \ \ \ | | | |/ / /
| | | * | | Move frameworks/av off __futex_syscall3.Elliott Hughes2014-05-211-10/+10
* | | | | | Merge "audio policy: split audio policy library"Eric Laurent2014-05-221-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | audio policy: split audio policy libraryEric Laurent2014-05-211-1/+1
* | | | | | Merge "Remove the last of the references."Marco Nelissen2014-05-211-3/+3
|\ \ \ \ \ \
| * | | | | | Remove the last of the references.Marco Nelissen2014-05-211-3/+3
* | | | | | | Merge "Use pointers instead of references because C"Marco Nelissen2014-05-201-62/+101
|\ \ \ \ \ \ \ | |/ / / / / /