summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am e10615e7: am 6b3e1a6d: am ac90a24d: Merge "Remove obsolete TARGET_SIMULATO...Elliott Hughes2014-12-121-24/+11
|\
| * am 6b3e1a6d: am ac90a24d: Merge "Remove obsolete TARGET_SIMULATOR checks"Elliott Hughes2014-12-121-24/+11
| |\
| | * Remove obsolete TARGET_SIMULATOR checksTrevor Drake2014-12-111-24/+11
| | * Fix AAC recording issueMarco Nelissen2014-12-101-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
* | | | am b6ac4d49: am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface bef...Lajos Molnar2014-12-111-1/+1
|\ \ \ \ | |/ / /
| * | | am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface before setDataSo...Lajos Molnar2014-12-111-1/+1
| |\ \ \ | | |/ /
| | * | mediaplayer: allow setVideoSurface before setDataSourceLajos Molnar2014-12-101-1/+1
| | * | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-12-092-3/+3
* | | | am 66b17e9d: Merge commit \'f5a968a0\' into mmGlenn Kasten2014-12-102-1/+59
|\ \ \ \ | |/ / /
| * | | Merge commit 'f5a968a0' into mmGlenn Kasten2014-12-102-1/+59
| |\ \ \ | | |/ /
| | * | Merge "audio policy: binder calls for dynamic audio policy mixes" into lmp-mr...Eric Laurent2014-12-102-1/+59
| | |\ \
| | | * | audio policy: binder calls for dynamic audio policy mixesEric Laurent2014-12-092-1/+59
* | | | | am b279f5ad: am c49d9cda: am 2dda40d6: Merge "audio policy: add support for c...Eric Laurent2014-12-103-1/+125
|\ \ \ \ \ | |/ / / /
| * | | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ...Eric Laurent2014-12-103-1/+125
| |\ \ \ \ | | |/ / /
| | * | | Merge "audio policy: add support for custom mixes" into lmp-mr1-devEric Laurent2014-12-103-1/+125
| | |\ \ \ | | | |/ /
| | | * | audio policy: add support for custom mixesEric Laurent2014-12-093-1/+125
* | | | | am a2bc118c: am 2a0f484e: am a04c05ab: Merge "Truncate file before recording ...Marco Nelissen2014-12-101-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | am 2a0f484e: am a04c05ab: Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
| | |\ \ \
| | | * | | Truncate file before recording into it.Marco Nelissen2014-12-101-0/+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-1013-183/+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
* | | | | | am 33cc5c91: am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 m...Lajos Molnar2014-12-0937-98/+98
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
| | |\ \ \ \
| | | * | | | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-2737-98/+98
* | | | | | | am 853bc5a2: am f3c25346: am 66172f5c: Merge "Cast int64_t values to long lon...Lajos Molnar2014-12-091-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 08fa30dc: am 5abc1201: am 3cc93734: Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 5abc1201: am 3cc93734: Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
| | |\ \ \ \ \ \
| | | * | | | | | Fix build with clangBernhard Rosenkränzer2014-12-081-2/+1
| | | |/ / / / /
| | * | | | | | Merge "Prevent ANR when AudioTrack is paused or re-routed"Glenn Kasten2014-12-091-0/+2
| | |\ \ \ \ \ \
| | | * | | | | | Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-081-0/+2
| | | | |/ / / / | | | |/| | | |
* | | | | | | | am 80ddb730: am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-092-4/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 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 9574b644: am c1b0d49c: am 82a69ea8: Prevent ANR when AudioTrack is paused ...zunkyu.lee2014-12-091-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am c1b0d49c: am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-091-0/+2
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |