summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "HLS: bandwidth estimator changes"Chong Zhang2015-03-193-69/+149
|\
| * HLS: bandwidth estimator changesChong Zhang2015-03-193-69/+149
* | Merge "Fix link error of PROCESS_STATE_NONEXISTENT."Chih-Hung Hsieh2015-03-191-1/+5
|\ \ | |/ |/|
| * Fix link error of PROCESS_STATE_NONEXISTENT.Chih-Hung Hsieh2015-03-191-1/+5
* | Merge "audio routing management for radio"Eric Laurent2015-03-193-42/+101
|\ \
| * | audio routing management for radioEric Laurent2015-03-193-42/+101
* | | Merge "Camera: plumbing rotation field through"Yin-Chia Yeh2015-03-1928-66/+196
|\ \ \ | |_|/ |/| |
| * | Camera: plumbing rotation field throughYin-Chia Yeh2015-03-1828-66/+196
* | | Merge "Initial implementation of fast capture dump"Glenn Kasten2015-03-194-1/+30
|\ \ \
| * | | Initial implementation of fast capture dumpGlenn Kasten2015-03-064-1/+30
* | | | Merge "camera2: Add camera client eviction enforcement."Ruben Brunk2015-03-1914-941/+2427
|\ \ \ \
| * | | | camera2: Add camera client eviction enforcement.Ruben Brunk2015-03-1814-941/+2427
* | | | | Merge "Fix periodic notification timing error for AudioRecord"Andy Hung2015-03-171-2/+5
|\ \ \ \ \
| * | | | | Fix periodic notification timing error for AudioRecordAndy Hung2015-03-131-2/+5
* | | | | | Merge "audioflinger: refresh fast track underrun state upon start"Andy Hung2015-03-171-2/+6
|\ \ \ \ \ \
| * | | | | | audioflinger: refresh fast track underrun state upon startHaynes Mathew George2015-03-161-2/+6
| |/ / / / /
* | | | | | Fix 64-bit build break caused by print typeChong Zhang2015-03-172-4/+4
* | | | | | Merge "HLS: some fixes for seek with discontinuity."Chong Zhang2015-03-176-104/+173
|\ \ \ \ \ \
| * | | | | | HLS: some fixes for seek with discontinuity.Chong Zhang2015-03-176-104/+173
* | | | | | | Merge "Add FIXME to deprecate all APIs that assume a route"Glenn Kasten2015-03-163-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Add FIXME to deprecate all APIs that assume a routeGlenn Kasten2015-03-133-0/+6
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge "Update comments"Glenn Kasten2015-03-167-8/+10
|\ \ \ \ \ \ \
| * | | | | | | Update commentsGlenn Kasten2015-03-137-8/+10
| |/ / / / / /
* | | | | | | Merge "libstagefright: add ProcessInfo to get process priority."Ronghua Wu2015-03-166-33/+96
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | libstagefright: add ProcessInfo to get process priority.Ronghua Wu2015-03-166-33/+96
* | | | | | | Merge "radio service initial implementation"Eric Laurent2015-03-166-2/+1320
|\ \ \ \ \ \ \
| * | | | | | | radio service initial implementationEric Laurent2015-03-106-2/+1320
* | | | | | | | Merge "radio client"Eric Laurent2015-03-164-0/+410
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | radio clientEric Laurent2015-03-104-0/+410
* | | | | | | | Merge "radio service binder interfaces"Eric Laurent2015-03-167-0/+817
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | radio service binder interfacesEric Laurent2015-03-107-0/+817
* | | | | | | Merge "Remove mId from DeviceDescriptor."Rakesh Iyer2015-03-161-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove mId from DeviceDescriptor.Rakesh Iyer2015-03-131-1/+0
* | | | | | | | Merge "libstagefright: handle MediaFormat "priority" key."Ronghua Wu2015-03-162-0/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | libstagefright: handle MediaFormat "priority" key.Ronghua Wu2015-03-122-0/+23
* | | | | | | | | Merge "libcameraservice: Stop using IGBC::BufferItem"Dan Stoza2015-03-169-16/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | libcameraservice: Stop using IGBC::BufferItemDan Stoza2015-03-129-16/+15
* | | | | | | | | | Merge "libstagefright: Stop using IGBC::BufferItem"Dan Stoza2015-03-166-21/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | libstagefright: Stop using IGBC::BufferItemDan Stoza2015-03-126-21/+25
| |/ / / / / / / / /
* | | | | | | | | | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'Vinit Deshpande2015-03-160-0/+0
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am faefd08b: (-s ours) Revert "DO NOT MERGE: stagefright: add support for Int...Lajos Molnar2015-02-110-0/+0
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pause timeout" ...Lajos Molnar2015-02-105-2/+190
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 0c11001c: Merge "stagefright: change licensing headers on h264dec omxdl so...Lajos Molnar2015-02-09290-332/+4575
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am 17e95f40: stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-091-0/+108
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-062-4/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 35395ea6: (-s ours) DO NOT MERGE: stagefright: add support for Intel\'s YU...Lajos Molnar2015-02-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "avc_util: fix aspect_ratio_idc 14~16"Chong Zhang2015-03-141-9/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | avc_util: fix aspect_ratio_idc 14~16Chong Zhang2015-03-131-9/+24
| | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge "Fix warning while building mediaserver"Glenn Kasten2015-03-132-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Fix warning while building mediaserverGlenn Kasten2015-03-092-0/+4
| | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |