summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | am 17580294: am 8b0b1f77: (-s ours) am 31703583: (-s ours) Merge "DO NOT MERG...Dan Stoza2015-04-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | am 8b0b1f77: (-s ours) am 31703583: (-s ours) Merge "DO NOT MERGE libstagefri...Dan Stoza2015-04-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | * | | | | | | | | am 31703583: (-s ours) Merge "DO NOT MERGE libstagefright: Stop using IGBC::B...Dan Stoza2015-04-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| | | | * | | | | | | | Merge "DO NOT MERGE libstagefright: Stop using IGBC::BufferItem"Dan Stoza2015-04-013-11/+13
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | DO NOT MERGE libstagefright: Stop using IGBC::BufferItemDan Stoza2015-04-013-11/+13
* | | | | | | | | | | | | am 2c0e26fe: (-s ours) am 1eedd9ae: am b4c7472f: (-s ours) am e7988c6c: (-s o...Dan Stoza2015-04-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 1eedd9ae: am b4c7472f: (-s ours) am e7988c6c: (-s ours) Merge "DO NOT MERG...Dan Stoza2015-04-010-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am b4c7472f: (-s ours) am e7988c6c: (-s ours) Merge "DO NOT MERGE libcamerase...Dan Stoza2015-04-010-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am e7988c6c: (-s ours) Merge "DO NOT MERGE libcameraservice: Stop using IGBC:...Dan Stoza2015-04-010-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | Merge "DO NOT MERGE libcameraservice: Stop using IGBC::BufferItem"Dan Stoza2015-04-019-16/+15
| | | | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | _ / / / / / / / | | | | | / / / / / / /
| | | | * | | | | | | | DO NOT MERGE libcameraservice: Stop using IGBC::BufferItemDan Stoza2015-04-019-16/+15
| | | |/ / / / / / / /
* | | | | | | | | | | Merge "audio flinger: fix standby on output with HW A/V sync"Eric Laurent2015-04-012-2/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | audio flinger: fix standby on output with HW A/V syncEric Laurent2015-04-012-2/+13
* | | | | | | | | | | | Merge "mediaplayer: ensure secure decoders are instantiated before starting s...Chong Zhang2015-04-015-14/+111
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | mediaplayer: ensure secure decoders are instantiated before starting sourceLajos Molnar2015-04-015-14/+111
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Revert "mediaplayer: ensure secure decoders are instantiated before starting ...Bart Sears2015-04-015-111/+14
* | | | | | | | | | | am 8f46a007: am 6bedacad: am d513b7da: am 31878abb: am 68fca636: mediaplayer:...Lajos Molnar2015-04-015-14/+111
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 6bedacad: am d513b7da: am 31878abb: am 68fca636: mediaplayer: ensure secur...Lajos Molnar2015-04-015-14/+111
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | am d513b7da: am 31878abb: am 68fca636: mediaplayer: ensure secure decoders ar...Lajos Molnar2015-04-015-14/+111
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ am 31878abb: am 68fca636: mediaplayer: ensure secure decoders are instantiate...Lajos Molnar2015-04-015-14/+111
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ am 68fca636: mediaplayer: ensure secure decoders are instantiated before star...Lajos Molnar2015-04-015-14/+111
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | mediaplayer: ensure secure decoders are instantiated before starting sourceLajos Molnar2015-03-315-14/+111
* | | | | | | | | | | | | | Merge "Reject sample rate changes for fast tracks"Andy Hung2015-04-011-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Reject sample rate changes for fast tracksAndy Hung2015-03-311-3/+7
* | | | | | | | | | | | | | Merge "camera2: Enforce client eviction on user switch."Ruben Brunk2015-03-314-19/+168
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | camera2: Enforce client eviction on user switch.Ruben Brunk2015-03-314-19/+168
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "Do CRC check for MPEG2TS PSI sections"Jinsuk Kim2015-03-311-1/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Do CRC check for MPEG2TS PSI sectionsJinsuk Kim2015-03-311-1/+112
* | | | | | | | | | | | | | | Merge "Camera: iterate through all encoders for finding max video size"Yin-Chia Yeh2015-03-311-6/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Camera: iterate through all encoders for finding max video sizeYin-Chia Yeh2015-03-311-6/+20
* | | | | | | | | | | | | | | | am fadd74c3: (-s ours) am 5132e9ce: am 81e776d0: am 2a2642d8: am 42431438: DO...Eric Laurent2015-03-310-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | / / / / / / / / / / / | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 5132e9ce: am 81e776d0: am 2a2642d8: am 42431438: DO NOT MERGE - audio poli...Eric Laurent2015-03-311-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | am 81e776d0: am 2a2642d8: am 42431438: DO NOT MERGE - audio policy: fix Devic...Eric Laurent2015-03-311-2/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | am 2a2642d8: am 42431438: DO NOT MERGE - audio policy: fix DeviceVector::getD...Eric Laurent2015-03-311-2/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | am 42431438: DO NOT MERGE - audio policy: fix DeviceVector::getDevicesFromType()Eric Laurent2015-03-311-2/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | DO NOT MERGE - audio policy: fix DeviceVector::getDevicesFromType()Eric Laurent2015-03-311-2/+6
| | | | | | |_|_|_|_|_|/ / / | | | | | |/| | | | | | | |
* | | | | | | | | | | | | | Merge "audio policy: fix IOProfile::isCompatibleProfile()"Eric Laurent2015-03-302-3/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | audio policy: fix IOProfile::isCompatibleProfile()Eric Laurent2015-03-302-3/+11
* | | | | | | | | | | | | | | fix build break in clangChong Zhang2015-03-302-15/+26
| |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "audio policy: fix DeviceVector::getDevicesFromType()"Eric Laurent2015-03-301-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | audio policy: fix DeviceVector::getDevicesFromType()Eric Laurent2015-03-261-2/+6
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge "HLS: faster switching and pause/resume on low buffer"Chong Zhang2015-03-277-321/+945
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | HLS: faster switching and pause/resume on low bufferChong Zhang2015-03-277-321/+945
* | | | | | | | | | | | | | | am 76a19722: Merge branch \'lmp-mr1-ub-dev\' of https://googleplex-android.go...Martin Hibdon2015-03-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'lmp-mr1-ub-dev' of https://googleplex-android.googlesource.com/...Martin Hibdon2015-03-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | am fb7b0f3d: (-s ours) am 9550d4f8: am 8fe49c83: am c42c4b52: am 424324b3: am...Eric Laurent2015-03-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | / / / / / | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | am 9550d4f8: am 8fe49c83: am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE...Eric Laurent2015-03-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am 8fe49c83: am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE - audio poli...Eric Laurent2015-03-270-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | am c42c4b52: am 424324b3: am 2fdd16b3: DO NOT MERGE - audio policy service: f...Eric Laurent2015-03-271-2/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
* | | | | | | | | | | | | | Fix seek issueMarco Nelissen2015-03-261-8/+0
| |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |