summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Update commentsGlenn Kasten2012-03-194-7/+8
* Merge "audio_channel_in/out_mask_from_count"Glenn Kasten2012-03-197-16/+14
|\
| * audio_channel_in/out_mask_from_countGlenn Kasten2012-03-157-16/+14
* | Merge "ACodec is a little more aggressive in its error checking now."Andreas Huber2012-03-164-8/+27
|\ \
| * | ACodec is a little more aggressive in its error checking now.Andreas Huber2012-03-164-8/+27
* | | Merge "Remove obsolete software codec header files and amr encoders."Andreas Huber2012-03-1615-1298/+0
|\ \ \
| * | | Remove obsolete software codec header files and amr encoders.Andreas Huber2012-03-1615-1298/+0
| |/ /
* | | Merge "Skip XING/VBRI frame when decoding"Marco Nelissen2012-03-163-107/+59
|\ \ \
| * | | Skip XING/VBRI frame when decodingMarco Nelissen2012-03-163-107/+59
* | | | am 97824b70: am aa1bd6de: am d8cc1421: am 42c6d163: Merge "Add empty libmedia...Glenn Kasten2012-03-161-0/+11
|\ \ \ \
| * \ \ \ am d8cc1421: am 42c6d163: Merge "Add empty libmedia_native in old location"Glenn Kasten2012-03-161-0/+11
| |\ \ \ \
| | * \ \ \ am 42c6d163: Merge "Add empty libmedia_native in old location"Glenn Kasten2012-03-151-0/+11
| | |\ \ \ \
| | | * | | | Add empty libmedia_native in old locationGlenn Kasten2012-03-151-0/+11
* | | | | | | Merge "Remove obsolete OMXComponentBase class"Andreas Huber2012-03-163-298/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove obsolete OMXComponentBase classAndreas Huber2012-03-163-298/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Fix a bug in MediaPlayer's addExternalSource().Insun Kang2012-03-162-17/+4
|/ / / / / /
* | | | | | Merge "Add a new camera open API that allows taking the ownership."Wu-cheng Li2012-03-151-1/+1
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add a new camera open API that allows taking the ownership.Wu-cheng Li2012-03-151-1/+1
* | | | | | 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
| | | | |/ / /