summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* audio_channel_in/out_mask_from_countGlenn Kasten2012-03-157-16/+14
* Merge "Remove dependency on audio_* location"Glenn Kasten2012-03-157-12/+12
|\
| * Remove dependency on audio_* locationGlenn Kasten2012-03-147-12/+12
* | Merge "Defines MediaPlayer APIs to support multiple audio/video/timedtext tra...James Dong2012-03-1413-136/+229
|\ \
| * | Defines MediaPlayer APIs to support multiple audio/video/timedtextInsun Kang2012-03-1513-136/+229
| |/
* | Fix Xing seeking when TOC[0] == 0Marco Nelissen2012-03-142-10/+15
|/
* Merge "Prepare frameworks/native/services/audioflinger"Glenn Kasten2012-03-141-5/+5
|\
| * Prepare frameworks/native/services/audioflingerGlenn Kasten2012-03-131-5/+5
* | Merge "Use correct syntax for #include <> """Glenn Kasten2012-03-143-7/+10
|\ \
| * | Use correct syntax for #include <> ""Glenn Kasten2012-03-133-7/+10
| |/
* | SurfaceTexture: Fully refactored from BufferQueueDaniel Lam2012-03-132-4/+8
* | Merge "Gapless playback, step 1."Marco Nelissen2012-03-135-10/+174
|\ \
| * | Gapless playback, step 1.Marco Nelissen2012-03-135-10/+174
* | | Merge "Switched to use the header files in /frameworks/native and deleted the...James Dong2012-03-1333-53/+55
|\ \ \
| * | | Switched to use the header files in /frameworks/nativeJames Dong2012-03-1233-53/+55
* | | | Whitespace and indentationGlenn Kasten2012-03-1327-153/+143
* | | | Fixing coding style : IndentationInsun Kang2012-03-132-51/+51
|/ / /
* | | Merge "Extend WAV extractor for multichannel"Jean-Michel Trivi2012-03-122-10/+73
|\ \ \ | |_|/ |/| |
| * | Extend WAV extractor for multichannelJean-Michel Trivi2012-03-092-10/+73
| |/
* | Use audio_policy_output_flags_t consistentlyGlenn Kasten2012-03-096-16/+17
* | Merge "Use AudioRecord::record_flags consistently"Glenn Kasten2012-03-092-4/+5
|\ \
| * | Use AudioRecord::record_flags consistentlyGlenn Kasten2012-03-082-4/+5
* | | am ea374096: am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbe...Conley Owens2012-03-091-4/+0
|\ \ \
| * \ \ am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify the definitio...Conley Owens2012-03-091-4/+0
| |\ \ \
| | * \ \ am 67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"Conley Owens2012-03-091-4/+0
| | |\ \ \
| | | * \ \ Merge "stagefright amrwbenc: Simplify the definition of static_vo"Conley Owens2012-03-091-4/+0
| | | |\ \ \
| | | | * | | stagefright amrwbenc: Simplify the definition of static_voMartin Storsjo2012-01-301-4/+0
* | | | | | | am 3557654c: am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes I00c852e4,I...Conley Owens2012-03-091-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028Conley Owens2012-03-091-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 6db6ea02: Merge changes I00c852e4,Ib31bf028Conley Owens2012-03-091-2/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge changes I00c852e4,Ib31bf028Conley Owens2012-03-091-2/+2
| | | |\ \ \ \
| | | | * | | | stagefright aacenc: Avoid overflows when calculating normFactorMartin Storsjo2012-02-191-1/+1
| | | | * | | | stagefright aacenc: Avoid a division by zeroMartin Storsjo2012-02-191-1/+1
| | | | |/ / /
* | | | | | | Merge "Fix memory leak when carrying ABuffer* in AMessages."Andreas Huber2012-03-091-0/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix memory leak when carrying ABuffer* in AMessages.Andreas Huber2012-03-091-0/+6
* | | | | | | Improve AudioPlayer position reportingMarco Nelissen2012-03-091-2/+7
|/ / / / / /
* | | | | | Merge "audio policy: use audio_devices_t when appropriate"Eric Laurent2012-03-082-4/+4
|\ \ \ \ \ \
| * | | | | | audio policy: use audio_devices_t when appropriateEric Laurent2012-03-082-4/+4
* | | | | | | Merge "Fix videos app bandwidth accounting for 4G streaming"Jeff Tinker2012-03-083-0/+11
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fix videos app bandwidth accounting for 4G streamingJeff Tinker2012-02-143-0/+11
* | | | | | | resolved conflicts for merge of 532679a5 to masterDirk Dougherty2012-03-071-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am 4d7bc655: Doc change: String changes for Android MarketDirk Dougherty2012-03-051-1/+1
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Doc change: String changes for Android MarketDirk Dougherty2012-03-051-1/+1
* | | | | | | Merge "IAudioFlingerClient::ioConfigChanged param2 const"Glenn Kasten2012-03-072-9/+9
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | IAudioFlingerClient::ioConfigChanged param2 constGlenn Kasten2012-03-062-9/+9
* | | | | | | Merge "Effect for multichannel PCM downmix to stereo"Jean-Michel Trivi2012-03-073-0/+1013
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Effect for multichannel PCM downmix to stereoJean-Michel Trivi2012-03-073-0/+1013
* | | | | | | Merge "MediaPlayerService: fix AudioSink latency"Eric Laurent2012-03-063-5/+9
|\ \ \ \ \ \ \
| * | | | | | | MediaPlayerService: fix AudioSink latencyEric Laurent2012-03-053-5/+9
* | | | | | | | Merge "AudioTrack: relax check on minimum buffer size"Eric Laurent2012-03-061-6/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /