summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* Merge "MPEG4Writer: use "mp42" as major/minor brand in ftyp box."Robert Shih2014-02-031-3/+6
|\
| * MPEG4Writer: use "mp42" as major/minor brand in ftyp box.Robert Shih2014-01-301-3/+6
* | Merge "Added support to query ACodec whether adaptive playback is enabled."Robert Shih2014-02-031-0/+5
|\ \
| * | Added support to query ACodec whether adaptive playback is enabled.Robert Shih2014-01-291-0/+5
* | | Merge "Fixed misplaced bracket for switch-case block."Robert Shih2014-02-031-4/+4
|\ \ \ | |/ /
| * | Fixed misplaced bracket for switch-case block.Robert Shih2014-01-241-4/+4
* | | am 324d9157: am 5db1e3a6: Merge "correct one logic error in decide whether sh...Lajos Molnar2014-02-032-2/+2
|\ \ \
| * \ \ am 5db1e3a6: Merge "correct one logic error in decide whether should render o...Lajos Molnar2014-02-032-2/+2
| |\ \ \
| | * | | correct one logic error in decide whether should render or notJianzheng Zhou2014-02-032-2/+2
| * | | | Merge "Support for MPEG2 video" into klp-modular-devDongwon Kang2014-01-292-0/+4
| |\ \ \ \
| | * | | | Support for MPEG2 videoChangwan Ryu2014-01-212-0/+4
* | | | | | Cap pts gap between adjacent frames to specified valueChong Zhang2014-01-304-6/+167
* | | | | | save mGraphicBuffer pointer even when we're suspendedChong Zhang2014-01-281-0/+6
| |_|_|_|/ |/| | | |
* | | | | am 1ae4b6ce: am fe6db33a: am 4ef1dc2d: Merge "Only increase the counter when ...Eric Laurent2014-01-271-5/+7
|\ \ \ \ \ | |/ / / /
| * | | | am 4ef1dc2d: Merge "Only increase the counter when we do take a wakelock"Eric Laurent2014-01-271-5/+7
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Only increase the counter when we do take a wakelockJimmy Dalqvist2014-01-221-5/+7
* | | | am 6146f60c: am 319c5640: am 07a017d3: Merge "Added support for ID3v2 meta da...Marco Nelissen2014-01-175-9/+89
|\ \ \ \ | |/ / /
| * | | am 07a017d3: Merge "Added support for ID3v2 meta data in 3gp files"Marco Nelissen2014-01-175-9/+89
| |\ \ \ | | |/ /
| | * | Added support for ID3v2 meta data in 3gp filesOscar Rydhé2014-01-165-9/+89
* | | | Merge "AudioRecord::getInputFramesLost() cleanup"Glenn Kasten2014-01-171-1/+1
|\ \ \ \
| * | | | AudioRecord::getInputFramesLost() cleanupGlenn Kasten2014-01-141-1/+1
* | | | | am 07634f1f: am cbf9e91a: am 1e8a57c2: Merge "Avoid jumps to faulty position ...Marco Nelissen2014-01-151-1/+4
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 1e8a57c2: Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
| |\ \ \ | | |/ /
| | * | Merge "Avoid jumps to faulty position after seeks"Marco Nelissen2014-01-151-1/+4
| | |\ \
| | | * | Avoid jumps to faulty position after seeksRoger1 Jonsson2013-12-181-1/+4
* | | | | am 9dfe2ae1: am 586dda1d: am 5ca94d2f: Merge "HLS: Fixed rounding error with ...Marco Nelissen2014-01-091-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 5ca94d2f: Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "HLS: Fixed rounding error with decimal segment duration"Marco Nelissen2014-01-091-1/+1
| | |\ \ \
| | | * | | HLS: Fixed rounding error with decimal segment durationOscar Rydhé2013-12-191-1/+1
| | | |/ /
* | | | | Support more channel configurations in MPEG4ExtractorJean-Michel Trivi2014-01-081-1/+158
| |_|_|/ |/| | |
* | | | Update AAC decoder wrapper to latest FDK API for output channel countJean-Michel Trivi2013-12-271-2/+5
* | | | am 42d89e5d: am b904d53f: am 8115f4b2: Merge "stagefright: do not offload LD-...Eric Laurent2013-12-212-0/+14
|\ \ \ \ | |/ / /
| * | | am 8115f4b2: Merge "stagefright: do not offload LD-AAC decoding"Eric Laurent2013-12-202-0/+14
| |\ \ \ | | |/ /
| | * | stagefright: do not offload LD-AAC decodingEric Laurent2013-12-212-0/+14
* | | | am 5f7483eb: am 5a086733: am 1777ed30: Merge "stagefright: fix offloading HE-...Eric Laurent2013-12-211-17/+23
|\ \ \ \ | |/ / /
| * | | am 1777ed30: Merge "stagefright: fix offloading HE-AAC sampling rate."Eric Laurent2013-12-201-17/+23
| |\ \ \ | | |/ /
| | * | stagefright: fix offloading HE-AAC sampling rate.Eric Laurent2013-12-191-17/+23
| | |/
| * | am 274cc85d: Merge "libstagefright: Delay release of wakelock in TimedEventQu...Eric Laurent2013-12-172-6/+9
| |\ \ | | |/
| | * libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2013-12-172-6/+9
| * | am 9060d498: Merge "update offloaded audio track sampling rate"Eric Laurent2013-12-171-2/+13
| |\ \ | | |/
| | * update offloaded audio track sampling rateEric Laurent2013-12-171-2/+13
| | * Merge commit '2381f06f374ee0cb8bca0edf5388394432b00e6d' into HEADThe Android Open Source Project2013-12-0516-99/+254
| | |\
* | | | stagefright: Fix issue with tracking media format in packet sourceLajos Molnar2013-12-172-13/+44
* | | | stagefright: Fix bugs in playlist fetcher logicLajos Molnar2013-12-162-29/+105
* | | | Merge "Better character set encoding detection"Marco Nelissen2013-12-121-50/+29
|\ \ \ \
| * | | | Better character set encoding detectionMarco Nelissen2013-12-111-50/+29
* | | | | libstagefright: Delay release of wakelock in TimedEventQueueHaynes Mathew George2013-12-102-6/+9
* | | | | Revert "stagefright: fix TimedEventQueue wakelock"Eric Laurent2013-12-102-15/+8
|/ / / /
* | | | stagefright: fix TimedEventQueue wakelockEric Laurent2013-12-062-8/+15
* | | | am 616c2cf1: am 90892d1b: Merge "Fix SIGABRT when playing mp4 file"Marco Nelissen2013-11-261-0/+6
|\ \ \ \ | |/ / /