summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | * | | | | | | | | | | | am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS ↵Nick Kralevich2015-04-101-0/+6
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processing" into klp-dev * commit 'eb204f82afd5519eb544bf8bee692e7152820c3b': Fix integer underflow in ESDS processing
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" ↵Nick Kralevich2015-04-101-0/+6
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'b919a3a3d38c4b1cbb378c38cc6154a81ebe01c7': Fix integer underflow in ESDS processing
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-devNick Kralevich2015-04-101-0/+6
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6429079345404932c5be5956efc7154390d2ed0e': Fix integer underflow in ESDS processing
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge "Fix integer underflow in ESDS processing" into klp-devNick Kralevich2015-04-101-0/+6
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | | | | | Fix integer underflow in ESDS processingJoshua J. Drake2015-04-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several arithmetic operations within parseESDescriptor could underflow, leading to an out-of-bounds read operation. Ensure that subtractions from 'size' do not cause it to wrap around. Bug: 20139950 (cherry picked from commit 07c0f59d6c48874982d2b5c713487612e5af465a) Change-Id: I377d21051e07ca654ea1f7037120429d3f71924a
* | | | | | | | | | | | | | | | | | | | | | am 0dc95be5: am 17b6f9b0: am 3b042ea5: am 7d62a918: am 14c686c0: am ↵Nick Kralevich2015-04-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev * commit '0dc95be53182d7248d0af32f3025097171100204': Fix integer overflow during MP4 atom processing
| * | | | | | | | | | | | | | | | | | | | | am 17b6f9b0: am 3b042ea5: am 7d62a918: am 14c686c0: am 940189d9: am ↵Nick Kralevich2015-04-111-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev * commit '17b6f9b0b5c53a46dc1a04162f32d5785e01e58d': Fix integer overflow during MP4 atom processing
| | * | | | | | | | | | | | | | | | | | | | am 3b042ea5: am 7d62a918: am 14c686c0: am 940189d9: am 475de998: am ↵Nick Kralevich2015-04-111-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev * commit '3b042ea54bbaf75bac63bd4d3d7064007b4b0d8d': Fix integer overflow during MP4 atom processing
| | | * | | | | | | | | | | | | | | | | | | am 7d62a918: am 14c686c0: am 940189d9: am 475de998: am 47759307: am ↵Nick Kralevich2015-04-111-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev * commit '7d62a9187bf217d32d1e3edc047285380ee30d2a': Fix integer overflow during MP4 atom processing
| | | | * | | | | | | | | | | | | | | | | | am 14c686c0: am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix ↵Nick Kralevich2015-04-111-0/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integer overflow during MP4 atom processing" into klp-dev * commit '14c686c0f6eb3e9ac5774bbfa7b5f2fa4e04ce80': Fix integer overflow during MP4 atom processing
| | | | | * | | | | | | | | | | | | | | | | am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix integer ↵Nick Kralevich2015-04-111-0/+3
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow during MP4 atom processing" into klp-dev * commit '940189d991f9f7eb55d8a379cf6fda6ec486ceb5': Fix integer overflow during MP4 atom processing
| | | | | | * | | | | | | | | | | | | | | | am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during ↵Nick Kralevich2015-04-101-0/+3
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MP4 atom processing" into klp-dev * commit '475de998b755f0995645e979501f59fca135009c': Fix integer overflow during MP4 atom processing
| | | | | | | * | | | | | | | | | | | | | | am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom ↵Nick Kralevich2015-04-101-0/+3
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processing" into klp-dev * commit '4775930799bd9a9fbad8efe5d338e890dd7444ed': Fix integer overflow during MP4 atom processing
| | | | | | | | * | | | | | | | | | | | | | am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into ↵Nick Kralevich2015-04-101-0/+3
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '17b625b7f51b75fde6640c737474b8b2c51412bf': Fix integer overflow during MP4 atom processing
| | | | | | | | | * | | | | | | | | | | | | Merge "Fix integer overflow during MP4 atom processing" into klp-devNick Kralevich2015-04-101-0/+3
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | | | | | | | | | | Fix integer overflow during MP4 atom processingJoshua J. Drake2015-04-091-0/+3
| | | | | | | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few sample table related FourCC values are handled by the setSampleToChunkParams function. An integer overflow exists within this function. Validate that mNumSampleToChunkOffets will not cause an integer overflow. Bug: 20139950 (cherry picked from commit c24607c29c96f939aed9e33bfa702b1dd79da4b7) Change-Id: I49086952451b09a234d8b82669251ab9f1ef58d9
* | | | | | | | | | | | | | | | | | | | | | am ef6a1a21: am 892e06d1: am 86fb9185: am 75a8776e: am 3cff4324: am ↵Joshua J. Drake2015-04-110-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 520434cd: am 24acf11d: am 4a131250: am 030d8d0a: Fix several ineffective integer overflow checks * commit 'ef6a1a212ff0e9f52db7dcc55117a0df9efa15b3': Fix several ineffective integer overflow checks
| * | | | | | | | | | | | | | | | | | | | | am 892e06d1: am 86fb9185: am 75a8776e: am 3cff4324: am 520434cd: am ↵Joshua J. Drake2015-04-111-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24acf11d: am 4a131250: am 030d8d0a: Fix several ineffective integer overflow checks * commit '892e06d1c92e2ea4fbf0a13a785c8235382f6e23': Fix several ineffective integer overflow checks
| | * | | | | | | | | | | | | | | | | | | | am 86fb9185: am 75a8776e: am 3cff4324: am 520434cd: am 24acf11d: am ↵Joshua J. Drake2015-04-111-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a131250: am 030d8d0a: Fix several ineffective integer overflow checks * commit '86fb91857ecaca2a0dc27abcd369c5f35203e922': Fix several ineffective integer overflow checks
| | | * | | | | | | | | | | | | | | | | | | am 75a8776e: am 3cff4324: am 520434cd: am 24acf11d: am 4a131250: am ↵Joshua J. Drake2015-04-111-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 030d8d0a: Fix several ineffective integer overflow checks * commit '75a8776ebdce0694e00fd3df06c36c3890e21cde': Fix several ineffective integer overflow checks
| | | | * | | | | | | | | | | | | | | | | | am 3cff4324: am 520434cd: am 24acf11d: am 4a131250: am 030d8d0a: Fix several ↵Joshua J. Drake2015-04-111-3/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ineffective integer overflow checks * commit '3cff43241858431ab1e209012dcdcdee0e34c364': Fix several ineffective integer overflow checks
| | | | | * | | | | | | | | | | | | | | | | am 520434cd: am 24acf11d: am 4a131250: am 030d8d0a: Fix several ineffective ↵Joshua J. Drake2015-04-111-3/+3
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integer overflow checks * commit '520434cdf572d13efbca693ae9e42bfe42211b85': Fix several ineffective integer overflow checks
| | | | | | * | | | | | | | | | | | | | | | am 24acf11d: am 4a131250: am 030d8d0a: Fix several ineffective integer ↵Joshua J. Drake2015-04-101-3/+3
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow checks * commit '24acf11dbec8e7071f9adcc24fa883c71d005215': Fix several ineffective integer overflow checks
| | | | | | | * | | | | | | | | | | | | | | am 4a131250: am 030d8d0a: Fix several ineffective integer overflow checksJoshua J. Drake2015-04-101-3/+3
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a13125033f2130cadb4c48b3e6e0085d8c98829': Fix several ineffective integer overflow checks
| | | | | | | | * | | | | | | | | | | | | | am 030d8d0a: Fix several ineffective integer overflow checksJoshua J. Drake2015-04-101-3/+3
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '030d8d0a557097b88d6ecbf6d04823213512b620': Fix several ineffective integer overflow checks
| | | | | | | | | * | | | | | | | | | | | | Fix several ineffective integer overflow checksJoshua J. Drake2015-04-091-3/+3
| | | | | | | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit edd4a76 (which addressed bugs 15328708, 15342615, 15342751) added several integer overflow checks. Unfortunately, those checks fail to take into account integer promotion rules and are thus themselves subject to an integer overflow. Cast the sizeof() operator to a uint64_t to force promotion while multiplying. Bug: 20139950 (cherry picked from commit e2e812e58e8d2716b00d7d82db99b08d3afb4b32) Change-Id: I080eb3fa147601f18cedab86e0360406c3963d7b
* | | | | | | | | | | | | | | | | | | | | mediaplayer: support async mode for widevine legacy modeLajos Molnar2015-04-103-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14679336 Change-Id: Id224eb8c31ec148ca9a144758cc56ddbf5465f5c
* | | | | | | | | | | | | | | | | | | | | mediaplayer: use async mode in NuPlayerMarco Nelissen2015-04-103-118/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14679336 Change-Id: I5e471a6e13be82a375afc2718599f27cd0255bf5
* | | | | | | | | | | | | | | | | | | | | Merge "camera: Update camera service logging and validation."Ruben Brunk2015-04-102-45/+138
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | / / / / / / / / | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | camera: Update camera service logging and validation.Ruben Brunk2015-04-092-45/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Expand the logging included by the camera service. - Update user validation checks in connect calls so that these can be correctly called from the camera service. Bug: 20063426 Change-Id: I0a8cbe1ea2c0a652298e6b70c89705da174a50e1
* | | | | | | | | | | | | | | | | | | | libstagefright: handle MediaFormat "operating-rate" key.Ronghua Wu2015-04-102-0/+39
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I846d3cc10308a13f2ed92bb82ba7e8236d9c67d1
* | | | | | | | | | | | | | | | | | | libstagefright: convert status_t to OMX_ERRORTYPE.Ronghua Wu2015-04-101-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I32369b2e812c7f3ef6953b13a1dae046b8dc24f1
* | | | | | | | | | | | | | | | | | Merge "libstagefright: propagate error from allocateNode."Ronghua Wu2015-04-101-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | libstagefright: propagate error from allocateNode.Ronghua Wu2015-04-101-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: Iee288343d7d851a395052e1b3354eb98b026e4fb
* | | | | | | | | | | | | | | | | | | Merge "Add a method to associate MediaDrm session with MediaCrypto"Jeff Tinker2015-04-104-0/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add a method to associate MediaDrm session with MediaCryptoJeff Tinker2015-04-104-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, to associate a MediaDrm session with MediaCrypto, the MediaDrm sessionId was passed as initData to the MediaCrypto constructor. This is not ideal for two reasons: it's pretty obscure and you can't change the association without tearing down the MediaCodec/MediaCrypto and starting all over. Use cases like key rotation require being able to update the MediaDrm session post-construction. This CL addresses both of these issues. bug: 19570317 Change-Id: Ieb32d04d61742fc1dee2105dd904690d44c46c7b
* | | | | | | | | | | | | | | | | | | | Merge "HLS: allow down switch during prepare"Chong Zhang2015-04-103-33/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | HLS: allow down switch during prepareChong Zhang2015-04-093-33/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to avoid having to immediately down switch (and pause) after playback starts. do not count "discard" packet when estimating duration. bug: 19567254 Change-Id: I0cdd37a06ca800dd81a91cca5eb9b46a1eab7b20
* | | | | | | | | | | | | | | | | | | | | Merge "AudioFlinger: more DTS passthrough support"Phil Burk2015-04-103-19/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | AudioFlinger: more DTS passthrough supportPhil Burk2015-04-093-19/+29
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass format for AC3 or DTS to SPDIF encoder. Bug: 18292317 Change-Id: I6d80eb548cb431bac3390ebb3235146171344291 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | | | | | | | | | | | | | | Merge "Add playback rate to AudioTrack"Andy Hung2015-04-107-35/+229
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Add playback rate to AudioTrackAndy Hung2015-04-097-35/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I6411e1d3ce652b711a71a6d9df020cb5f60d4714
* | | | | | | | | | | | | | | | | | | | | | Merge "Add playback rate to AudioMixer"Andy Hung2015-04-105-1/+278
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add playback rate to AudioMixerAndy Hung2015-04-095-1/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19196501 Change-Id: I42d1f90e6297cf3f1304860d1691a5dfedd4c37d
* | | | | | | | | | | | | | | | | | | | | Merge "Fix integer underflow in ESDS processing"Nick Kralevich2015-04-101-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fix integer underflow in ESDS processingJoshua J. Drake2015-04-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several arithmetic operations within parseESDescriptor could underflow, leading to an out-of-bounds read operation. Ensure that subtractions from 'size' do not cause it to wrap around. Bug: 20139950 Change-Id: I0d1b136ce68fd7c6f606ce66714bf644cfb2961c
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix integer overflow during MP4 atom processing"Nick Kralevich2015-04-101-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Fix integer overflow during MP4 atom processingJoshua J. Drake2015-04-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few sample table related FourCC values are handled by the setSampleToChunkParams function. An integer overflow exists within this function. Validate that mNumSampleToChunkOffets will not cause an integer overflow. Bug: 20139950 Change-Id: I1972cc185fce5e058afa143ad5eabcc269ad324d
* | | | | | | | | | | | | | | | | | | | | | Merge "Detect allocation failures and bail gracefully"Nick Kralevich2015-04-101-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Detect allocation failures and bail gracefullyJoshua J. Drake2015-04-091-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During the processing of several sample table related MP4 atoms, allocation sizes could be large enough cause a std::bad_alloc exception to be raised. This typically causes a crash (denial of service condition). Use std::nothrow to catch allocation failures and return gracefully. Bug: 20139950 Change-Id: I03d3f01b24e5fe3fa38985914bcfa694ea3dc09e