summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* stagefright: rename usePersistentInputSurface to setInputSurfaceChong Zhang2015-05-1324-64/+59
* Fix comparison sign warnings.Dan Albert2015-05-081-3/+3
* libstagefright: config resource manager with secure codec co-existing policy.Ronghua Wu2015-05-088-19/+62
* Merge "Prevent integer overflow when processing covr MPEG4 atoms" into mnc-devNick Kralevich2015-05-081-0/+4
|\
| * Prevent integer overflow when processing covr MPEG4 atomsJoshua J. Drake2015-05-071-0/+4
* | Merge "Kill a new user of stlport." into mnc-devDan Albert2015-05-081-2/+0
|\ \ | |/ |/|
| * Kill a new user of stlport.Dan Albert2015-05-071-2/+0
* | Merge "Fix integer overflow when handling MPEG4 tx3g atom" into mnc-devNick Kralevich2015-05-081-0/+4
|\ \
| * | Fix integer overflow when handling MPEG4 tx3g atomJoshua J. Drake2015-05-071-0/+4
* | | Merge "Prevent integer underflow if size is below 6" into mnc-devNick Kralevich2015-05-081-0/+4
|\ \ \
| * | | Prevent integer underflow if size is below 6Joshua J. Drake2015-05-071-0/+4
| |/ /
* | | Merge "Fix integer underflow in covr MPEG4 processing" into mnc-devNick Kralevich2015-05-081-0/+4
|\ \ \
| * | | Fix integer underflow in covr MPEG4 processingJoshua J. Drake2015-05-071-0/+4
| |/ /
* | | Merge "mediaresourcemanager: add ServiceLog to track the calling history for ...Ronghua Wu2015-05-087-13/+222
|\ \ \
| * | | mediaresourcemanager: add ServiceLog to track the calling history for dumpsys.Ronghua Wu2015-05-077-13/+222
* | | | Merge "Prevent reading past the end of the buffer in 3GPP" into mnc-devNick Kralevich2015-05-081-2/+3
|\ \ \ \
| * | | | Prevent reading past the end of the buffer in 3GPPJoshua J. Drake2015-05-071-2/+3
| | |/ / | |/| |
* | | | Merge "libstagefright: export profiling results directly to xml." into mnc-devRonghua Wu2015-05-085-371/+123
|\ \ \ \
| * | | | libstagefright: export profiling results directly to xml.Ronghua Wu2015-05-055-371/+123
* | | | | Merge "Revert "Enable full floating point path in AudioMixer"" into mnc-devEric Laurent2015-05-071-3/+3
|\ \ \ \ \
| * | | | | Revert "Enable full floating point path in AudioMixer"Eric Laurent2015-05-071-3/+3
* | | | | | Merge "nuplayer: fixes for subtitle pause/resume" into mnc-devChong Zhang2015-05-074-8/+29
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | nuplayer: fixes for subtitle pause/resumeChong Zhang2015-05-064-8/+29
* | | | | | Merge changes from topic 'codec-setsurface' into mnc-devLajos Molnar2015-05-079-441/+288
|\ \ \ \ \ \
| * | | | | | stagefright: support push-blank-buffers-on-shutdown for SW rendererLajos Molnar2015-05-072-0/+15
| * | | | | | ACodec: blank surface when switching to another surfaceLajos Molnar2015-05-071-0/+5
| * | | | | | stagefright: move native window helpers into SurfaceUtilsLajos Molnar2015-05-077-441/+268
* | | | | | | Merge "Fix build" into mnc-devMarco Nelissen2015-05-071-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix buildMarco Nelissen2015-05-071-1/+1
| |/ / / / / /
* | | | | | | Merge "Camera2: allow mixing regular/reprocess requests" into mnc-devChien-Yu Chen2015-05-072-11/+9
|\ \ \ \ \ \ \
| * | | | | | | Camera2: allow mixing regular/reprocess requestsChien-Yu Chen2015-05-052-11/+9
* | | | | | | | Merge "MediaHTTP: add more null ptr and init checks" into mnc-devChong Zhang2015-05-072-2/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | MediaHTTP: add more null ptr and init checksChong Zhang2015-05-072-2/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "RTSP: append track URL to base URL" into mnc-devChong Zhang2015-05-071-13/+3
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | RTSP: append track URL to base URLChong Zhang2015-05-041-13/+3
| |/ / / / /
* | | | | | am 959d3179: am 07d4f27b: am f14555b0: am 3fdb2cbb: am d638e735: am 0d9eb04f:...Marco Nelissen2015-05-071-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | am 07d4f27b: am f14555b0: am 3fdb2cbb: am d638e735: am 0d9eb04f: am 5a75b421:...Marco Nelissen2015-05-071-1/+1
| |\ \ \ \ \
| | * \ \ \ \ am f14555b0: am 3fdb2cbb: am d638e735: am 0d9eb04f: am 5a75b421: am 30d77e2c:...Marco Nelissen2015-05-071-1/+1
| | |\ \ \ \ \
| | | * \ \ \ \ am 3fdb2cbb: am d638e735: am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potentia...Marco Nelissen2015-05-071-1/+1
| | | |\ \ \ \ \
| | | | * \ \ \ \ am d638e735: am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrunMarco Nelissen2015-05-071-1/+1
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrunMarco Nelissen2015-05-071-1/+1
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ am 5a75b421: am 30d77e2c: Fix potential buffer overrunMarco Nelissen2015-05-071-1/+1
| | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ am 30d77e2c: Fix potential buffer overrunMarco Nelissen2015-05-071-1/+1
| | | | | | | |\ \ \ \ \
| | | | | | | | * | | | | Fix potential buffer overrunMarco Nelissen2015-05-051-1/+1
* | | | | | | | | | | | | Merge "audio policy: clarify use of mName field for audio devices" into mnc-devEric Laurent2015-05-075-37/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | audio policy: clarify use of mName field for audio devicesEric Laurent2015-05-065-37/+33
* | | | | | | | | | | | | | am d7446564: am 1e5670ab: am 296dc670: am d8e41553: am bd28ac74: am 59cea261:...Marco Nelissen2015-05-071-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 1e5670ab: am 296dc670: am d8e41553: am bd28ac74: am 59cea261: Add some san...Marco Nelissen2015-05-071-3/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am 296dc670: am d8e41553: am bd28ac74: am 59cea261: Add some sanity checksMarco Nelissen2015-05-071-3/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | am d8e41553: am bd28ac74: am 59cea261: Add some sanity checksMarco Nelissen2015-05-071-3/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |