summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix regression in audio effect factoryEric Laurent2011-06-161-1/+1
* Merge "Allow camera to be disabled via Device Policy Manager"Wu-cheng Li2011-06-161-0/+8
|\
| * Allow camera to be disabled via Device Policy ManagerWu-cheng Li2011-05-301-0/+8
* | Reconcile with gingerbread-releaseThe Android Open Source Project2011-06-150-0/+0
|\ \
| * \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-090-0/+0
| |\ \
| | * \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-06-060-0/+0
| | |\ \
* | | \ \ Merge "Merge chromium to r11.0.672.0: Compile fix"Kristian Monsen2011-06-142-4/+4
|\ \ \ \ \
| * | | | | Merge chromium to r11.0.672.0: Compile fixKristian Monsen2011-06-072-4/+4
* | | | | | Merge "Bug 4608375"Glenn Kasten2011-06-143-4/+3
|\ \ \ \ \ \
| * | | | | | Bug 4608375Glenn Kasten2011-06-143-4/+3
* | | | | | | Merge "Enforce the rule that the timestamp from timelapse video source monoti...James Dong2011-06-141-1/+2
|\ \ \ \ \ \ \
| * | | | | | | Enforce the rule that the timestamp from timelapse video source monotically i...James Dong2011-06-131-1/+2
| |/ / / / / /
* | | | | | | To remove log spam in the Forward Lock DRM plugin.Gloria Wang2011-06-141-30/+30
* | | | | | | Merge "Duplicated fileDesc is not closed when input file is not forward-lock ...Gloria Wang2011-06-141-1/+4
|\ \ \ \ \ \ \
| * | | | | | | Duplicated fileDesc is not closed when input file is not forward-lock content.Gloria Wang2011-06-131-1/+4
| |/ / / / / /
* | | | | | | Merge "audio: update for audio/audio_policy header names/locations"Dima Zavin2011-06-137-7/+7
|\ \ \ \ \ \ \
| * | | | | | | audio: update for audio/audio_policy header names/locationsDima Zavin2011-06-137-7/+7
| |/ / / / / /
* | | | | | | Merge "Add an option to force to use HW codec in stagefright cmd tool"James Dong2011-06-131-2/+19
|\ \ \ \ \ \ \
| * | | | | | | Add an option to force to use HW codec in stagefright cmd toolJames Dong2011-06-131-2/+19
| |/ / / / / /
* | | | | | | Merge "Add B frame support for MPEG4Writer"James Dong2011-06-134-9/+149
|\ \ \ \ \ \ \
| * | | | | | | Add B frame support for MPEG4WriterJames Dong2011-06-134-9/+149
| |/ / / / / /
* | | | | | | unify SurfaceTexture and SurfaceMathias Agopian2011-06-131-346/+2
|/ / / / / /
* | | | | | CameraService: return stide when dequeueing a bufferIliyan Malchev2011-06-111-2/+4
* | | | | | Merge "Avoid duplicated code calculating the stts sample duration"James Dong2011-06-101-22/+21
|\ \ \ \ \ \
| * | | | | | Avoid duplicated code calculating the stts sample durationJames Dong2011-06-101-22/+21
* | | | | | | am 15e9d474: am 88748e6d: am d86302df: Quiet the log.Dianne Hackborn2011-06-101-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | am 88748e6d: am d86302df: Quiet the log.Dianne Hackborn2011-06-101-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ am d86302df: Quiet the log.Dianne Hackborn2011-06-091-1/+1
| | |\ \ \ \ \ \
| | | * | | | | | Quiet the log.Dianne Hackborn2011-06-091-1/+1
* | | | | | | | | am dc03da04: (-s ours) am 2488a943: am e3b80c83: Merge "Revert "Add avg bandw...James Dong2011-06-100-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 s...James Dong2011-06-092-12/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do n...James Dong2011-06-092-12/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" i...James Dong2011-06-092-12/+0
| | | |\ \ \ \ \ \
| | | | * | | | | | Revert "Add avg bandwidth estimate every 2 seconds - do not merge."James Dong2011-05-192-12/+0
* | | | | | | | | | am e668c0b6: (-s ours) am 644f36ea: am d8b027b1: Merge "stagefright aacenc/am...Conley Owens2011-06-100-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line br...Conley Owens2011-06-09185-30089/+30089
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix ...Conley Owens2011-06-09185-30089/+30089
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"Conley Owens2011-06-09185-30089/+30089
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-23185-30089/+30089
* | | | | | | | | | | | | Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index...James Dong2011-06-101-9/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_In...James Dong2011-06-081-9/+10
* | | | | | | | | | | | | | Merge "Correctly handle crop rect event in SoftAVC.cpp"James Dong2011-06-102-8/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Correctly handle crop rect event in SoftAVC.cppJames Dong2011-06-092-8/+11
* | | | | | | | | | | | | | | Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populat...Andreas Huber2011-06-106-44/+255
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Make dumpsys(media.player) more useful by having AwesomePlayer populate it.Andreas Huber2011-06-086-44/+255
* | | | | | | | | | | | | | | | am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am a02d9bf9: Make sure we don\'t read from invalid fdsMarco Nelissen2011-06-091-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Make sure we don't read from invalid fdsMarco Nelissen2011-06-091-0/+3
| | | | |_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | | Fix an issue in MPEG4Writer where the write of outstanding chunks in the last...James Dong2011-06-091-0/+1