summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "MTP: Don't request thumbnails for folder objects in MtpCursor"Mike Lockwood2010-07-262-13/+19
|\
| * MTP: Don't request thumbnails for folder objects in MtpCursorMike Lockwood2010-07-262-13/+19
* | Merge "MTP: Add hard coded support to recognize a couple MTP music players fo...Mike Lockwood2010-07-261-3/+37
|\ \ | |/
| * MTP: Add hard coded support to recognize a couple MTP music players for testi...Mike Lockwood2010-07-261-3/+37
* | am e80c30c6: am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect...Eric Laurent2010-07-261-33/+7
|\ \
| * \ am 00de7218: Merge "Fixed bug in vlm effect bunde wrapper effect init functio...Eric Laurent2010-07-261-33/+7
| |\ \
| | * \ Merge "Fixed bug in vlm effect bunde wrapper effect init function." into ging...Eric Laurent2010-07-261-33/+7
| | |\ \
| | | * | Fixed bug in vlm effect bunde wrapper effect init function.Eric Laurent2010-07-261-33/+7
* | | | | am df5c3b50: am 739bf285: Merge "LVM release 1.04." into gingerbreadEric Laurent2010-07-2613-112/+97
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am 739bf285: Merge "LVM release 1.04." into gingerbreadEric Laurent2010-07-2613-112/+97
| |\ \ \ | | |/ /
| | * | LVM release 1.04.Eric Laurent2010-07-2613-112/+97
| | |/
* | | am 08f2b10c: am 021697ad: Audio effects: lvm bundle wrapper update after firs...Eric Laurent2010-07-232-729/+1062
|\ \ \ | |/ /
| * | am 021697ad: Audio effects: lvm bundle wrapper update after first integration...Eric Laurent2010-07-232-729/+1062
| |\ \ | | |/
| | * Audio effects: lvm bundle wrapper update after first integration tests.Eric Laurent2010-07-232-729/+1062
* | | Don't change the public API (adding @hide)Nipun Kwatra2010-07-221-0/+2
* | | Allowing setting of time lapse parameters through MediaRecorder.javaNipun Kwatra2010-07-224-15/+93
* | | am 9bc4dc11: am 53d4e0d5: Allows the authoring engine to skip frame.James Dong2010-07-225-54/+124
|\ \ \ | |/ /
| * | am 53d4e0d5: Allows the authoring engine to skip frame.James Dong2010-07-225-54/+124
| |\ \ | | |/
| | * Allows the authoring engine to skip frame.James Dong2010-07-225-54/+124
* | | am b72d3180: am 81046c8c: Merge "Various changes to improve rtsp networking, ...Andreas Huber2010-07-224-6/+38
|\ \ \ | |/ /
| * | am 81046c8c: Merge "Various changes to improve rtsp networking, reduce packet...Andreas Huber2010-07-224-6/+38
| |\ \ | | |/
| | * Various changes to improve rtsp networking, reduce packet loss and adapt to A...Andreas Huber2010-07-224-6/+38
* | | am 8a9a931f: am 8138e841: Merge "Support finer seek control on MediaSources."...Andreas Huber2010-07-2128-65/+446
|\ \ \ | |/ /
| * | am 8138e841: Merge "Support finer seek control on MediaSources." into gingerb...Andreas Huber2010-07-2128-65/+446
| |\ \ | | |/
| | * Merge "Support finer seek control on MediaSources." into gingerbreadAndreas Huber2010-07-2128-65/+446
| | |\
| | | * Support finer seek control on MediaSources.Andreas Huber2010-07-2128-65/+446
* | | | am 34161132: am 7070b365: Added support for auxiliary audio effects to AudioT...Eric Laurent2010-07-218-7/+251
|\ \ \ \ | |/ / /
| * | | am 7070b365: Added support for auxiliary audio effects to AudioTrack and Medi...Eric Laurent2010-07-218-7/+251
| |\ \ \ | | |/ /
| | * | Added support for auxiliary audio effects to AudioTrack and MediaPlayer.Eric Laurent2010-07-218-7/+251
| | |/
* | | am 9049fe60: am d7514ec6: Merge "Progress status notification" into gingerbreadJames Dong2010-07-204-50/+51
|\ \ \ | |/ /
| * | am d7514ec6: Merge "Progress status notification" into gingerbreadJames Dong2010-07-204-50/+51
| |\ \ | | |/
| | * Merge "Progress status notification" into gingerbreadJames Dong2010-07-204-50/+51
| | |\
| | | * Progress status notificationJames Dong2010-07-204-50/+51
* | | | Merge "Restart preview after each takePicture is done."Nipun Kwatra2010-07-201-6/+38
|\ \ \ \
| * | | | Restart preview after each takePicture is done.Nipun Kwatra2010-07-201-6/+38
* | | | | resolved conflicts for merge of dd206093 to masterEric Laurent2010-07-205-24/+194
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am 22a2d718: Merge "Audio policy manager changes for audio effects" into ging...Eric Laurent2010-07-205-24/+194
| |\ \ \ | | |/ /
| | * | Merge "Audio policy manager changes for audio effects" into gingerbreadEric Laurent2010-07-205-24/+194
| | |\ \
| | | * | Audio policy manager changes for audio effectsEric Laurent2010-07-205-24/+194
* | | | | Use software encoder for time lapse capture.Nipun Kwatra2010-07-201-1/+3
* | | | | Merge "Adding support for timelapse capture using still camera's takepicture....Nipun Kwatra2010-07-204-57/+258
|\ \ \ \ \
| * | | | | Adding support for timelapse capture using still camera's takepicture.Nipun Kwatra2010-07-194-57/+258
* | | | | | am ff45709f: am cc14a839: Support a single format change at the beginning of ...Andreas Huber2010-07-202-67/+60
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am cc14a839: Support a single format change at the beginning of audio playbac...Andreas Huber2010-07-202-67/+60
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Support a single format change at the beginning of audio playback. This way t...Andreas Huber2010-07-202-67/+60
* | | | | | am 4df3ab54: am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequ...Andreas Huber2010-07-202-13/+79
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am faf1d46a: Merge "Fix MPEG4Extractor to extract sampling frequency correctl...Andreas Huber2010-07-202-13/+79
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix MPEG4Extractor to extract sampling frequency correctly when SBR is...Andreas Huber2010-07-202-13/+79
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.James Dong2010-07-192-13/+79
* | | | | | Merge "MTP host fixes:"Mike Lockwood2010-07-202-39/+53
|\ \ \ \ \ \