summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | am fc93499e: Merge "mediarecorder: set level if setting default profile" into...Lajos Molnar2014-10-022-0/+58
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "mediarecorder: set level if setting default profile" into lmp-devLajos Molnar2014-10-022-0/+58
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | mediarecorder: set level if setting default profileLajos Molnar2014-10-022-0/+58
| * | | | | | | | | | | am 6eff943c: Merge "NuPlayerDecoder: postpone input message processing when i...Wei Jia2014-10-022-8/+31
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "NuPlayerDecoder: postpone input message processing when it's not deque...Wei Jia2014-10-022-8/+31
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | NuPlayerDecoder: postpone input message processing when it's not dequeued.Wei Jia2014-10-022-8/+31
| * | | | | | | | | | | | resolved conflicts for merge of 8b76b592 to lmp-dev-plus-aospLajos Molnar2014-10-023-31/+130
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge "stagefright: move math templates into AUtils.h" into lmp-devLajos Molnar2014-10-023-35/+142
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| / / / / / / / / | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | stagefright: move math templates into AUtils.hLajos Molnar2014-10-013-35/+142
| * | | | | | | | | | | resolved conflicts for merge of c51e512a to lmp-dev-plus-aospChih-Hung Hsieh2014-10-022-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am c8871d2c: Merge "Fix struct vs. class mismatches"Chih-hung Hsieh2014-10-023-3/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| * | | | | | | | | | | am d8b03abf: Merge "NuPlayer: Fix flush mode decoder error handling" into lmp...Andy Hung2014-10-026-28/+103
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge "NuPlayer: Fix flush mode decoder error handling" into lmp-devAndy Hung2014-10-026-28/+103
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | NuPlayer: Fix flush mode decoder error handlingAndy Hung2014-10-016-28/+103
| | | | |_|/ / / / / / | | | |/| | | | | | |
| * | | | | | | | | | am f916667a: Merge "camera2: Force DNG previews to render with LSC map." into...Ruben Brunk2014-10-021-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "camera2: Force DNG previews to render with LSC map." into lmp-devRuben Brunk2014-10-021-1/+3
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | camera2: Force DNG previews to render with LSC map.Ruben Brunk2014-10-011-1/+3
| | | |/ / / / / / / /
| * | | | | | | | | | am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter enable" into...Chong Zhang2014-10-012-2/+14
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "add AAC audio decoder params for PCM limiter enable" into lmp-devChong Zhang2014-10-012-2/+14
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | add AAC audio decoder params for PCM limiter enableChong Zhang2014-10-012-2/+14
| * | | | | | | | | | | am 3af67d03: Merge "GenericSource: support disconnect before NuCachedSource2 ...Robert Shih2014-10-013-9/+43
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "GenericSource: support disconnect before NuCachedSource2 is created" i...Robert Shih2014-10-013-9/+43
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | GenericSource: support disconnect before NuCachedSource2 is createdRobert Shih2014-10-013-9/+43
| | | | |/ / / / / / / / | | | |/| | | | | | | |
| * | | | | | | | | | | am 1f4b162e: Merge "NuCachedSource2: fix disconnect process" into lmp-devRobert Shih2014-10-011-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge "NuCachedSource2: fix disconnect process" into lmp-devRobert Shih2014-10-011-0/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | NuCachedSource2: fix disconnect processRobert Shih2014-09-301-0/+8
| | | |/ / / / / / / /
| * | | | | | | | | | am c06cf18e: Merge "Check if info for uri is available" into lmp-devMarco Nelissen2014-09-301-0/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Check if info for uri is available" into lmp-devMarco Nelissen2014-09-301-0/+4
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Check if info for uri is availableMarco Nelissen2014-09-301-0/+4
| * | | | | | | | | | | am 91228597: am 95fd067c: Merge "Fix linkage when building with clang, Intel ...Chih-hung Hsieh2014-09-301-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am 95fd067c: Merge "Fix linkage when building with clang, Intel CC or gcc -O0"Chih-hung Hsieh2014-09-301-0/+4
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ am 8f230382: Merge "Fix a namespace collision."Dan Albert2014-09-221-5/+5
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ am 14fc930d: Merge "Clean up redundant links to stlport."Dan Albert2014-09-122-2/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ am 41b9ef26: Merge "mediaplayer: make frame-accurate avsync configurable" int...Lajos Molnar2014-09-301-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | mediaplayer: make frame-accurate avsync configurableLajos Molnar2014-09-291-0/+20
| | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | am 504de531: Merge "audio: fix stream type for accessibility usage" into lmp-devEric Laurent2014-09-263-2/+36
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "audio: fix stream type for accessibility usage" into lmp-devEric Laurent2014-09-263-2/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | audio: fix stream type for accessibility usageEric Laurent2014-09-253-2/+36
| * | | | | | | | | | | | | am 0ed72488: Merge "NuPlayer: use format obtained from source to tell if vide...Wei Jia2014-09-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "NuPlayer: use format obtained from source to tell if video exists." in...Wei Jia2014-09-261-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | NuPlayer: use format obtained from source to tell if video exists.Wei Jia2014-09-251-1/+1
| * | | | | | | | | | | | | | am ea55da94: Merge "Fix SoftAAC2 flush" into lmp-devMarco Nelissen2014-09-251-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Fix SoftAAC2 flushMarco Nelissen2014-09-251-4/+8
| | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | am c0d17e34: Merge "NuPlayer: Fix decoder error handling" into lmp-devAndy Hung2014-09-253-15/+40
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "NuPlayer: Fix decoder error handling" into lmp-devAndy Hung2014-09-253-15/+40
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | NuPlayer: Fix decoder error handlingAndy Hung2014-09-243-15/+40
| | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | |
| * | | | | | | | | | | | | am 9a70c2c4: Merge "Fix Widevine classic playback errors with NuPlayer" into ...Lajos Molnar2014-09-251-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge "Fix Widevine classic playback errors with NuPlayer" into lmp-devLajos Molnar2014-09-251-1/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Fix Widevine classic playback errors with NuPlayerJeff Tinker2014-09-241-1/+8
| * | | | | | | | | | | | | am a935c76f: stagefright: Advertise 16x16 alignment requirement for PV codecsLajos Molnar2014-09-251-6/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /