summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am 9c09a605: am 1441bdfc: Merge "Use the target color format from the camera ...James Dong2010-08-051-0/+5
|\
| * Use the target color format from the camera source if possibleJames Dong2010-08-051-0/+5
* | am 1f513d88: am c17f35dd: Merge "Support for Gtalk video, includes AMR/H.263 ...Andreas Huber2010-08-052-0/+4
|\ \ | |/
| * Support for Gtalk video, includes AMR/H.263 assembler and packetization suppo...Andreas Huber2010-08-042-0/+4
* | Adding parseSizesList, getSupportedPreviewSizes to CameraParameters.Nipun Kwatra2010-08-041-0/+1
* | am 246aad12: am 3d84280c: Merge "File writer has a designated writer thread n...James Dong2010-08-041-0/+41
|\ \ | |/
| * Merge "File writer has a designated writer thread now" into gingerbreadJames Dong2010-08-031-0/+41
| |\
| | * File writer has a designated writer thread nowJames Dong2010-08-021-0/+41
* | | am 51a260d8: am 23796e3b: Merge "Add lost frame handling in AudioSource" into...James Dong2010-08-031-3/+2
|\ \ \ | |/ /
| * | Merge "Add lost frame handling in AudioSource" into gingerbreadJames Dong2010-08-021-3/+2
| |\ \ | | |/ | |/|
| | * Add lost frame handling in AudioSourceJames Dong2010-07-301-3/+2
| * | resolved conflicts for merge of 27eecb70 to gingerbreadJean-Baptiste Queru2010-07-303-3/+2
| |\ \ | | |/ | |/|
| | * Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base...The Android Open Source Project2010-07-293-3/+2
| | |\
| | | * fix inaccurate copyrightsJean-Baptiste Queru2010-07-293-3/+2
| | * | Squashed commit of the following:Andreas Huber2010-07-291-0/+4
| | |/
* | | Implementing getSupportedPictureSizesNipun Kwatra2010-08-021-3/+5
* | | Adding getSupportedPictureSizes which returns a Vector of supported Sizes.Nipun Kwatra2010-07-301-0/+16
* | | am 0c51c98f: am 4506c62a: fix inaccurate copyrightsJean-Baptiste Queru2010-07-293-3/+2
|\ \ \
| * \ \ am 4506c62a: fix inaccurate copyrightsJean-Baptiste Queru2010-07-293-3/+2
| |\ \ \ | | |/ / | |/| |
| | * | fix inaccurate copyrightsJean-Baptiste Queru2010-07-293-3/+2
| | |/
* | | Support for video size to be different from captured picture size.Nipun Kwatra2010-07-291-0/+33
* | | Adding YUVImage and YUVCanvas.Nipun Kwatra2010-07-292-0/+241
* | | am 9362ea76: am 9f2a91bc: Merge "fix [2873058] Surface::dequeueBuffer blocks ...Mathias Agopian2010-07-281-8/+0
|\ \ \ | |/ /
| * | Merge "fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. canno...Mathias Agopian2010-07-281-8/+0
| |\ \
| | * | fix [2873058] Surface::dequeueBuffer blocks on last buffer, i.e. cannot deque...Mathias Agopian2010-07-271-8/+0
* | | | am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter ...Eric Laurent2010-07-284-12/+24
|\ \ \ \ | |/ / /
| * | | Audio effects: modified command() parameter types.Eric Laurent2010-07-284-12/+24
* | | | resolved conflicts for merge of d306cc81 to masterEric Laurent2010-07-276-14/+26
|\ \ \ \ | |/ / /
| * | | Audio Effects: added methods to effects java classes to store and load curren...Eric Laurent2010-07-276-14/+26
| |/ /
* | | Allowing setting of time lapse parameters through MediaRecorder.javaNipun Kwatra2010-07-221-0/+3
* | | am 9bc4dc11: am 53d4e0d5: Allows the authoring engine to skip frame.James Dong2010-07-222-0/+14
|\ \ \ | |/ /
| * | Allows the authoring engine to skip frame.James Dong2010-07-222-0/+14
* | | am b72d3180: am 81046c8c: Merge "Various changes to improve rtsp networking, ...Andreas Huber2010-07-221-1/+3
|\ \ \ | |/ /
| * | Various changes to improve rtsp networking, reduce packet loss and adapt to A...Andreas Huber2010-07-221-1/+3
* | | am 8a9a931f: am 8138e841: Merge "Support finer seek control on MediaSources."...Andreas Huber2010-07-213-2/+13
|\ \ \ | |/ /
| * | Merge "Support finer seek control on MediaSources." into gingerbreadAndreas Huber2010-07-213-2/+13
| |\ \
| | * | Support finer seek control on MediaSources.Andreas Huber2010-07-213-2/+13
* | | | am 34161132: am 7070b365: Added support for auxiliary audio effects to AudioT...Eric Laurent2010-07-213-2/+8
|\ \ \ \ | |/ / /
| * | | Added support for auxiliary audio effects to AudioTrack and MediaPlayer.Eric Laurent2010-07-213-2/+8
| |/ /
* | | am 9049fe60: am d7514ec6: Merge "Progress status notification" into gingerbreadJames Dong2010-07-201-0/+1
|\ \ \ | |/ /
| * | Merge "Progress status notification" into gingerbreadJames Dong2010-07-201-0/+1
| |\ \
| | * | Progress status notificationJames Dong2010-07-201-0/+1
* | | | Merge "Restart preview after each takePicture is done."Nipun Kwatra2010-07-201-1/+14
|\ \ \ \
| * | | | Restart preview after each takePicture is done.Nipun Kwatra2010-07-201-1/+14
* | | | | resolved conflicts for merge of dd206093 to masterEric Laurent2010-07-203-4/+41
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge "Audio policy manager changes for audio effects" into gingerbreadEric Laurent2010-07-203-4/+41
| |\ \ \
| | * | | Audio policy manager changes for audio effectsEric Laurent2010-07-203-4/+41
* | | | | Merge "Adding support for timelapse capture using still camera's takepicture....Nipun Kwatra2010-07-202-25/+154
|\ \ \ \ \
| * | | | | Adding support for timelapse capture using still camera's takepicture.Nipun Kwatra2010-07-192-25/+154
* | | | | | am ff45709f: am cc14a839: Support a single format change at the beginning of ...Andreas Huber2010-07-201-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /