summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Turned off log spamming from DrmPassthruPluginJames Dong2012-03-131-28/+28
* Fix bug where mMixerStatus was set to IDLEGlenn Kasten2012-03-121-2/+1
* Inline applyVolume() into threadLoop_mix()Glenn Kasten2012-03-122-80/+73
* Merge "Remove unnecessary friend declarations"Glenn Kasten2012-03-121-42/+10
|\
| * Remove unnecessary friend declarationsGlenn Kasten2012-03-091-42/+10
* | Merge "Remove virtual from methods that don't need it"Glenn Kasten2012-03-122-3/+6
|\ \
| * | Remove virtual from methods that don't need itGlenn Kasten2012-03-092-3/+6
| |/
* | Merge "Merge dup code at thread entry and param change"Glenn Kasten2012-03-122-52/+81
|\ \
| * | Merge dup code at thread entry and param changeGlenn Kasten2012-03-122-52/+81
* | | Merge "Extend WAV extractor for multichannel"Jean-Michel Trivi2012-03-122-10/+73
|\ \ \
| * | | Extend WAV extractor for multichannelJean-Michel Trivi2012-03-092-10/+73
* | | | Merge "Avoid checking supported mime types or file suffixes in multiple places"James Dong2012-03-123-53/+55
|\ \ \ \ | |_|/ / |/| | |
| * | | Avoid checking supported mime types or file suffixes in multiple placesJames Dong2012-03-093-53/+55
| | |/ | |/|
* | | Merge "Added an failure log message when the fwdlock engine fails to open a g...James Dong2012-03-091-1/+8
|\ \ \
| * | | Added an failure log message when the fwdlock engine fails to open a given file.James Dong2012-03-091-1/+8
| |/ /
* | | Use audio_policy_output_flags_t consistentlyGlenn Kasten2012-03-0910-25/+27
* | | Merge "Use AudioRecord::record_flags consistently"Glenn Kasten2012-03-093-7/+10
|\ \ \
| * | | Use AudioRecord::record_flags consistentlyGlenn Kasten2012-03-083-7/+10
* | | | am ea374096: am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbe...Conley Owens2012-03-091-4/+0
|\ \ \ \
| * \ \ \ am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright amrwbenc: Simplify ...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 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