summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Fix Xing seeking when TOC[0] == 0Marco Nelissen2012-03-142-10/+15
* Unhide MediaPlayer.setNextMediaPlayerMarco Nelissen2012-03-141-1/+0
* 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-137-10/+233
|\ \
| * | Gapless playback, step 1.Marco Nelissen2012-03-137-10/+233
* | | Merge "Switched to use the header files in /frameworks/native and deleted the...James Dong2012-03-1336-58/+61
|\ \ \
| * | | Switched to use the header files in /frameworks/nativeJames Dong2012-03-1236-58/+61
* | | | Whitespace and indentationGlenn Kasten2012-03-1327-153/+143
* | | | Fixing coding style : IndentationInsun Kang2012-03-132-51/+51
|/ / /
* | | Merge "Removed the include header path since it is not needed."James Dong2012-03-121-1/+0
|\ \ \
| * | | Removed the include header path since it is not needed.James Dong2012-03-121-1/+0
* | | | Merge "MediaPlayer doc for setDataSource by file pathname"Glenn Kasten2012-03-121-0/+7
|\ \ \ \
| * | | | MediaPlayer doc for setDataSource by file pathnameGlenn Kasten2012-03-091-0/+7
| | |_|/ | |/| |
* | | | Merge "Documentation/API update for MediaCodec/MediaExtractor, fixes to Media...Andreas Huber2012-03-124-12/+60
|\ \ \ \
| * | | | Documentation/API update for MediaCodec/MediaExtractor, fixes to MediaCodec.Andreas Huber2012-03-124-12/+60
| |/ / /
* | | | Hide deprecated MediaRecorder.java APIsJames Dong2012-03-121-0/+2
| |/ / |/| |
* | | 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-097-18/+20
* | 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 "Split Parcel JNI details away from Binder."Jeff Sharkey2012-03-081-0/+1
|\ \ \ \ \ \
| * | | | | | Split Parcel JNI details away from Binder.Jeff Sharkey2012-03-081-0/+1
| | |_|_|_|/ | |/| | | |
* | | | | | 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
* | | | | | | Allow multiple releases to be called on MediaActionSound.Eino-Ville Talvala2012-03-081-3/+7
* | | | | | | Merge "Changed 480p and 1080p resolution documentation"James Dong2012-03-071-1/+6
|\ \ \ \ \ \ \
| * | | | | | | Changed 480p and 1080p resolution documentationJames Dong2012-03-061-1/+6
* | | | | | | | Merge "resolved conflicts for merge of 532679a5 to master"Dirk Dougherty2012-03-071-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ resolved conflicts for merge of 532679a5 to masterDirk Dougherty2012-03-071-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |