summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* am 8564e13b: resolved conflicts for merge of 2efb9566 to lmp-mr1-dev-plus-aospNarayan Kamath2014-12-297-14/+71
|\
| * resolved conflicts for merge of 2efb9566 to lmp-mr1-dev-plus-aospNarayan Kamath2014-12-297-14/+71
| |\
| | * HLS: QCom enhancementsRobert Shih2014-12-227-14/+71
* | | Add log tag to FileSourceMarco Nelissen2014-12-221-0/+4
* | | Merge "Replace MidiFile player with a Midi extractor"Marco Nelissen2014-12-227-60/+427
|\ \ \
| * | | Replace MidiFile player with a Midi extractorMarco Nelissen2014-12-187-60/+427
* | | | am a07593a1: am c9330d9a: am 89ee55cb: Merge "OggExtractor: ignore timestamp ...Robert Shih2014-12-191-10/+8
|\ \ \ \ | | |/ / | |/| |
| * | | am c9330d9a: am 89ee55cb: Merge "OggExtractor: ignore timestamp calculation f...Robert Shih2014-12-191-10/+8
| |\ \ \ | | | |/ | | |/|
| | * | Merge "OggExtractor: ignore timestamp calculation for configuration packets" ...Robert Shih2014-12-191-10/+8
| | |\ \
| | | * | OggExtractor: ignore timestamp calculation for configuration packetsRobert Shih2014-12-181-10/+8
* | | | | am fd923e98: am 9dcc312a: am 1391f933: MPEG4Extractor: null check in MPEG4Sou...Robert Shih2014-12-191-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | am 9dcc312a: am 1391f933: MPEG4Extractor: null check in MPEG4Source::parseChunkRobert Shih2014-12-191-0/+3
| |\ \ \ \ | | |/ / /
| | * | | MPEG4Extractor: null check in MPEG4Source::parseChunkRobert Shih2014-12-171-0/+3
| | |/ /
* | | | am af86e017: am 1c2e3113: am 6f3b732b: Merge "Fix wrong int argument of FOURCC."Chih-Hung Hsieh2014-12-181-4/+4
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am 1c2e3113: am 6f3b732b: Merge "Fix wrong int argument of FOURCC."Chih-Hung Hsieh2014-12-181-4/+4
| |\ \
| | * | Fix wrong int argument of FOURCC.Chih-Hung Hsieh2014-12-161-4/+4
| | * | Fix AAC recording issueMarco Nelissen2014-12-101-1/+2
* | | | am 3feb7bd0: am 5c82407e: am 184e63ff: Merge "ESQueue: change warning message...Wei Jia2014-12-161-1/+1
|\ \ \ \ | |/ / /
| * | | am 5c82407e: am 184e63ff: Merge "ESQueue: change warning message of one buffe...Wei Jia2014-12-161-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Merge "ESQueue: change warning message of one buffer containing multiple ADTS...Wei Jia2014-12-161-1/+1
| | |\ \
| | | * | ESQueue: change warning message of one buffer containing multiple ADTS frames...Wei Jia2014-12-161-1/+1
* | | | | Merge "Use callbacks for Midi I/O"Marco Nelissen2014-12-161-6/+3
|\ \ \ \ \
| * | | | | Use callbacks for Midi I/OMarco Nelissen2014-12-161-6/+3
* | | | | | am d7aa535f: am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder d...Lajos Molnar2014-12-151-1/+12
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder death" into lm...Lajos Molnar2014-12-151-1/+12
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "MediaCodecList: handle binder death" into lmp-mr1-devLajos Molnar2014-12-151-1/+12
| | |\ \ \ \
| | | * | | | MediaCodecList: handle binder deathLajos Molnar2014-12-121-1/+12
| | | | |/ / | | | |/| |
* | | | | | am dc039672: am a0b3a0a4: am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE med...Wei Jia2014-12-151-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a0b3a0a4: am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE media info to cl...Wei Jia2014-12-151-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is no...Wei Jia2014-12-151-2/+2
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | NuPlayer: send NOT_SEEKABLE media info to client when the source is not seeka...Wei Jia2014-12-121-2/+2
* | | | | | am 690257fe: am aff13ad4: am 8ddb0223: Merge "Tunneled video Playback/Max res...Rachad2014-12-151-1/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am aff13ad4: am 8ddb0223: Merge "Tunneled video Playback/Max resolution: Call...Rachad2014-12-131-1/+15
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Tunneled video Playback/Max resolution: Call mOmx->prepareForAdaptiveP...Rachad2014-12-131-1/+15
| | |\ \ \ \
| | | * | | | Tunneled video Playback/Max resolution:Rachad2014-12-121-1/+15
* | | | | | | am 1896bbb7: am d4c0fef8: am 554016a3: Merge "stagefright: advertise 8kHz AAC...Lajos Molnar2014-12-151-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | |
| * | | | | am d4c0fef8: am 554016a3: Merge "stagefright: advertise 8kHz AAC decoder supp...Lajos Molnar2014-12-131-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | stagefright: advertise 8kHz AAC decoder supportLajos Molnar2014-12-131-1/+2
| | |/ / /
* | | | | am 3e08ca67: resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-1118-997/+595
|\ \ \ \ \ | |/ / / /
| * | | | resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-1118-997/+595
| |\ \ \ \ | | |/ / /
| | * | | stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-1018-997/+594
| | * | | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-12-092-3/+3
* | | | | am c948a971: am c15a72f6: am 1914e7ed: Merge "Fix print format mismatches."Chih-Hung Hsieh2014-12-102-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | am c15a72f6: am 1914e7ed: Merge "Fix print format mismatches."Chih-Hung Hsieh2014-12-102-3/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix print format mismatches.Chih-Hung Hsieh2014-12-092-3/+3
* | | | | Remove filename based writer constructorsMarco Nelissen2014-12-107-118/+5
* | | | | am be6a91d9: am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into l...Marco Nelissen2014-12-091-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fix AAC recording issueMarco Nelissen2014-12-091-1/+2