summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "nuplayer: let non-offload AudioSink to handle the reconnect when there...Ronghua Wu2015-09-021-1/+9
|\
| * nuplayer: let non-offload AudioSink to handle the reconnect when there's video.Ronghua Wu2015-09-021-1/+9
* | am d35955dd: Merge "stagefright: MPEG4Extractor: allow \'hdlr\' box before fi...Lajos Molnar2015-09-021-4/+3
|\ \ | |/ |/|
| * stagefright: MPEG4Extractor: allow 'hdlr' box before first trackLajos Molnar2015-08-311-4/+3
* | am 389e7653: Merge "Fix for security vulnerability in media server" into mnc-devJeff Tinker2015-08-281-1/+19
|\ \ | |/
| * Merge "Fix for security vulnerability in media server" into mnc-devJeff Tinker2015-08-281-1/+19
| |\
| | * Fix for security vulnerability in media serverJeff Tinker2015-08-271-1/+19
* | | am 5d76e54d: Merge "NuPlayer: do not create audio decoder if the player is st...Wei Jia2015-08-281-1/+3
|\ \ \ | |/ /
| * | Merge "NuPlayer: do not create audio decoder if the player is still in shutdo...Wei Jia2015-08-281-1/+3
| |\ \
| | * | NuPlayer: do not create audio decoder if the player is still in shutdown proc...Wei Jia2015-08-271-1/+3
* | | | am 03dee050: am 608c349d: am 4e861bf5: am e1dc15ec: am 762c7139: am b04cfdf5:...Nick Kralevich2015-08-271-0/+2
|\ \ \ \ | |/ / /
| * | | am 608c349d: am 4e861bf5: am e1dc15ec: am 762c7139: am b04cfdf5: am d437c777:...Nick Kralevich2015-08-271-0/+2
| |\ \ \
| | * \ \ am 4e861bf5: am e1dc15ec: am 762c7139: am b04cfdf5: am d437c777: am 0981df6e:...Nick Kralevich2015-08-271-0/+2
| | |\ \ \
| | | * \ \ am 762c7139: am b04cfdf5: am d437c777: am 0981df6e: IMediaPlayer.cpp: make su...Nick Kralevich2015-08-271-0/+2
| | | |\ \ \
| | | | * \ \ am b04cfdf5: am d437c777: am 0981df6e: IMediaPlayer.cpp: make sure structures...Nick Kralevich2015-08-271-0/+2
| | | | |\ \ \
| | | | | * \ \ am d437c777: am 0981df6e: IMediaPlayer.cpp: make sure structures are initiali...Nick Kralevich2015-08-271-0/+2
| | | | | |\ \ \
| | | | | | * \ \ am 0981df6e: IMediaPlayer.cpp: make sure structures are initialized to 0Nick Kralevich2015-08-271-0/+2
| | | | | | |\ \ \
| | | | | | | * | | IMediaPlayer.cpp: make sure structures are initialized to 0Nick Kralevich2015-08-271-0/+2
| | | | | | * | | | am 9a2be5d4: Merge "DO NOT MERGE - Fix software video decoder buffer size cal...Abhishek Arya2015-08-251-1/+1
| | | | | | |\ \ \ \ | | | | | | | |/ / /
| | | | | | | * | | Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" int...Abhishek Arya2015-08-251-1/+1
| | | | | | | |\ \ \
| | | | | | | | * | | DO NOT MERGE - Fix software video decoder buffer size calculationMarco Nelissen2015-08-241-1/+1
| | | | | | * | | | | am a5f50e98: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before...Wei Jia2015-08-251-0/+7
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.Wei Jia2015-08-241-0/+7
| | | | | | | |/ / /
| | * | | | | | | | am 524f9946: am 76b3fb29: am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix...Abhishek Arya2015-08-251-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am 4fd0696a: am 4f797b92: Merge "DO NOT MERGE - Fix software video decoder bu...Abhishek Arya2015-08-251-1/+1
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | am 4f797b92: Merge "DO NOT MERGE - Fix software video decoder buffer size cal...Abhishek Arya2015-08-251-1/+1
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Merge "DO NOT MERGE - Fix software video decoder buffer size calculation" int...Abhishek Arya2015-08-251-1/+1
| | | | | |\ \ \ \ \
| | | | | | * | | | | DO NOT MERGE - Fix software video decoder buffer size calculationMarco Nelissen2015-08-241-1/+1
| | * | | | | | | | | am fb385ac6: am 571d9731: Merge commit \'c642d411\' into HEADWei Jia2015-08-251-1/+9
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge commit 'c642d411' into HEADWei Jia2015-08-251-1/+9
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | am dc5e47f0: DO NOT MERGE - SoftwareRenderer: sanity check buffer size before...Wei Jia2015-08-251-1/+8
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | DO NOT MERGE - SoftwareRenderer: sanity check buffer size before copying data.Wei Jia2015-08-241-1/+8
| | | | | |/ / / / /
| | * | | | | | | | am 41de4ba1: am cf69487d: am 6f80b09f: am 252a8c09: am 0f3ab16c: am af7e33f6:...Wei Jia2015-08-241-0/+3
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am 6f80b09f: am 252a8c09: am 0f3ab16c: am af7e33f6: libstagefright: check ove...Wei Jia2015-08-231-0/+3
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | am 252a8c09: am 0f3ab16c: am af7e33f6: libstagefright: check overflow before ...Wei Jia2015-08-231-0/+3
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | am 0f3ab16c: am af7e33f6: libstagefright: check overflow before memory alloca...Wei Jia2015-08-231-0/+3
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | am af7e33f6: libstagefright: check overflow before memory allocation in OMXCo...Wei Jia2015-08-231-0/+3
| | | | | | |\ \ \ \ | | | | | | | |/ / /
| | | | | | | * | | libstagefright: check overflow before memory allocation in OMXCodec.cppWei Jia2015-08-231-0/+3
| | * | | | | | | | am 2c02f5ee: am 719cd33e: am 492bba08: am d18bb120: am 09f71c56: am dedaca6f:...Marco Nelissen2015-08-241-4/+12
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | am 492bba08: am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoi...Marco Nelissen2015-08-231-4/+12
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | am d18bb120: am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-231-4/+12
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | am 09f71c56: am dedaca6f: Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-231-4/+12
| | | | | |\ \ \ \ \ | | | | | | |/ / / /
| | | | | | * | | | am dedaca6f: Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-231-4/+12
| | | | | | |\ \ \ \ | | | | | | | |/ / /
| | | | | | | * | | Limit allocations to avoid out-of-memoryMarco Nelissen2015-08-211-4/+12
* | | | | | | | | | am d0b5910f: libmedia: clear reply data for IEffect commandAndy Hung2015-08-271-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | libmedia: clear reply data for IEffect commandAndy Hung2015-08-261-2/+2
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | AudioSink: Fix for gapless offload playbackPreetam Singh Ranawat2015-08-261-2/+2
* | | | | | | | | am 7b06f9ba: am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1...Robert Shih2015-08-241-1/+16
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am fa11fd5b: resolved conflicts for merge of 327afffb to lmp-mr1-ub-devRobert Shih2015-08-241-1/+16
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | resolved conflicts for merge of 327afffb to lmp-mr1-ub-devRobert Shih2015-08-241-1/+16
| | |\ \ \ \ \ \ \ | | | |/ / / / / /