summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 7ebc1670: am 8975220e: Merge "Fix for Bundled Effects level compensation" ...Ricardo Garcia2014-12-162-104/+144
|\
| * Merge "Fix for Bundled Effects level compensation" into lmp-mr1-devRicardo Garcia2014-12-162-104/+144
| |\
| | * Fix for Bundled Effects level compensationRicardo Garcia2014-12-092-104/+144
* | | am 42818cca: am 9f932418: Merge "Fix for apps that forget to use widevine:// ...Jeff Tinker2014-12-151-0/+8
|\ \ \ | |/ /
| * | Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-devJeff Tinker2014-12-151-0/+8
| |\ \
| | * | Fix for apps that forget to use widevine:// urlsJeff Tinker2014-12-151-0/+8
* | | | 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-152-2/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is no...Wei Jia2014-12-152-2/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | NuPlayer: send NOT_SEEKABLE media info to client when the source is not seeka...Wei Jia2014-12-122-2/+6
* | | | | 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
| |/ / /
* | | | 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
* | | | | 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 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
* | | | | 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 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 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 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-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 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 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
| | | |/ / / / | | |/| | | |
generated by cgit v1.1 at 2024-04-28 20:15:12 +0000