summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix several ineffective integer overflow checks"Nick Kralevich2015-04-101-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Fix several ineffective integer overflow checksJoshua J. Drake2015-04-091-3/+3
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix multiple division-by-zero conditions in MPEG4 parsing"Nick Kralevich2015-04-101-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Fix multiple division-by-zero conditions in MPEG4 parsingJoshua J. Drake2015-04-091-3/+5
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix null-pointer-dereferences accessing the SampleTable"Nick Kralevich2015-04-101-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Fix null-pointer-dereferences accessing the SampleTableJoshua J. Drake2015-04-091-0/+18
* | | | | | | | | | | | | | | | | | | | | | Merge "MPEG4Extractor: still more NULL dereference fixes"Nick Kralevich2015-04-101-0/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | MPEG4Extractor: still more NULL dereference fixesJoshua J. Drake2015-04-091-0/+56
* | | | | | | | | | | | | | | | | | | | | | Merge "Factor out buffer provider code from AudioMixer"Andy Hung2015-04-106-434/+523
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Factor out buffer provider code from AudioMixerAndy Hung2015-04-086-434/+523
* | | | | | | | | | | | | | | | | | | | | | Merge "Enable 8 bit and float pcm record formats for AudioPolicyManager"Andy Hung2015-04-106-48/+130
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Enable 8 bit and float pcm record formats for AudioPolicyManagerAndy Hung2015-04-086-48/+130
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Merge "MediaClock: allow user to query playback rate."Wei Jia2015-04-092-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | MediaClock: allow user to query playback rate.Wei Jia2015-04-092-0/+6
| | |_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Add expiration update and keys change eventsJeff Tinker2015-04-093-24/+132
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "stagefright: define CB_CODEC_RELEASED and ReleaseReason enum."Ronghua Wu2015-04-091-1/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | stagefright: define CB_CODEC_RELEASED and ReleaseReason enum.Ronghua Wu2015-04-091-1/+7
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "stagefright: LiveSession: delay consuming reply ID for seek"Lajos Molnar2015-04-092-17/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | stagefright: LiveSession: delay consuming reply ID for seekLajos Molnar2015-04-082-17/+10
* | | | | | | | | | | | | | | | | | | am 3f14f569: am de2faabb: am d661654a: am 0958e926: Merge "Log cause of failu...Marco Nelissen2015-04-091-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am de2faabb: am d661654a: am 0958e926: Merge "Log cause of failure to dlopen"Marco Nelissen2015-04-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am d661654a: am 0958e926: Merge "Log cause of failure to dlopen"Marco Nelissen2015-04-091-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0958e926: Merge "Log cause of failure to dlopen"Marco Nelissen2015-04-091-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Log cause of failure to dlopen"Marco Nelissen2015-04-091-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | Log cause of failure to dlopenMarco Nelissen2015-04-091-1/+1
* | | | | | | | | | | | | | | | | | | | | | am fdbafc07: am da589e3d: am fc33bb3f: am e686cc09: Merge "Don\'t fail read w...Marco Nelissen2015-04-091-6/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | am da589e3d: am fc33bb3f: am e686cc09: Merge "Don\'t fail read when "seeking"...Marco Nelissen2015-04-091-6/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | am fc33bb3f: am e686cc09: Merge "Don\'t fail read when "seeking" to current p...Marco Nelissen2015-04-091-6/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | am e686cc09: Merge "Don\'t fail read when "seeking" to current position"Marco Nelissen2015-04-091-6/+11
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | Merge "Don't fail read when "seeking" to current position"Marco Nelissen2015-04-091-6/+11
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Don't fail read when "seeking" to current positionMarco Nelissen2015-04-031-6/+11
| | | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | am 8910d4af: am b7427c0a: am 8c6f1d97: am 38c9d6cf: Merge "ESQueue:use 0x0000...Marco Nelissen2015-04-090-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | am b7427c0a: am 8c6f1d97: am 38c9d6cf: Merge "ESQueue:use 0x000001 instead of...Marco Nelissen2015-04-091-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | am 8c6f1d97: am 38c9d6cf: Merge "ESQueue:use 0x000001 instead of 0x00000001 a...Marco Nelissen2015-04-091-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | am 38c9d6cf: Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word i...Marco Nelissen2015-04-091-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_V...Marco Nelissen2015-04-091-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEORobert Shih2015-04-031-2/+2
| | | | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge "Pass crypto source data using a shared buffer"Jeff Tinker2015-04-096-15/+45
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Pass crypto source data using a shared bufferJeff Tinker2015-04-086-15/+45
| | |_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | am f5e63398: am 65b351c9: am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error...Marco Nelissen2015-04-091-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | / / / / / / / / / / / / / | |_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 65b351c9: am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error in corrupted...Marco Nelissen2015-04-091-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | 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 "Fix AudioPolicyManager dynamic policy initialization"Jean-Michel Trivi2015-04-093-31/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix AudioPolicyManager dynamic policy initializationJean-Michel Trivi2015-04-083-31/+31
| | |_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge "audio policy: volume in dBs"Eric Laurent2015-04-0910-40/+77
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | audio policy: volume in dBsEric Laurent2015-04-0810-40/+77
* | | | | | | | | | | | | | | | | | | | | Merge "audio policy: volume control reorganization"Eric Laurent2015-04-099-376/+571
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /