Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | Merge "Duplicated fileDesc is not closed when input file is not forward-lock ... | Gloria Wang | 2011-06-14 | 1 | -1/+4 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Duplicated fileDesc is not closed when input file is not forward-lock content. | Gloria Wang | 2011-06-13 | 1 | -1/+4 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge "audio: update for audio/audio_policy header names/locations" | Dima Zavin | 2011-06-13 | 7 | -7/+7 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | audio: update for audio/audio_policy header names/locations | Dima Zavin | 2011-06-13 | 7 | -7/+7 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge "Add an option to force to use HW codec in stagefright cmd tool" | James Dong | 2011-06-13 | 1 | -2/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add an option to force to use HW codec in stagefright cmd tool | James Dong | 2011-06-13 | 1 | -2/+19 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge "Add B frame support for MPEG4Writer" | James Dong | 2011-06-13 | 4 | -9/+149 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add B frame support for MPEG4Writer | James Dong | 2011-06-13 | 4 | -9/+149 | |
| |/ / / / / / | ||||||
* | | | | | | | unify SurfaceTexture and Surface | Mathias Agopian | 2011-06-13 | 1 | -346/+2 | |
|/ / / / / / | ||||||
* | | | | | | CameraService: return stide when dequeueing a buffer | Iliyan Malchev | 2011-06-11 | 1 | -2/+4 | |
* | | | | | | Merge "Avoid duplicated code calculating the stts sample duration" | James Dong | 2011-06-10 | 1 | -22/+21 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Avoid duplicated code calculating the stts sample duration | James Dong | 2011-06-10 | 1 | -22/+21 | |
* | | | | | | | am 15e9d474: am 88748e6d: am d86302df: Quiet the log. | Dianne Hackborn | 2011-06-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | am 88748e6d: am d86302df: Quiet the log. | Dianne Hackborn | 2011-06-10 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ | am d86302df: Quiet the log. | Dianne Hackborn | 2011-06-09 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | Quiet the log. | Dianne Hackborn | 2011-06-09 | 1 | -1/+1 | |
* | | | | | | | | | am dc03da04: (-s ours) am 2488a943: am e3b80c83: Merge "Revert "Add avg bandw... | James Dong | 2011-06-10 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | am 2488a943: am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 s... | James Dong | 2011-06-09 | 2 | -12/+0 | |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | ||||||
| | * | | | | | | | am e3b80c83: Merge "Revert "Add avg bandwidth estimate every 2 seconds - do n... | James Dong | 2011-06-09 | 2 | -12/+0 | |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | ||||||
| | | * | | | | | | Merge "Revert "Add avg bandwidth estimate every 2 seconds - do not merge."" i... | James Dong | 2011-06-09 | 2 | -12/+0 | |
| | | |\ \ \ \ \ \ | ||||||
| | | | * | | | | | | Revert "Add avg bandwidth estimate every 2 seconds - do not merge." | James Dong | 2011-05-19 | 2 | -12/+0 | |
* | | | | | | | | | | am e668c0b6: (-s ours) am 644f36ea: am d8b027b1: Merge "stagefright aacenc/am... | Conley Owens | 2011-06-10 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | ||||||
| * | | | | | | | | | am 644f36ea: am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line br... | Conley Owens | 2011-06-09 | 185 | -30089/+30089 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | am d8b027b1: Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix ... | Conley Owens | 2011-06-09 | 185 | -30089/+30089 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ \ | Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style" | Conley Owens | 2011-06-09 | 185 | -30089/+30089 | |
| | | |\ \ \ \ \ \ \ \ \ | ||||||
| | | | * | | | | | | | | | stagefright aacenc/amrwbenc: Convert line breaks to Unix style | Mans Rullgard | 2011-04-23 | 185 | -30089/+30089 | |
* | | | | | | | | | | | | | Merge "Call storeMetaDataInVideoBuffers() before get/setParameters() on index... | James Dong | 2011-06-10 | 1 | -9/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Call storeMetaDataInVideoBuffers() before get/setParameters() on index OMX_In... | James Dong | 2011-06-08 | 1 | -9/+10 | |
* | | | | | | | | | | | | | | Merge "Correctly handle crop rect event in SoftAVC.cpp" | James Dong | 2011-06-10 | 2 | -8/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Correctly handle crop rect event in SoftAVC.cpp | James Dong | 2011-06-09 | 2 | -8/+11 | |
* | | | | | | | | | | | | | | | Merge "Make dumpsys(media.player) more useful by having AwesomePlayer populat... | Andreas Huber | 2011-06-10 | 6 | -44/+255 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | Make dumpsys(media.player) more useful by having AwesomePlayer populate it. | Andreas Huber | 2011-06-08 | 6 | -44/+255 | |
* | | | | | | | | | | | | | | | | am 6a91953c: am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds | Marco Nelissen | 2011-06-09 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | am 90dc22fa: am a02d9bf9: Make sure we don\'t read from invalid fds | Marco Nelissen | 2011-06-09 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | am a02d9bf9: Make sure we don\'t read from invalid fds | Marco Nelissen | 2011-06-09 | 1 | -0/+3 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | Make sure we don't read from invalid fds | Marco Nelissen | 2011-06-09 | 1 | -0/+3 | |
| | | | |_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Fix an issue in MPEG4Writer where the write of outstanding chunks in the last... | James Dong | 2011-06-09 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | Merge "Add timestamp and data pointer checks in CameraSource" | James Dong | 2011-06-09 | 1 | -5/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Add timestamp and data pointer checks in CameraSource | James Dong | 2011-06-03 | 1 | -5/+5 | |
* | | | | | | | | | | | | | | | am 752a5b3d: (-s ours) am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linu... | Andreas Huber | 2011-06-08 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | am 8e973729: (-s ours) am 8050a02b: DO NOT MERGE: Linux sockets are odd, clos... | Andreas Huber | 2011-06-07 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | am 8050a02b: DO NOT MERGE: Linux sockets are odd, closing a socket descriptor... | Andreas Huber | 2011-06-02 | 1 | -17/+79 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | / / / / / / / / | | | |_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | DO NOT MERGE: Linux sockets are odd, closing a socket descriptor does not abo... | Andreas Huber | 2011-06-01 | 1 | -17/+79 | |
* | | | | | | | | | | | | | | This device-specific workaround is no longer necessary. | Andreas Huber | 2011-06-08 | 2 | -11/+1 | |
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | frameworks/base: updates for camera HAL memory management | Iliyan Malchev | 2011-06-07 | 1 | -18/+70 | |
* | | | | | | | | | | | | | Merge "Improve android.hardware.Camera.Area javadoc." | Wu-cheng Li | 2011-06-07 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Improve android.hardware.Camera.Area javadoc. | Wu-cheng Li | 2011-06-07 | 1 | -2/+2 | |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | | CameraParameters: add PIXEL_FORMAT_RGBA8888 | Iliyan Malchev | 2011-06-06 | 2 | -0/+2 | |
* | | | | | | | | | | | | Merge "Fix the comment for the location box @xyz" | James Dong | 2011-06-06 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Fix the comment for the location box @xyz | James Dong | 2011-06-03 | 1 | -2/+2 |