summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* am bef17542: am 5c97c4e1: Merge "Remove hardcoded ICU & OpenSSL include paths."Narayan Kamath2015-01-051-3/+0
|\
| * Remove hardcoded ICU & OpenSSL include paths.Narayan Kamath2015-01-051-3/+0
* | 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
* | | 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 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 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 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
* | | | 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 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 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 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
| |/ / /
* | | | 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 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
* | | | 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
* | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0936-97/+97
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0936-97/+97
| |\ \ \
| | * | | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-2736-97/+97
* | | | | am f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
| |\ \ \ \
| | * | | | Cast int64_t values to long long before print.Bernhard Rosenkränzer2014-12-041-2/+2
* | | | | | am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-092-4/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Stagefright: Fix unused variablesAndreas Gampe2014-12-042-4/+1
| |/ / / /
* | | | | am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags on...Lajos Molnar2014-12-081-2/+5
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | stagefright: preserve output format flags on format changeLajos Molnar2014-12-051-2/+5
| | |_|/ | |/| |
* | | | am 25bad49c: am 852dc963: Merge "avc_util: try to find the first start code p...Wei Jia2014-12-082-17/+15
|\ \ \ \ | |/ / /
| * | | Merge "avc_util: try to find the first start code prefix 0x000001 even though...Wei Jia2014-12-052-17/+15
| |\ \ \
| | * | | avc_util: try to find the first start code prefix 0x000001 even though there ...Wei Jia2014-12-042-17/+15
* | | | | am 7f099ffd: am 8790740d: media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-081-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | media_codecs.xml: extend vorbis sample rate to 8-96kHzLajos Molnar2014-12-041-1/+1
| |/ / /
* | | | am 848b4c67: am 814cbb4e: Merge "ESQueue: add frame length checking in valida...Wei Jia2014-12-051-4/+19
|\ \ \ \ | |/ / /