summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* PlaylistFetcher: check ts program streams before disabling a/vRobert Shih2014-11-123-6/+32
* Merge "libstagefright: set actual stride info for SW encoder input port" into...Lajos Molnar2014-10-284-1/+17
|\
| * libstagefright: set actual stride info for SW encoder input portLajos Molnar2014-10-254-1/+17
* | do not hold mNotifyLock when calling MediaPlayer::notifyChong Zhang2014-10-272-3/+12
* | audio policy: fix multiple device volumeEric Laurent2014-10-271-2/+8
|/
* am 0f8f4e68: [FM] Fix FM App record fail Buganizer ID: 17975676Hochi Huang2014-10-241-2/+2
|\
| * [FM] Fix FM App record fail Buganizer ID: 17975676Hochi Huang2014-10-241-2/+2
* | am 511ae054: am f256901b: Merge "64 bit fixes for NdkMediaExtractor" into lmp...Marco Nelissen2014-10-231-11/+16
|\ \ | |/
| * am f256901b: Merge "64 bit fixes for NdkMediaExtractor" into lmp-devMarco Nelissen2014-10-231-11/+16
| |\
| | * Merge "64 bit fixes for NdkMediaExtractor" into lmp-devMarco Nelissen2014-10-231-11/+16
| | |\
| | | * 64 bit fixes for NdkMediaExtractorMarco Nelissen2014-10-231-11/+16
* | | | am 4d8ae211: am 661c21da: CameraService: Disconnect: Release mutex while wait...Eino-Ville Talvala2014-10-231-6/+14
|\ \ \ \ | |/ / /
| * | | am 661c21da: CameraService: Disconnect: Release mutex while waiting for joins.Eino-Ville Talvala2014-10-231-6/+14
| |\ \ \ | | |/ /
| | * | CameraService: Disconnect: Release mutex while waiting for joins.Eino-Ville Talvala2014-10-221-6/+14
| | |/
* | | Merge "stagefright: return failure on malformed TS streams" into lmp-mr1-devChong Zhang2014-10-231-9/+23
|\ \ \
| * | | stagefright: return failure on malformed TS streamsDavid Yeh2014-10-211-9/+23
* | | | am 2f368e57: Merge branch \'lmp-sprout-dev\' of https://googleplex-android.go...Chong Zhang2014-10-220-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'lmp-sprout-dev' of https://googleplex-android.googlesource.com/...Chong Zhang2014-10-220-0/+0
| |\ \ \
* | \ \ \ am 3873c920: am 168799c3: Merge "release camera without holding CameraSource ...Chong Zhang2014-10-220-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 168799c3: Merge "release camera without holding CameraSource mutex" into l...Chong Zhang2014-10-221-41/+58
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | am c3ddddbd: Merge "release camera without holding CameraSource mutex" into l...Chong Zhang2014-10-221-41/+58
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "release camera without holding CameraSource mutex" into lmp-devChong Zhang2014-10-221-41/+58
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge "release camera without holding CameraSource mutex" into lmp-devChong Zhang2014-10-221-41/+58
| | |\ \ | | | |/
| | | * release camera without holding CameraSource mutexChong Zhang2014-10-211-41/+58
| | | * merge in lmp-release history after reset to e9234f17dfbb192c96b122b9e0ce8cd90...The Android Automerger2014-10-190-0/+0
| | | |\
| | | | * move audio sink open/close to NuPlayerRendererChong Zhang2014-10-174-123/+223
| | | | * Fix freed memory referencesMarco Nelissen2014-10-161-3/+8
| | | | * merge in lmp-release history after reset to a2d4a6dac432f0c4f543d79b9a63c55ae...The Android Automerger2014-10-160-0/+0
| | | | |\
| | | | | * merge in lmp-release history after reset to 9d2189ffcf1142b2948ce3065c32521ed...The Android Automerger2014-10-150-0/+0
| | | | | |\
| | | | | | * merge in lmp-release history after reset to 447898bca790fae2fdae304073162e980...The Android Automerger2014-10-140-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-release history after reset to 380757ba5c927015d403e3b97cc418413...The Android Automerger2014-10-130-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-release history after reset to 9286354c0a864ce2348cc7dfc6ca81e84...The Android Automerger2014-10-120-0/+0
| | | | | | | | |\
| | | | | | | | | * audio policy: move intializations to onFirstRef()Eric Laurent2014-10-102-0/+7
| | | | | | | | | * Fix VideoFrame class layout for 64/32 bitMarco Nelissen2014-10-091-1/+4
| | | | | | | | | * merge in lmp-release history after reset to ce26e9d13da7a4a4443b9be775bb12fb3...The Android Automerger2014-10-090-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in lmp-release history after reset to ce26e9d13da7a4a4443b9be775bb12fb3...The Android Automerger2014-10-080-0/+0
| | | | | | | | | | |\ | | | | | | | | | |/ /
| | | | | | | | | | * NuPlayer: wait for renderer flush before decoder shutdownAndy Hung2014-10-073-52/+64
| | | | | | | | | | * merge in lmp-release history after reset to 584c14c370f141685b7e8963a13ed9158...The Android Automerger2014-10-070-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-release history after reset to f0011d49c0f08753dc2dc254c5a70885a...The Android Automerger2014-10-060-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in lmp-release history after reset to f0011d49c0f08753dc2dc254c5a70885a...The Android Automerger2014-10-050-0/+0
| | | | | | | | | | | | |\ | | | | | | | | | | | |/ /
| | | | | | | | | | | | * Fix uncertainty of one normal mix buffer in AudioTrack::getTimestampGlenn Kasten2014-10-033-2/+29
| | | | | | | | | | | | * send available codec buffer count with codec notificationChong Zhang2014-10-032-6/+27
| | | | | | | | | | | | * mediarecorder: set level if setting default profileLajos Molnar2014-10-023-2/+66
| | | | | | | | | | | | * stagefright: move math templates into AUtils.hLajos Molnar2014-10-024-35/+207
| | | | | | | | | | | | * NuPlayer: Fix flush mode decoder error handlingAndy Hung2014-10-026-28/+103
| | | | | | | | | | | | * merge in lmp-release history after reset to lmp-devThe Android Automerger2014-10-020-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * Revert "Fix uncertainty of one normal mix buffer in AudioTrack::getTimestamp"Glenn Kasten2014-10-013-23/+1
| | | | | | | | | | | | | * GenericSource: support disconnect before NuCachedSource2 is createdRobert Shih2014-10-014-10/+48
| | | | | | | | | | | | | * merge in lmp-release history after reset to 1f4b162e0bee6bcb0c9de464087db2862...The Android Automerger2014-10-010-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * mediaplayer: make frame-accurate avsync configurableLajos Molnar2014-09-301-0/+20