summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* merge from open-source masterThe Android Open Source Project2010-05-172-1/+5
|\
| * Merge "Modified libdrm to support SuperH platform"Jeff Hamilton2010-05-142-1/+5
| |\
| | * Modified libdrm to support SuperH platformShin-ichiro KAWASAKI2009-07-032-1/+5
* | | am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample t...Andreas Huber2010-05-141-1/+2
|\ \ \
| * | | Fix sampleTable instantiation, this makes sure that the sample table refers t...Andreas Huber2010-05-141-1/+2
* | | | merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Accept media files by file extension in case insensitive manner."Jean-Baptiste Queru2010-05-141-1/+1
| |\ \ \
| | * | | Accept media files by file extension in case insensitive manner.Atsushi Eno2010-03-191-1/+1
* | | | | am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder is...Andreas Huber2010-05-132-3/+10
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Return a runtime error instead of asserting if the AACDecoder is passed an un...Andreas Huber2010-05-132-3/+10
* | | | | am b1235a57: Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-121-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-111-0/+2
| |\ \ \ \
| | * | | | Hide two audio focus methods.Xavier Ducrohet2010-05-111-0/+2
* | | | | | am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, si...Marco Nelissen2010-05-121-2/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Don't clear the _data column in the audio_meta table, since it isn'tMarco Nelissen2010-05-111-2/+5
| |/ / / /
* | | | | am e0dc80f8: Merge "Support for customizable socket-read timeouts through the...Andreas Huber2010-05-123-4/+33
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Support for customizable socket-read timeouts through the HTTP respons...Andreas Huber2010-05-113-4/+33
| |\ \ \ \
| | * | | | Support for customizable socket-read timeouts through the HTTP response.Andreas Huber2010-05-113-4/+33
* | | | | | am d6ad7c85: Merge "Better seek handling and proper reset of the vorbis decod...Andreas Huber2010-05-122-9/+22
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Better seek handling and proper reset of the vorbis decoder after a di...Andreas Huber2010-05-112-9/+22
| |\ \ \ \ \
| | * | | | | Better seek handling and proper reset of the vorbis decoder after a discontin...Andreas Huber2010-05-112-9/+22
| | |/ / / /
* | | | | | am 3e90c76c: Merge "Update javadoc in android.media.AudioManager to not hide ...Jean-Michel Trivi2010-05-121-9/+15
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update javadoc in android.media.AudioManager to not hide theJean-Michel Trivi2010-05-111-9/+15
* | | | | | am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the user selects...Jean-Michel Trivi2010-05-122-22/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix bug 2670395 and 2599698Jean-Michel Trivi2010-05-112-22/+25
| |/ / / /
* | | | | am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to support approxi...Andreas Huber2010-05-1014-371/+964
|\ \ \ \ \ | |/ / / /
| * | | | A new OggExtractor/VorbisDecoder combo to support approximate seeking.Andreas Huber2010-05-0714-371/+964
* | | | | am 100ef9be: Merge "Disable vorbis seek when streaming from localhost." into ...Andreas Huber2010-05-068-5/+106
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Disable vorbis seek when streaming from localhost." into froyoAndreas Huber2010-05-068-5/+106
| |\ \ \ \
| | * | | | Disable vorbis seek when streaming from localhost.Andreas Huber2010-05-068-5/+106
* | | | | | am 2d315667: For issue #2651381, allow library prelinking.Dan Bornstein2010-05-055-10/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | For issue #2651381, allow library prelinking.Dan Bornstein2010-05-055-10/+0
| |/ / / /
* | | | | 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
* | | | | merge from open-source masterThe Android Open Source Project2010-04-281-1/+1
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | speling fixhugh kennedy2010-04-281-1/+1
* | | | Switch to use software MP3 decoderJames Dong2010-04-261-1/+1
* | | | Fix bug 2619062 Music is routed to Phone speaker, though it isJean-Michel Trivi2010-04-231-2/+17
* | | | 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
* | | | | Update AudioService to reflect phone state changes with AudioFocus.Jean-Michel Trivi2010-04-201-29/+52
|/ / / /
* | | | 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
* | | | | 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
| |/ / / /
* | | | | Fix issue 2602879: camera shutter sound not playing.Eric Laurent2010-04-201-0/+6
* | | | | Fix issue 2604270 Device auto connects to Car Dock (Media profile) after und...Eric Laurent2010-04-201-0/+3
|/ / / /
* | | | Fix issue 2592680: Saved ringer volume forced to 0 when receiving a call in s...Eric Laurent2010-04-141-17/+9
* | | | 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