summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 205d7249 to masterMarco Nelissen2012-11-161-1/+1
|\
| * am da33d66e: Merge "Add .mpga to acceptable file name extensions list."Marco Nelissen2012-11-161-1/+1
| |\
| | * Merge "Add .mpga to acceptable file name extensions list."Marco Nelissen2012-11-161-1/+1
| | |\
| | | * Add .mpga to acceptable file name extensions list.Jan Bjernler2012-11-161-1/+1
| | |/
* | | Merge "Add GSM 6.10 decoder"Marco Nelissen2012-11-1612-11/+606
|\ \ \
| * | | Add GSM 6.10 decoderMarco Nelissen2012-11-1612-11/+606
* | | | Merge "Use size_t for frame counts"Glenn Kasten2012-11-1614-77/+89
|\ \ \ \
| * | | | Use size_t for frame countsGlenn Kasten2012-11-1514-77/+89
* | | | | Merge "Static AudioTrack plays twice initially"Glenn Kasten2012-11-151-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Static AudioTrack plays twice initiallyGlenn Kasten2012-11-151-1/+1
* | | | | Merge "wfd sink update."Andreas Huber2012-11-151-1/+4
|\ \ \ \ \
| * | | | | wfd sink update.Andreas Huber2012-11-151-1/+4
* | | | | | The length information of the chunks making up vorbis codec specific infoAndreas Huber2012-11-152-15/+61
|/ / / / /
* | | | | Merge "Stagefright command line tool: input file name last"Jean-Michel Trivi2012-11-151-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Stagefright command line tool: input file name lastJean-Michel Trivi2012-11-121-3/+3
* | | | | Clean up frame size in AudioTrack and AudioFlingerGlenn Kasten2012-11-144-31/+26
* | | | | Use uint32_t for sample rateGlenn Kasten2012-11-1413-42/+44
* | | | | Merge "Update audio comments"Glenn Kasten2012-11-145-7/+19
|\ \ \ \ \
| * | | | | Update audio commentsGlenn Kasten2012-11-145-7/+19
* | | | | | Merge "Remove deprecated AudioSystem methods"Glenn Kasten2012-11-142-16/+0
|\ \ \ \ \ \
| * | | | | | Remove deprecated AudioSystem methodsGlenn Kasten2012-11-132-16/+0
| |/ / / / /
* | | | | | Merge "Fix build warnings"Glenn Kasten2012-11-142-2/+2
|\ \ \ \ \ \
| * | | | | | Fix build warningsGlenn Kasten2012-11-142-2/+2
| |/ / / / /
* | | | | | Merge changes I2ce3479d,Ibb56664dMathias Agopian2012-11-142-50/+64
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | more optimizations...Mathias Agopian2012-11-102-16/+18
| * | | | | refactor code to improve neon codeMathias Agopian2012-11-102-34/+46
* | | | | | am dbb74f4e: am f0937247: Merge "Properly signal an error if codec configurat...Andreas Huber2012-11-141-1/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am f0937247: Merge "Properly signal an error if codec configuration goes wron...Andreas Huber2012-11-141-1/+6
| |\ \ \ \ \
| | * \ \ \ \ Merge "Properly signal an error if codec configuration goes wrong." into jb-m...Andreas Huber2012-11-141-1/+6
| | |\ \ \ \ \
| | | * | | | | Properly signal an error if codec configuration goes wrong.Andreas Huber2012-11-141-1/+6
* | | | | | | | am 911d5f93: am 0224bf17: Various improvements of wifi display codeAndreas Huber2012-11-1416-302/+633
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | |
| * | | | | | am 0224bf17: Various improvements of wifi display codeAndreas Huber2012-11-1416-302/+633
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | |
| | * | | | Various improvements of wifi display codeAndreas Huber2012-11-1316-302/+633
| | |/ / /
* | | | | Merge "Rename TrackBase::mFrameCount to mStepCount"Glenn Kasten2012-11-132-9/+10
|\ \ \ \ \
| * | | | | Rename TrackBase::mFrameCount to mStepCountGlenn Kasten2012-11-132-9/+10
* | | | | | Simplify AudioRecord::restoreTrack_l()Glenn Kasten2012-11-132-54/+44
|/ / / / /
* | | | | Merge "Move frame size out of the control block"Glenn Kasten2012-11-137-57/+63
|\ \ \ \ \
| * | | | | Move frame size out of the control blockGlenn Kasten2012-11-127-57/+63
* | | | | | Scan .awb files tooMarco Nelissen2012-11-121-1/+1
|/ / / / /
* | | | | Fix regression for AudioTrack::write() 8-bit PCMGlenn Kasten2012-11-121-1/+1
| |_|/ / |/| | |
* | | | Merge "Move buffers pointer out of the control block"Glenn Kasten2012-11-087-15/+19
|\ \ \ \
| * | | | Move buffers pointer out of the control blockGlenn Kasten2012-11-087-15/+19
* | | | | NEON optimized SINC resamplerMathias Agopian2012-11-082-11/+166
* | | | | minor cleanupsMathias Agopian2012-11-081-41/+39
|/ / / /
* | | | Simplify AudioTrack::restoreTrack_l()Glenn Kasten2012-11-083-93/+72
* | | | Merge "Add all-channel AudioTrack::setVolume() API"Glenn Kasten2012-11-083-9/+9
|\ \ \ \
| * | | | Add all-channel AudioTrack::setVolume() APIGlenn Kasten2012-11-053-9/+9
* | | | | Merge "Fix call to restoreTrack_l() without lock held"Glenn Kasten2012-11-082-0/+13
|\ \ \ \ \
| * | | | | Fix call to restoreTrack_l() without lock heldGlenn Kasten2012-11-072-0/+13
* | | | | | Remove CBLK_DIRECTION from control block flagsGlenn Kasten2012-11-075-44/+71
|/ / / / /