summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "libstagefright: report special error when codec is released by resourc...Ronghua Wu2015-05-081-12/+44
|\
| * libstagefright: report special error when codec is released by resource manager.Ronghua Wu2015-05-081-12/+44
* | Merge changes from topic 'codec-surface' into mnc-devLajos Molnar2015-05-083-18/+137
|\ \
| * | stagefright: enable experimentsLajos Molnar2015-05-073-4/+89
| * | stagefright: allow connecting to surfaces that attach buffersLajos Molnar2015-05-071-15/+49
* | | Fix comparison sign warnings.Dan Albert2015-05-081-3/+3
* | | libstagefright: config resource manager with secure codec co-existing policy.Ronghua Wu2015-05-085-10/+43
* | | Prevent integer overflow when processing covr MPEG4 atomsJoshua J. Drake2015-05-071-0/+4
* | | Merge "Fix integer overflow when handling MPEG4 tx3g atom" into mnc-devNick Kralevich2015-05-081-0/+4
|\ \ \
| * | | Fix integer overflow when handling MPEG4 tx3g atomJoshua J. Drake2015-05-071-0/+4
* | | | Merge "Prevent integer underflow if size is below 6" into mnc-devNick Kralevich2015-05-081-0/+4
|\ \ \ \
| * | | | Prevent integer underflow if size is below 6Joshua J. Drake2015-05-071-0/+4
| |/ / /
* | | | Merge "Fix integer underflow in covr MPEG4 processing" into mnc-devNick Kralevich2015-05-081-0/+4
|\ \ \ \
| * | | | Fix integer underflow in covr MPEG4 processingJoshua J. Drake2015-05-071-0/+4
| |/ / /
* | | | Merge "Prevent reading past the end of the buffer in 3GPP" into mnc-devNick Kralevich2015-05-081-2/+3
|\ \ \ \
| * | | | Prevent reading past the end of the buffer in 3GPPJoshua J. Drake2015-05-071-2/+3
| |/ / /
* | | | Merge "libstagefright: export profiling results directly to xml." into mnc-devRonghua Wu2015-05-084-369/+122
|\ \ \ \ | |_|_|/ |/| | |
| * | | libstagefright: export profiling results directly to xml.Ronghua Wu2015-05-054-369/+122
* | | | Merge "nuplayer: fixes for subtitle pause/resume" into mnc-devChong Zhang2015-05-074-8/+29
|\ \ \ \ | |_|_|/ |/| | |
| * | | nuplayer: fixes for subtitle pause/resumeChong Zhang2015-05-064-8/+29
* | | | Merge changes from topic 'codec-setsurface' into mnc-devLajos Molnar2015-05-075-434/+253
|\ \ \ \
| * | | | stagefright: support push-blank-buffers-on-shutdown for SW rendererLajos Molnar2015-05-071-0/+14
| * | | | ACodec: blank surface when switching to another surfaceLajos Molnar2015-05-071-0/+5
| * | | | stagefright: move native window helpers into SurfaceUtilsLajos Molnar2015-05-074-434/+234
* | | | | Merge "MediaHTTP: add more null ptr and init checks" into mnc-devChong Zhang2015-05-072-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | MediaHTTP: add more null ptr and init checksChong Zhang2015-05-072-2/+6
| |/ / /
* | | | Merge "RTSP: append track URL to base URL" into mnc-devChong Zhang2015-05-071-13/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | RTSP: append track URL to base URLChong Zhang2015-05-041-13/+3
| |/ /
* | | am 959d3179: am 07d4f27b: am f14555b0: am 3fdb2cbb: am d638e735: am 0d9eb04f:...Marco Nelissen2015-05-071-1/+1
|\ \ \
| * \ \ am 07d4f27b: am f14555b0: am 3fdb2cbb: am d638e735: am 0d9eb04f: am 5a75b421:...Marco Nelissen2015-05-071-1/+1
| |\ \ \
| | * \ \ am d638e735: am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrunMarco Nelissen2015-05-071-1/+1
| | |\ \ \
| | | * \ \ am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrunMarco Nelissen2015-05-071-1/+1
| | | |\ \ \
| | | | * \ \ am 5a75b421: am 30d77e2c: Fix potential buffer overrunMarco Nelissen2015-05-071-1/+1
| | | | |\ \ \
| | | | | * \ \ am 30d77e2c: Fix potential buffer overrunMarco Nelissen2015-05-071-1/+1
| | | | | |\ \ \
| | | | | | * | | Fix potential buffer overrunMarco Nelissen2015-05-051-1/+1
* | | | | | | | | am d7446564: am 1e5670ab: am 296dc670: am d8e41553: am bd28ac74: am 59cea261:...Marco Nelissen2015-05-071-3/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 1e5670ab: am 296dc670: am d8e41553: am bd28ac74: am 59cea261: Add some san...Marco Nelissen2015-05-071-3/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am bd28ac74: am 59cea261: Add some sanity checksMarco Nelissen2015-05-061-3/+11
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am 59cea261: Add some sanity checksMarco Nelissen2015-05-061-3/+11
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Add some sanity checksMarco Nelissen2015-04-221-3/+11
* | | | | | | | | Merge "NuPlayer: parcel placeholder mime in track info if not provided by sou...Robert Shih2015-05-061-1/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | NuPlayer: parcel placeholder mime in track info if not provided by sourceRobert Shih2015-05-061-1/+13
* | | | | | | | | | stagefright: fix pushBlankBuffersToNW for non-meta decodersLajos Molnar2015-05-061-0/+3
* | | | | | | | | | Merge "Implement audio device callback" into mnc-devEric Laurent2015-05-064-63/+320
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Implement audio device callbackEric Laurent2015-05-064-63/+320
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge "Pass all DRM errors through ICrypto" into mnc-devJeff Tinker2015-05-061-3/+2
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Pass all DRM errors through ICryptoJeff Tinker2015-05-051-3/+2
* | | | | | | | | | Merge "OggExtractor::verifyHeader: return errors instead of asserting" into m...Marco Nelissen2015-05-051-2/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | OggExtractor::verifyHeader: return errors instead of assertingMarco Nelissen2015-05-051-2/+6
* | | | | | | | | | | stagefright: Validate track formats passed to MPEG4WriterPraveen Chavan2015-05-051-20/+35