summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Multi-Project Commit: Move of filterfw out of system/media (2 of 7)Marius Renn2012-03-27245-0/+31004
* stagefright: compile without chromium for pdk buildsColin Cross2012-03-262-5/+10
* Merge "Provisional support for secure decryption of media streams."Andreas Huber2012-03-2622-28/+785
|\
| * Provisional support for secure decryption of media streams.Andreas Huber2012-03-2622-28/+785
* | Merge "Removed code related to simulator build in TimedEventQueue to get rid ...James Dong2012-03-261-21/+0
|\ \
| * | Removed code related to simulator build in TimedEventQueue to get rid of the ...James Dong2012-03-261-21/+0
| |/
* | Merge "fix visualizer inactivity detection"Eric Laurent2012-03-261-9/+24
|\ \
| * | fix visualizer inactivity detectionEric Laurent2012-03-261-9/+24
* | | Merge "reorganize SoundPool and JetPlayer code."Eric Laurent2012-03-268-8/+10
|\ \ \
| * | | reorganize SoundPool and JetPlayer code.Eric Laurent2012-03-268-8/+10
* | | | Merge changes Ib4d0e0c0,Iea8f4a23Colin Cross2012-03-261-1/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | libmedia: remove skia includeColin Cross2012-03-241-1/+0
* | | | Merge "Speed up playlist processing"Marco Nelissen2012-03-261-34/+58
|\ \ \ \
| * | | | Speed up playlist processingMarco Nelissen2012-03-231-34/+58
* | | | | Merge "IAudioFlinger::createTrack and openRecord flags"Glenn Kasten2012-03-263-15/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | IAudioFlinger::createTrack and openRecord flagsGlenn Kasten2012-03-193-15/+14
* | | | | Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files.James Dong2012-03-2412-14/+0
* | | | | Merge "VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus c...James Dong2012-03-241-77/+0
|\ \ \ \ \
| * | | | | VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus can be d...James Dong2012-03-241-77/+0
* | | | | | Merge "Insert 2 seconds wait in each test case setup. This is the work around...Yu Shan Emily Lau2012-03-233-2/+12
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Insert 2 seconds wait in each test case setup.Yu Shan Emily Lau2012-03-233-2/+12
| |/ / / /
* | | | | Merge "Revert "Split libmedia into libmedia and libmedia_native""Glenn Kasten2012-03-232-44/+37
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Revert "Split libmedia into libmedia and libmedia_native"Glenn Kasten2012-03-232-44/+37
* | | | | Fix the file mimetype reported by the mpeg4 extractor.Andreas Huber2012-03-232-2/+3
| |_|_|/ |/| | |
* | | | Change Android.mk file to use the new location after /frameworks/media/libvid...James Dong2012-03-221-6/+6
* | | | Add batch volume adjust support to adjustMasterVolume() in AudioManager andLei Zhang2012-03-222-33/+57
* | | | Fix Audio ramping codeRoboErik2012-03-221-11/+20
* | | | Merge "Use NuPlayer for media playback everywhere"Andreas Huber2012-03-2210-9/+415
|\ \ \ \
| * | | | Use NuPlayer for media playback everywhereAndreas Huber2012-03-2210-9/+415
* | | | | Merge "Remove enforceFrameCount"Glenn Kasten2012-03-221-7/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Remove enforceFrameCountGlenn Kasten2012-03-211-7/+5
* | | | | Support gapless playback for mp3 and m4aMarco Nelissen2012-03-225-6/+191
| |/ / / |/| | |
* | | | Merge "Split libmedia into libmedia and libmedia_native"Glenn Kasten2012-03-222-37/+44
|\ \ \ \ | | |/ / | |/| |
| * | | Split libmedia into libmedia and libmedia_nativeGlenn Kasten2012-03-212-37/+44
| |/ /
* | | Merge "Add MetaData::dumpToLog"Marco Nelissen2012-03-211-0/+59
|\ \ \
| * | | Add MetaData::dumpToLogMarco Nelissen2012-03-211-0/+59
* | | | Merge "Parse gapless info from mp4 files"Marco Nelissen2012-03-212-0/+49
|\ \ \ \ | |_|/ / |/| | |
| * | | Parse gapless info from mp4 filesMarco Nelissen2012-03-212-0/+49
| |/ /
* | | Merge "Update comments"Glenn Kasten2012-03-214-7/+8
|\ \ \
| * | | Update commentsGlenn Kasten2012-03-194-7/+8
| | |/ | |/|
* | | Merge "Whitespace"Glenn Kasten2012-03-211-0/+3
|\ \ \
| * | | WhitespaceGlenn Kasten2012-03-191-0/+3
* | | | Merge "Handling end times of subtitles."James Dong2012-03-207-20/+46
|\ \ \ \ | |_|_|/ |/| | |
| * | | Handling end times of subtitles.Insun Kang2012-03-217-20/+46
* | | | Merge "Move COM tag parsing to constructor"Marco Nelissen2012-03-201-27/+31
|\ \ \ \
| * | | | Move COM tag parsing to constructorMarco Nelissen2012-03-201-27/+31
* | | | | Merge "Parse mp3 encoder padding/delay"Marco Nelissen2012-03-205-17/+109
|\ \ \ \ \ | |/ / / /
| * | | | Parse mp3 encoder padding/delayMarco Nelissen2012-03-205-17/+109
* | | | | Merge "Do not set camera preview display if the surface is null."Wu-cheng Li2012-03-192-4/+14
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Do not set camera preview display if the surface is null.Wu-cheng Li2012-03-192-4/+14