summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error in corrupted media file"Marco Nelissen2015-04-091-0/+10
|\
| * am 1c4eddb1: Merge "Fix div zero error in corrupted media file"Marco Nelissen2015-04-091-0/+10
| |\
| | * Fix div zero error in corrupted media fileDan Liang2015-04-081-0/+10
| | * Merge "DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated bef...Lajos Molnar2015-04-065-14/+111
| | |\
| | | * DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before sta...Lajos Molnar2015-04-035-14/+111
| | * | nuplayer: do not use cached source for wvm content -- DO NOT MERGEChong Zhang2015-04-031-23/+32
| | |/
| | * DO NOT MERGE libstagefright: Stop using IGBC::BufferItemDan Stoza2015-04-013-11/+13
* | | am e849af87: Cherry-pick two BufferItem changesDan Stoza2015-04-073-11/+13
|\ \ \ | |/ /
| * | Cherry-pick two BufferItem changesDan Stoza2015-04-073-11/+13
| |/
* | am d513b7da: am 31878abb: am 68fca636: mediaplayer: ensure secure decoders ar...Lajos Molnar2015-04-015-14/+111
|\ \
| * | mediaplayer: ensure secure decoders are instantiated before starting sourceLajos Molnar2015-03-315-14/+111
* | | am 414af268: am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE - audio poli...Eric Laurent2015-03-251-2/+20
|\ \ \ | |/ / | | / | |/ |/|
| * am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy service: fix possible m...Eric Laurent2015-03-251-2/+20
| |\
| | * am 2fdd16b3: DO NOT MERGE - audio policy service: fix possible memory overflowEric Laurent2015-03-251-2/+20
| | |\
| | | * DO NOT MERGE - audio policy service: fix possible memory overflowEric Laurent2015-03-251-2/+20
| | * | am 6d60079e: am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicy...Eric Laurent2014-11-101-3/+6
| | |\ \ | | | |/
| | | * am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: boun...Eric Laurent2014-11-101-3/+6
| | | |\
| | | | * am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size ...Eric Laurent2014-11-101-3/+6
| | | | |\
| | | | | * am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in queryDefau...Eric Laurent2014-11-101-3/+6
| | | | | |\
| | | | | | * am e360f0f6: IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-101-3/+6
| | | | | | |\
| | | | | | | * IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-101-3/+6
| | | | * | | | Revert "audio: prevent larger than required sleeps - DO NOT MERGE"Chris Elliott2014-10-161-21/+1
| | | | * | | | audio: prevent larger than required sleeps - DO NOT MERGEChris Elliott2014-10-151-1/+21
| | | | * | | | Revert "audio: prevent larger than required sleeps - DO NOT MERGE"Chris Elliott2014-10-151-21/+1
| | | | * | | | audio: prevent larger than required sleeps - DO NOT MERGEHaynes Mathew George2014-10-141-1/+21
| | | | * | | | am 6fd1cf0c: am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f:...Robert Shih2014-09-111-0/+14
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | am 86543654: am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219:...Robert Shih2014-09-111-0/+14
| | | | | |\ \ \ | | | | | | |/ /
| | | | | | * | am 0d83cf22: am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae:...Robert Shih2014-09-101-0/+14
| | | | | | |\ \ | | | | | | | |/
| | | | | | | * am 97d917bc: am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb:...Robert Shih2014-09-101-0/+14
| | | | | | | |\
| | | | | | | | * am ab0b3212: am 9b51a37f: am cb5dc219: am 74abb1ae: am 482b18bb: am f106b199:...Robert Shih2014-09-101-0/+14
| | | | | | | | |\
| | | | | | | | | * am 74abb1ae: am 482b18bb: am f106b199: SampleTable: check integer overflow du...Robert Shih2014-09-101-0/+14
| | | | | | | | | |\
| | | | | | | | | | * am 482b18bb: am f106b199: SampleTable: check integer overflow during table allocRobert Shih2014-09-101-0/+14
| | | | | | | | | | |\
| | | | | | | | | | | * am f106b199: SampleTable: check integer overflow during table allocRobert Shih2014-09-101-0/+14
| | | | | | | | | | | |\
| | | | | | | | | | | | * SampleTable: check integer overflow during table allocRobert Shih2014-08-201-0/+14
* | | | | | | | | | | | | ulaw and alaw aren't limited to 8kHzMarco Nelissen2015-03-205-11/+23
* | | | | | | | | | | | | Fix mismatched type tag clang warning.Dan Albert2015-02-191-1/+0
* | | | | | | | | | | | | Fix clang build errorBill Yi2015-02-191-1/+1
* | | | | | | | | | | | | Merge commit '56fbb4d7bcb34af71a08cd126891afafdec217f1' into HEADBill Yi2015-02-19412-4639/+11288
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 5f136027: am faefd08b: Revert "DO NOT MERGE: stagefright: add support for ...Lajos Molnar2015-02-111-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in...Lajos Molnar2015-02-111-3/+1
| * | | | | | | | | | | | | Track change of IInterface::asBinder from instance method to static methodBrian Carlstrom2015-02-091-1/+1
| * | | | | | | | | | | | | am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pa...Lajos Molnar2015-02-104-2/+122
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-devLajos Molnar2015-02-104-2/+122
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | nuplayer: acquire wakelock during offload pause timeoutWeiyin Jiang2015-02-064-2/+122
| * | | | | | | | | | | | | | am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing headers on h26...Lajos Molnar2015-02-07290-332/+4575
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge "stagefright: change licensing headers on h264dec omxdl sources" into l...Lajos Molnar2015-02-07290-332/+4575
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | stagefright: change licensing headers on h264dec omxdl sourcesLajos Molnar2015-02-06290-332/+4575
| * | | | | | | | | | | | | | am bff77217: am 17e95f40: stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-071-0/+108
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-061-0/+108
| * | | | | | | | | | | | | | am 5dc38beb: am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-072-4/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /