summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* CameraService: Use SCHED_FIFO for request queue thread in HFREino-Ville Talvala2015-09-265-0/+220
* SoftAVCDec: Reduced memory requirementsHarish Mahendrakar2015-09-232-296/+84
* am 3662ca10: Merge "StagefrightMetadataRetriever: handle error returned from ...Wei Jia2015-09-211-1/+4
|\
| * Merge "StagefrightMetadataRetriever: handle error returned from convertMetaDa...Wei Jia2015-09-211-1/+4
| |\
| | * StagefrightMetadataRetriever: handle error returned from convertMetaDataToMes...Wei Jia2015-09-181-1/+4
* | | Fix BuildIan Pedowitz2015-09-181-1/+1
* | | Merge "stagefright: Move google mpeg2 codec into media_codecs_google_tv.xml" ...Lajos Molnar2015-09-182-9/+29
|\ \ \
| * | | stagefright: Move google mpeg2 codec into media_codecs_google_tv.xmlSungmin Choi2015-09-172-9/+29
* | | | Merge "stagefright: only pass valid framerates in msg and meta" into mnc-dr-devLajos Molnar2015-09-181-2/+2
|\ \ \ \
| * | | | stagefright: only pass valid framerates in msg and metaLajos Molnar2015-09-171-2/+2
| |/ / /
* | | | am 12d4a6a2: DO NOT MERGE Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-182-93/+20
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | DO NOT MERGE Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-182-93/+20
| |/
* | am dffe5cdb: Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-devJeff Tinker2015-09-171-1/+1
|\ \ | |/
| * Merge "DO NOT MERGE Fix vulnerability in mediaserver" into mnc-devJeff Tinker2015-09-171-1/+1
| |\
| | * DO NOT MERGE Fix vulnerability in mediaserverJeff Tinker2015-09-161-1/+1
* | | am 190eca5a: Merge "IAudioFlinger: fix the missing initialization of variable...Wei Jia2015-09-171-1/+1
|\ \ \ | |/ /
| * | Merge "IAudioFlinger: fix the missing initialization of variable to ensure no...Wei Jia2015-09-171-1/+1
| |\ \
| | * | IAudioFlinger: fix the missing initialization of variable to ensure no info l...Wei Jia2015-09-161-1/+1
* | | | am 866a12a7: am 3c4216e5: am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84:...Wonsik Kim2015-09-162-20/+93
|\ \ \ \ | |/ / /
| * | | am 3c4216e5: am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge "Rever...Wonsik Kim2015-09-162-20/+93
| |\ \ \ | | |/ / | |/| |
| | * | am 2fa6a5ad: am 4d27a468: am 92efd0c5: am b5611b84: Merge "Revert "Avoid size...Wonsik Kim2015-09-162-20/+93
| | |\ \
| | | * \ am 92efd0c5: am b5611b84: Merge "Revert "Avoid size_t overflow in base64 deco...Wonsik Kim2015-09-162-20/+93
| | | |\ \
| | | | * \ am b5611b84: Merge "Revert "Avoid size_t overflow in base64 decoding once aga...Wonsik Kim2015-09-122-20/+93
| | | | |\ \
| | | | | * \ Merge "Revert "Avoid size_t overflow in base64 decoding once again"" into lmp...Wonsik Kim2015-09-112-20/+93
| | | | | |\ \
| | | | | | * | Revert "Avoid size_t overflow in base64 decoding once again"Wonsik Kim2015-09-112-20/+93
| | * | | | | | am c259acce: am f7c40163: am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overf...Wonsik Kim2015-09-162-93/+20
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 5f5fc26c: am 322e2dc5: Merge "Avoid size_t overflow in base64 decoding onc...Wonsik Kim2015-09-162-93/+20
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | am 322e2dc5: Merge "Avoid size_t overflow in base64 decoding once again" into...Wonsik Kim2015-09-122-93/+20
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge "Avoid size_t overflow in base64 decoding once again" into lmp-devWonsik Kim2015-09-112-93/+20
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-092-93/+20
| | * | | | | | am c53328a5: am 67f36a8e: resolved conflicts for 76b704e3 to lmp-mr1-devWonsik Kim2015-09-142-8/+24
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | resolved conflicts for 76b704e3 to lmp-mr1-devWonsik Kim2015-09-142-8/+24
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | am f3eb8268: DO NOT MERGE: Protect data source access with mutex during disco...Robert Shih2015-09-122-8/+24
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | DO NOT MERGE: Protect data source access with mutex during disconnectRobert Shih2015-09-082-8/+24
| | | | | |/ /
* | | | | | | am bc0daa97: Merge "IAudioFlinger: always initialize variables to ensure no i...Wei Jia2015-09-162-15/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "IAudioFlinger: always initialize variables to ensure no info leak when...Wei Jia2015-09-162-15/+15
| |\ \ \ \ \ \
| | * | | | | | IAudioFlinger: always initialize variables to ensure no info leak when writin...Wei Jia2015-09-102-15/+15
* | | | | | | | Merge "NuPlayerRenderer: Do not drain audio during teardown" into mnc-dr-devAndy Hung2015-09-151-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | NuPlayerRenderer: Do not drain audio during teardownAndy Hung2015-09-111-0/+5
* | | | | | | | | Merge "NuPlayerRenderer: Do not deliver audio too soon after stop" into mnc-d...Andy Hung2015-09-142-1/+19
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NuPlayerRenderer: Do not deliver audio too soon after stopAndy Hung2015-09-012-1/+19
* | | | | | | | | | am 4374b187: Merge "NuCachedSource2: fix possible erroneous early free" into ...Wonsik Kim2015-09-144-7/+21
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "NuCachedSource2: fix possible erroneous early free" into mnc-devWonsik Kim2015-09-144-7/+21
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | NuCachedSource2: fix possible erroneous early freeWonsik Kim2015-09-094-7/+21
* | | | | | | | | | | am 393eb647: Merge "Avoid size_t overflow in base64 decoding once again" into...Wonsik Kim2015-09-112-93/+20
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Avoid size_t overflow in base64 decoding once again" into mnc-devWonsik Kim2015-09-112-93/+20
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Avoid size_t overflow in base64 decoding once againWonsik Kim2015-09-072-93/+20
| | |/ / / / / / / /
* | | | | | | | | | Merge "libstagefright: Do not add audio codecs to resource manager. They are ...Ronghua Wu2015-09-111-2/+5
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | libstagefright: Do not add audio codecs to resource manager. They are too sma...Ronghua Wu2015-09-101-2/+5
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | am 7a2ffb90: Merge "IAudioFlinger: clear config before reading it from parcel...Wei Jia2015-09-102-15/+29
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |