summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Support AAC recording" into krakenJames Dong2010-05-045-58/+380
|\
| * Support AAC recordingJames Dong2010-05-035-58/+380
* | am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefrig...Andreas Huber2010-05-047-7/+413
|\ \ | |/ |/|
| * am e083d0a2: Merge "Support for Ogg Vorbis decoding in stagefright." into froyoAndreas Huber2010-05-047-7/+413
| |\
| | * Support for Ogg Vorbis decoding in stagefright.Andreas Huber2010-05-047-7/+413
* | | am c8652199: merge from open-source masterThe Android Open Source Project2010-04-281-1/+1
|\ \ \ | |/ /
| * | merge from open-source masterThe Android Open Source Project2010-04-281-1/+1
| |\ \ | | |/ | |/|
| | * speling fixhugh kennedy2010-04-281-1/+1
* | | Use timestamp from camera driver for CameraSourceJames Dong2010-04-285-68/+118
* | | am 31431b34: am 374aee68: Switch to use software MP3 decoder Hardware MP3 dec...James Dong2010-04-261-1/+1
|\ \ \ | |/ /
| * | Switch to use software MP3 decoderJames Dong2010-04-261-1/+1
* | | am f6adae78: am 47dad8fa: Merge "Fix bug 2619062 Music is routed to Phone spe...Jean-Michel Trivi2010-04-231-2/+17
|\ \ \ | |/ /
| * | Fix bug 2619062 Music is routed to Phone speaker, though it isJean-Michel Trivi2010-04-231-2/+17
* | | am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not immediately ret...Andreas Huber2010-04-202-27/+14
|\ \ \ | |/ /
| * | Merge "Apparently select() does not immediately return if one of the masked s...Andreas Huber2010-04-202-27/+14
| |\ \
| | * | Apparently select() does not immediately return if one of the masked socket d...Andreas Huber2010-04-202-27/+14
* | | | am 8dc4c790: am fe8620ac: Merge "Update AudioService to reflect phone state c...Jean-Michel Trivi2010-04-201-29/+52
|\ \ \ \ | |/ / /
| * | | Update AudioService to reflect phone state changes with AudioFocus.Jean-Michel Trivi2010-04-201-29/+52
| |/ /
* | | am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of enc...Andreas Huber2010-04-201-2/+12
|\ \ \ | |/ /
| * | Merge "Don't coalesce more than 250ms worth of encoded data into a single cod...Andreas Huber2010-04-201-2/+12
| |\ \
| | * | Don't coalesce more than 250ms worth of encoded data into a single codec inpu...Andreas Huber2010-04-201-2/+12
* | | | am 9d14e3ea: am 9b8b417c: Merge "When updating existing entries in the media ...Marco Nelissen2010-04-201-2/+6
|\ \ \ \ | |/ / /
| * | | Merge "When updating existing entries in the media database, don't update the...Marco Nelissen2010-04-201-2/+6
| |\ \ \
| | * | | When updating existing entries in the media database, don't updateMarco Nelissen2010-04-201-2/+6
| | |/ /
* | | | am 11bae140: am 3891c4cc: Fix issue 2602879: camera shutter sound not playing.Eric Laurent2010-04-201-0/+6
|\ \ \ \ | |/ / /
| * | | Fix issue 2602879: camera shutter sound not playing.Eric Laurent2010-04-201-0/+6
* | | | am 3cd1f9f9: am 3b591260: Fix issue 2604270 Device auto connects to Car Dock...Eric Laurent2010-04-201-0/+3
|\ \ \ \ | |/ / /
| * | | Fix issue 2604270 Device auto connects to Car Dock (Media profile) after und...Eric Laurent2010-04-201-0/+3
| |/ /
* | | am def7db5b: am 758dd527: Fix issue 2592680: Saved ringer volume forced to 0 ...Eric Laurent2010-04-141-17/+9
|\ \ \ | |/ /
| * | Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in s...Eric Laurent2010-04-141-17/+9
* | | am 834f0483: am 745b43c2: Merge "Fix issue 2589563: Able to set ringer volume...Eric Laurent2010-04-141-0/+3
|\ \ \ | |/ /
| * | Merge "Fix issue 2589563: Able to set ringer volume to 0 outside of silent mo...Eric Laurent2010-04-141-0/+3
| |\ \
| | * | Fix issue 2589563: Able to set ringer volume to 0 outside of silent mode.Eric Laurent2010-04-141-0/+3
* | | | am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" into...James Dong2010-04-141-0/+5
|\ \ \ \ | |/ / /
| * | | Use PV_PLAYER to handle RTSP streamingJames Dong2010-04-141-0/+5
| |/ /
* | | fix unintentional driftJean-Baptiste Queru2010-04-142-14/+23
* | | am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types accor...James Dong2010-04-131-0/+2
|\ \ \
| * \ \ am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to http:...James Dong2010-04-131-0/+2
| |\ \ \ | | |/ /
| | * | Snif more 3GPP file types according to http://www.ftyps.com/3gpp.htmlJames Dong2010-04-131-0/+2
* | | | am d760afc3: am 30e9c2d4: am db281311: Merge "Better diagnostics in the stage...Andreas Huber2010-04-131-1/+1
|\ \ \ \ | |/ / /
| * | | am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright comman...Andreas Huber2010-04-131-1/+1
| |\ \ \ | | |/ /
| | * | Merge "Better diagnostics in the stagefright commandline tool, support for pl...Andreas Huber2010-04-131-1/+1
| | |\ \
| | | * | Better diagnostics in the stagefright commandline tool, support for playing s...Andreas Huber2010-04-131-1/+1
* | | | | am ebaa935e: am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component ro...James Dong2010-04-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 9bb8e65a: am c15f48d7: Merge "Don\'t set encoder component role while we q...James Dong2010-04-131-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "Don't set encoder component role while we query decoders" into froyoJames Dong2010-04-131-1/+1
| | |\ \ \
| | | * | | Don't set encoder component role while we query decodersJames Dong2010-04-131-1/+1
* | | | | | am b8430335: am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing m...Jean-Michel Trivi2010-04-131-11/+56
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 34b2ecc8: am c30890e1: Merge "Fix bug 2578813 Delay pausing music and rout...Jean-Michel Trivi2010-04-131-11/+56
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix bug 2578813 Delay pausing music and routing audio for car docks" i...Jean-Michel Trivi2010-04-131-11/+56
| | |\ \ \ \