summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Track camera and flashlight usage in battery stats.Ruben Brunk2015-06-018-141/+336
* Merge "mediaplayer: remove unused parameter needNotify in NuPlayer::performSe...Wei Jia2015-05-162-13/+10
|\
| * mediaplayer: remove unused parameter needNotify in NuPlayer::performSeek.Wei Jia2015-05-152-13/+10
* | Merge "MPEG4Writer: fix unintiialized member variables" into mnc-devChong Zhang2015-05-151-0/+7
|\ \
| * | MPEG4Writer: fix unintiialized member variablesChong Zhang2015-05-151-0/+7
| |/
* | Merge "Change mime for HLS timed ID3 stream to application/x-id3v4" into mnc-devRobert Shih2015-05-153-3/+3
|\ \
| * | Change mime for HLS timed ID3 stream to application/x-id3v4Robert Shih2015-05-143-3/+3
* | | Merge "stagefright: check IMemory::pointer() before using the allocation" int...Chong Zhang2015-05-151-2/+2
|\ \ \
| * | | stagefright: check IMemory::pointer() before using the allocationChong Zhang2015-05-151-2/+2
| | |/ | |/|
* | | Merge "HTTPLiveSource: fix non timed id3 track selection" into mnc-devRobert Shih2015-05-151-13/+11
|\ \ \ | |/ / |/| |
| * | HTTPLiveSource: fix non timed id3 track selectionRobert Shih2015-05-151-13/+11
| |/
* | Merge "stagefright: prevent more crashes in ACodec" into mnc-devLajos Molnar2015-05-141-164/+299
|\ \
| * | stagefright: prevent more crashes in ACodecLajos Molnar2015-05-131-164/+299
* | | Merge "stagefright: Prevent crashes in ACodec - part 1" into mnc-devJinsuk Kim2015-05-131-136/+219
|\ \ \ | |/ /
| * | stagefright: Prevent crashes in ACodec - part 1Jinsuk Kim2015-05-131-136/+219
* | | Merge "stagefright: rename usePersistentInputSurface to setInputSurface" into...Chong Zhang2015-05-1316-52/+49
|\ \ \ | |/ / |/| |
| * | stagefright: rename usePersistentInputSurface to setInputSurfaceChong Zhang2015-05-1316-52/+49
* | | Merge "libmediaplayerservice: unlock before trying to reclaim drm session." i...Ronghua Wu2015-05-131-0/+11
|\ \ \
| * | | libmediaplayerservice: unlock before trying to reclaim drm session.Ronghua Wu2015-05-131-0/+11
* | | | am 0eb7c793: am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0:...Lajos Molnar2015-05-132-6/+87
|\ \ \ \
| * \ \ \ am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add A...Lajos Molnar2015-05-122-6/+87
| |\ \ \ \
| | * \ \ \ am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use it to detect ...Lajos Molnar2015-05-122-6/+87
| | |\ \ \ \
| | | * \ \ \ am 438217a0: Merge "Add AUtils::isInRange, and use it to detect malformed MPE...Lajos Molnar2015-05-122-6/+87
| | | |\ \ \ \
| | | | * \ \ \ Merge "Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes"...Lajos Molnar2015-05-122-6/+87
| | | | |\ \ \ \
| | | | | * | | | Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizesLajos Molnar2015-04-242-6/+87
* | | | | | | | | Merge "MediaSync: support changing surface on the fly." into mnc-devWei Jia2015-05-121-13/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | MediaSync: support changing surface on the fly.Wei Jia2015-05-111-13/+57
* | | | | | | | | | Merge "Fix new[] vs delete mismatch." into mnc-devEvgenii Stepanov2015-05-121-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix new[] vs delete mismatch.Evgenii Stepanov2015-05-121-1/+1
* | | | | | | | | | | mediaplayer: get/set PlaybackRate only when AudioSink has been opened.Wei Jia2015-05-121-3/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge "HLS: invoke signalEOS on ATSParser to flush out final samples" into mn...Robert Shih2015-05-113-0/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | HLS: invoke signalEOS on ATSParser to flush out final samplesRobert Shih2015-05-113-0/+13
* | | | | | | | | | stagefright: fix legacy-adaptive experimentLajos Molnar2015-05-081-34/+35
* | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |