summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge "Fix audioloop test program"Andy Hung2014-05-061-62/+108
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | / / / / / | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix audioloop test programAndy Hung2014-05-051-62/+108
* | | | | | | | | | | Merge "Don't build libmediandk for PDK"Marco Nelissen2014-05-051-1/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't build libmediandk for PDKMarco Nelissen2014-05-051-1/+5
* | | | | | | | | | | | Merge "WIP: MediaCodec and friends NDK APIs, plain C version"Marco Nelissen2014-05-058-0/+1066
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | WIP: MediaCodec and friends NDK APIs, plain C versionMarco Nelissen2014-05-058-0/+1066
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Use audio_is_linear_pcm()"Glenn Kasten2014-05-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use audio_is_linear_pcm()Glenn Kasten2014-05-021-2/+2
* | | | | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-054-15/+192
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-024-15/+192
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "NULL check in ConnectPro"Natalie Silvanovich2014-05-051-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | NULL check in ConnectProNatalie Silvanovich2014-05-051-0/+5
* | | | | | | | | | | Merge "Revert "camera3: Update CameraMetadata vendor tag handling.""Ruben Brunk2014-05-034-191/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-034-191/+14
* | | | | | | | | | | | Merge "camera3: Update CameraMetadata vendor tag handling."Ruben Brunk2014-05-024-14/+191
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | camera3: Update CameraMetadata vendor tag handling.Ruben Brunk2014-05-024-14/+191
* | | | | | | | | | | | Merge "Fix bug for direct track with PCM != 16-bit"Glenn Kasten2014-05-022-5/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix bug for direct track with PCM != 16-bitGlenn Kasten2014-05-022-5/+4
| | |_|/ / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge "Camera3: Don't notifyError for non-fatal errors"Zhijun He2014-05-021-3/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Camera3: Don't notifyError for non-fatal errorsZhijun He2014-05-011-3/+0
* | | | | | | | | | | | | am 63249d6e: am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queu...Lajos Molnar2014-05-021-7/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am bc4bf532: am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | am b2314088: Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Merge "AwesomePlayer: use PTS for queueBuffer"Lajos Molnar2014-05-021-7/+10
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | AwesomePlayer: use PTS for queueBufferLajos Molnar2014-05-011-7/+10
* | | | | | | | | | | | | | am 113f2122: am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am b52675e9: Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge "Smooth out AwesomePlayer"Lajos Molnar2014-05-022-4/+25
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | Smooth out AwesomePlayerLajos Molnar2014-05-012-4/+25
* | | | | | | | | | | | | | am 9e0922ba: am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduli...Lajos Molnar2014-05-021-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 6e76fda3: am f9782266: Merge "AwesomePlayer: improve scheduling of video e...Lajos Molnar2014-05-021-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | am f9782266: Merge "AwesomePlayer: improve scheduling of video event to hit PTS"Lajos Molnar2014-05-021-3/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | Merge "AwesomePlayer: improve scheduling of video event to hit PTS"Lajos Molnar2014-05-021-3/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | AwesomePlayer: improve scheduling of video event to hit PTSLajos Molnar2014-05-011-3/+7
* | | | | | | | | | | | | | am edf6131d: am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator...Lajos Molnar2014-05-023-0/+288
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | / / / / / / / / | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | am 075c8f6e: am a69d6f52: Merge "stagefright: add ClockEstimator API and Wind...Lajos Molnar2014-05-023-0/+288
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am a69d6f52: Merge "stagefright: add ClockEstimator API and WindowedLinearFit...Lajos Molnar2014-05-023-0/+288
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge "stagefright: add ClockEstimator API and WindowedLinearFitEstimator"Lajos Molnar2014-05-023-0/+288
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | stagefright: add ClockEstimator API and WindowedLinearFitEstimatorLajos Molnar2014-05-013-0/+288
* | | | | | | | | | | | | resolved conflicts for merge of 47c888a9 to masterGlenn Kasten2014-05-027-39/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am e580aa4a: am 86438382: Merge "When passing a size_t via binder, use 64-bit...Glenn Kasten2014-05-027-35/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am 86438382: Merge "When passing a size_t via binder, use 64-bits uncondition...Glenn Kasten2014-05-027-35/+35
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge "When passing a size_t via binder, use 64-bits unconditionally"Glenn Kasten2014-05-027-35/+35
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | | * | | | | | | | | When passing a size_t via binder, use 64-bits unconditionallyGlenn Kasten2014-02-137-35/+35
* | | | | | | | | | | | | Merge "Use AUDIO_INTERLEAVE_* constants"Glenn Kasten2014-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Use AUDIO_INTERLEAVE_* constantsGlenn Kasten2014-04-301-1/+1
* | | | | | | | | | | | | | am f38e1908: am 3d9164da: am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 3d9164da: am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am 236f8ddd: Merge "Add missing include"Glenn Kasten2014-05-011-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |