summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* libstagefright: parse global settings from codec xml file.Ronghua Wu2015-04-131-10/+83
* libstagefright: convert status_t to OMX_ERRORTYPE.Ronghua Wu2015-04-101-1/+1
* Merge "libstagefright: propagate error from allocateNode."Ronghua Wu2015-04-101-5/+6
|\
| * libstagefright: propagate error from allocateNode.Ronghua Wu2015-04-101-5/+6
* | Merge "Add a method to associate MediaDrm session with MediaCrypto"Jeff Tinker2015-04-103-0/+54
|\ \
| * | Add a method to associate MediaDrm session with MediaCryptoJeff Tinker2015-04-103-0/+54
* | | Merge "HLS: allow down switch during prepare"Chong Zhang2015-04-103-33/+63
|\ \ \
| * | | HLS: allow down switch during prepareChong Zhang2015-04-093-33/+63
* | | | Merge "Add playback rate to AudioTrack"Andy Hung2015-04-102-15/+128
|\ \ \ \
| * | | | Add playback rate to AudioTrackAndy Hung2015-04-092-15/+128
| |/ / /
* | | | 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
* | | | | 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
* | | | | 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
* | | | | 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 "MediaClock: allow user to query playback rate."Wei Jia2015-04-091-0/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | MediaClock: allow user to query playback rate.Wei Jia2015-04-091-0/+5
* | | | | Add expiration update and keys change eventsJeff Tinker2015-04-092-13/+62
* | | | | 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 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 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 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-094-13/+38
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Pass crypto source data using a shared bufferJeff Tinker2015-04-084-13/+38
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | am f5e63398: am 65b351c9: am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error...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
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | 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
| | | |\ \ \ \