summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* build failed with g++ v. 4.4.5Matthias Bady2010-11-181-1/+1
* - Move the business rule management down to DRM agents.Gloria Wang2010-11-012-24/+14
* DRM framework support:Gloria Wang2010-10-2510-41/+793
* Fix compilation errors in libmedia, libstagefright.Rene Bolldorf2010-08-172-4/+4
* fix inaccurate copyrightsJean-Baptiste Queru2010-07-293-3/+3
* move native services under services/Mathias Agopian2010-07-221-2/+2
* merge from open-source masterThe Android Open Source Project2010-06-181-1/+5
|\
| * Change in media scanner to set correct dateMikael2 Svensson2010-06-061-1/+5
* | am 39e876ad: Merge "When filling the cache, we always time out waiting for a ...James Dong2010-06-171-1/+3
|\ \
| * \ Merge "When filling the cache, we always time out waiting for a condition tha...James Dong2010-06-161-1/+3
| |\ \
| | * | When filling the cache, we always time out waiting for a condition that won't...James Dong2010-06-161-1/+3
* | | | am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free m...Dave Sparks2010-06-171-0/+3
|\ \ \ \ | |/ / /
| * | | TimedEventQueue is apparently important for glitch-free media playback, and soMarco Nelissen2010-06-161-0/+3
| |/ /
* | | am 2e3761ba: Merge "Changes to the prefetcher to allow for bursts of data to ...Andreas Huber2010-06-031-12/+50
|\ \ \ | |/ /
| * | Merge "Changes to the prefetcher to allow for bursts of data to be transferre...Andreas Huber2010-06-031-12/+50
| |\ \
| | * | Changes to the prefetcher to allow for bursts of data to be transferred, hope...Andreas Huber2010-06-031-12/+50
* | | | am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should...James Dong2010-06-031-2/+6
|\ \ \ \ | |/ / /
| * | | Fix a Javadoc to clarify when setAudioStreamType() should be called.James Dong2010-06-031-2/+6
| |/ /
* | | am b0016e2b: Merge "Added the runtime parameters for the mediarecorder stress...Yu Shan Emily Lau2010-05-253-20/+126
|\ \ \ | |/ /
| * | Added the runtime parameters for the mediarecorder stress test.Yu Shan Emily Lau2010-05-253-20/+126
* | | am 2723e092: Merge "Better handling of codec initialization failure in the pl...Andreas Huber2010-05-203-5/+20
|\ \ \ | |/ /
| * | Better handling of codec initialization failure in the player and thumbnail e...Andreas Huber2010-05-203-5/+20
* | | 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
|\ \ \ \ \ | |/ / / /
generated by cgit v1.1 at 2024-12-23 02:57:15 +0000