summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | am 66da3fdc: am 972efafb: am 6db6ea02: Merge changes I00c852e4,Ib31bf028Conley 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
* | | | | | | | | | Merge "Replace hard-coded 3 by FCC_2 to simplify searches"Glenn Kasten2012-03-092-4/+13
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Replace hard-coded 3 by FCC_2 to simplify searchesGlenn Kasten2012-03-082-4/+13
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge "Improve AudioPlayer position reporting"Marco Nelissen2012-03-091-2/+7
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Improve AudioPlayer position reportingMarco Nelissen2012-03-091-2/+7
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | fix EOS handling in codec test.Andreas Huber2012-03-091-27/+30
|/ / / / / / /
* | | | | | | Merge "Don't ask policy manager about invalid stream type"Glenn Kasten2012-03-091-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Don't ask policy manager about invalid stream typeGlenn Kasten2012-03-071-1/+1
* | | | | | | | Merge "AudioPolicyService InputDesc minor cleanup"Glenn Kasten2012-03-092-9/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | AudioPolicyService InputDesc minor cleanupGlenn Kasten2012-03-082-9/+7
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "audio policy: use audio_devices_t when appropriate"Eric Laurent2012-03-086-9/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | audio policy: use audio_devices_t when appropriateEric Laurent2012-03-086-9/+11
* | | | | | | | | 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
* | | | | | | | | Merge changes I140d291e,Id443ec5cMathias Agopian2012-03-087-584/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove files that moved to frameworks/nativeMathias Agopian2012-03-077-584/+0
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge "Added better codec statistics to evaluate performance."Andreas Huber2012-03-081-31/+73
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added better codec statistics to evaluate performance.Andreas Huber2012-03-071-31/+73
* | | | | | | | | | Mixer status cleanupGlenn Kasten2012-03-082-33/+25
* | | | | | | | | | Merge "Cleanup DirectOutputThread::mActiveTrack"Glenn Kasten2012-03-082-17/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Cleanup DirectOutputThread::mActiveTrackGlenn Kasten2012-03-072-17/+7
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | am 391bb522: am 859717ad: am 4d7bc655: Doc change: String changes for Android...Dirk Dougherty2012-03-070-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | am 859717ad: am 4d7bc655: Doc change: String changes for Android MarketDirk Dougherty2012-03-050-0/+0
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | am 4d7bc655: Doc change: String changes for Android MarketDirk Dougherty2012-03-051-1/+1
| | |\ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ 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-076-14/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | IAudioFlingerClient::ioConfigChanged param2 constGlenn Kasten2012-03-066-14/+14
* | | | | | | | | | Merge "Isolate references to outputTracks/mOutputTracks"Glenn Kasten2012-03-072-19/+24
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Isolate references to outputTracks/mOutputTracksGlenn Kasten2012-03-072-19/+24
* | | | | | | | | | 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 "Make applyVolume private to DirectOutputThread"Glenn Kasten2012-03-072-9/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make applyVolume private to DirectOutputThreadGlenn Kasten2012-03-072-9/+4
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge "Add comments about sequence for setting parameters"Glenn Kasten2012-03-071-0/+24
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add comments about sequence for setting parametersGlenn Kasten2012-03-061-0/+24
* | | | | | | | | | Merge the calls to prepareTracks_lGlenn Kasten2012-03-072-29/+14
| |_|/ / / / / / / |/| | | | | | | |
* | | | | | | | | Merge "Rename fields of AudioSessionRef"Glenn Kasten2012-03-062-20/+19
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Rename fields of AudioSessionRefGlenn Kasten2012-03-062-20/+19
* | | | | | | | | Merge "Fix indentation for re-organized code"Glenn Kasten2012-03-061-236/+236
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix indentation for re-organized codeGlenn Kasten2012-03-061-236/+236
| |/ / / / / / / /
* | | | | | | | | Merge "Rename updateWaitTime since a lock is held"Glenn Kasten2012-03-062-8/+9
|\ \ \ \ \ \ \ \ \