summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Fix issue 2553359: Pandora does not work well with Passion deskdock / Cardock.Eric Laurent2010-05-172-77/+107
* am a5cd816c: am eb9128f9: Fix sampleTable instantiation, this makes sure that...Andreas Huber2010-05-141-1/+2
|\
| * 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 "Detect and handle premature termination of a recording session" into k...James Dong2010-05-143-7/+17
|\ \ \
| * | | Detect and handle premature termination of a recording sessionJames Dong2010-05-143-7/+17
* | | | Merge "Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related c...Ray Chen2010-05-141-7/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related codes.Ray Chen2010-05-141-7/+7
* | | | Audio/video initial recording time synchronizationJames Dong2010-05-141-0/+34
* | | | Handle recording file size and/or duration limitJames Dong2010-05-143-0/+103
* | | | am 1d628c5d: merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | 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
* | | | | | Merge "Remove libdrm2. This code appears to be unused." into krakenNick Kralevich2010-05-14123-19517/+0
|\ \ \ \ \ \
| * | | | | | Remove libdrm2. This code appears to be unused.Nick Kralevich2010-05-13123-19517/+0
* | | | | | | Remove dummy surface in CameraSourceJames Dong2010-05-132-46/+3
* | | | | | | am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the ...Andreas Huber2010-05-132-3/+10
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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
* | | | | | | should fix the buildMathias Agopian2010-05-121-0/+3
| |_|/ / / / |/| | | | |
* | | | | | am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-121-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 bbafdc64: am 836b2d75: Merge "Don\'t clear the _data column in the audio_m...Marco Nelissen2010-05-121-2/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 b003ad17: am e0dc80f8: Merge "Support for customizable socket-read timeout...Andreas Huber2010-05-123-4/+33
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 227e443a: am d6ad7c85: Merge "Better seek handling and proper reset of the...Andreas Huber2010-05-122-9/+22
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 0c73adb1: am 3e90c76c: Merge "Update javadoc in android.media.AudioManager...Jean-Michel Trivi2010-05-121-9/+15
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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 ea37d9b4: am aaa01b18: Merge " Fix bug 2670395 and 2599698 When the...Jean-Michel Trivi2010-05-122-22/+25
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
| | |/ / / /
* | | | | | Added initial validation on video/audio encoding parameters before/at start()James Dong2010-05-112-22/+174
* | | | | | Output streamable MP4 file during MP4 file recordingJames Dong2010-05-111-24/+100
* | | | | | Merge "Metadata construction optimization" into krakenJames Dong2010-05-101-38/+65
|\ \ \ \ \ \
| * | | | | | Metadata construction optimizationJames Dong2010-05-061-38/+65
* | | | | | | am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to su...Andreas Huber2010-05-1014-371/+964
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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
* | | | | | | Support multiple cameras in framework.Chih-Chung Chang2010-05-101-1/+1
| |_|/ / / / |/| | | | |