summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Starhub RTSP apparently does not establish time on all tracks"Andreas Huber2012-01-201-1/+29
|\
| * Starhub RTSP apparently does not establish time on all tracksAndreas Huber2012-01-201-1/+29
* | Merge "Fix typos in string constants"Glenn Kasten2012-01-201-1/+1
|\ \
| * | Fix typos in string constantsGlenn Kasten2012-01-191-1/+1
* | | Merge "Remove redundant get()"Glenn Kasten2012-01-203-4/+4
|\ \ \
| * | | Remove redundant get()Glenn Kasten2012-01-203-4/+4
| |/ /
* | | Merge "Move memcpy_to_i16_from_u8 to audio_utils"Glenn Kasten2012-01-201-13/+5
|\ \ \
| * | | Move memcpy_to_i16_from_u8 to audio_utilsGlenn Kasten2012-01-171-13/+5
* | | | Merge "Remove dead setRingerMode(mode, mask)"Glenn Kasten2012-01-203-27/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove dead setRingerMode(mode, mask)Glenn Kasten2012-01-183-27/+1
* | | | Merge "Don't need to link to libsqlite from media JNI library."Jeff Brown2012-01-191-1/+0
|\ \ \ \
| * | | | Don't need to link to libsqlite from media JNI library.Jeff Brown2012-01-191-1/+0
* | | | | Remove obsolete TODO commentsJames Dong2012-01-196-139/+4
* | | | | Make sure the ThrottledSource reports the proper mime typeAndreas Huber2012-01-191-0/+5
| |_|_|/ |/| | |
* | | | Merge "Fix incorrect includes of AudioTrack.h"Glenn Kasten2012-01-194-4/+2
|\ \ \ \
| * | | | Fix incorrect includes of AudioTrack.hGlenn Kasten2012-01-184-4/+2
| | |/ / | |/| |
* | | | Merge "Simplify range check for audio_mode_t (continued)"Glenn Kasten2012-01-191-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Simplify range check for audio_mode_t (continued)Glenn Kasten2012-01-181-0/+1
| |/ /
* | | Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former sign...Andreas Huber2012-01-182-0/+29
|\ \ \
| * | | Temporarily restore AudioSystem/AudioTrack APIs with their former signaturesAndreas Huber2012-01-182-0/+29
| |/ /
* | | Merge "AVIExtractor: adding a H264 fourCC which is also specified in the refe...Andreas Huber2012-01-181-0/+1
|\ \ \
| * | | AVIExtractor: adding a H264 fourCC which is also specified in the reference.Dongwon Kang2012-01-151-0/+1
* | | | Merge "Make sure seek triggers a reconnect if needed."Bryan Mawhinney2012-01-181-2/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Make sure seek triggers a reconnect if needed.Bryan Mawhinney2012-01-181-2/+3
* | | | Merge "Track volume cleanup"Glenn Kasten2012-01-181-1/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Track volume cleanupGlenn Kasten2012-01-171-1/+0
| | |/ | |/|
* | | Merge "audio framework: manage stream volume per device"Eric Laurent2012-01-174-127/+363
|\ \ \ | |/ / |/| |
| * | audio framework: manage stream volume per deviceEric Laurent2012-01-174-127/+363
* | | Move fixed_fft to system/media/audio_utilsGlenn Kasten2012-01-173-168/+5
* | | Merge "Use audio_mode_t consistently"Glenn Kasten2012-01-173-6/+6
|\ \ \
| * | | Use audio_mode_t consistentlyGlenn Kasten2012-01-123-6/+6
* | | | Rename Visualizer::mLockGlenn Kasten2012-01-171-4/+4
| |/ / |/| |
* | | Merge "Use size_t for frame size"Glenn Kasten2012-01-172-4/+4
|\ \ \
| * | | Use size_t for frame sizeGlenn Kasten2012-01-132-4/+4
* | | | Merge "Use audio_stream_type_t consistently"Glenn Kasten2012-01-1714-64/+64
|\ \ \ \
| * | | | Use audio_stream_type_t consistentlyGlenn Kasten2012-01-1314-64/+64
* | | | | Merge "AudioTrack and AudioFlinger send level cleanup"Glenn Kasten2012-01-171-5/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | AudioTrack and AudioFlinger send level cleanupGlenn Kasten2012-01-131-5/+5
| |/ / /
* | | | Merge "media/mtp: Add missing LOCAL_C_INCLUDES"David 'Digit' Turner2012-01-131-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | media/mtp: Add missing LOCAL_C_INCLUDESDavid 'Digit' Turner2012-01-131-0/+3
* | | | am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Re...Jean-Baptiste Queru2012-01-13133-5071/+5071
|\ \ \ \ | |_|/ / |/| | |
| * | | am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing...Jean-Baptiste Queru2012-01-13133-5071/+5071
| |\ \ \
| | * | | stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2012-01-12133-5071/+5071
* | | | | Merge "Separate sniffing from session initialization"James Dong2012-01-1211-32/+82
|\ \ \ \ \
| * | | | | Separate sniffing from session initializationJames Dong2012-01-1211-32/+82
| | |_|/ / | |/| | |
* | | | | Merge "Use audio_format_t consistently"Glenn Kasten2012-01-128-36/+36
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Use audio_format_t consistentlyGlenn Kasten2012-01-058-36/+36
* | | | | Merge "MediaScanner: Disable bulk insert for settings"Marco Nelissen2012-01-121-21/+33
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | MediaScanner: Disable bulk insert for settingsSungsoo Lim2012-01-111-21/+33
* | | | | libmedia new can't fail on AndroidGlenn Kasten2012-01-116-28/+1