summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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 "MediaPlayerService: fix AudioSink latency"Eric Laurent2012-03-061-0/+6
|\ \ \ \
| * | | | MediaPlayerService: fix AudioSink latencyEric Laurent2012-03-051-0/+6
* | | | | Merge "Remove unused code - MediaSourceSplitter"James Dong2012-03-062-235/+0
|\ \ \ \ \
| * | | | | Remove unused code - MediaSourceSplitterJames Dong2012-03-052-235/+0
| |/ / / /
* | | | | Merge "Remove references to sched_policy.h"Glenn Kasten2012-03-061-2/+0
|\ \ \ \ \
| * | | | | Remove references to sched_policy.hGlenn Kasten2012-03-051-2/+0
| |/ / / /
* | | | | Add channel mask in AudioSinkJean-Michel Trivi2012-03-021-6/+15
|/ / / /
* | | | Merge "Remove hacks that worked around issues in OMX components several relea...Andreas Huber2012-03-011-66/+0
|\ \ \ \
| * | | | Remove hacks that worked around issues in OMX components several releases back.Andreas Huber2012-03-011-66/+0
* | | | | am 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,I...Jean-Baptiste Queru2012-03-013-14/+43
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5Jean-Baptiste Queru2012-02-293-14/+43
| |\ \ \ \
| | * \ \ \ Merge changes I46c81dba,If1f40e9c,I652eaaa5Jean-Baptiste Queru2012-02-293-14/+43
| | |\ \ \ \
| | | * | | | stagefright aacenc: Use QDADD/QDSUB instructionsMans Rullgard2012-01-131-4/+2
| | | * | | | stagefright aacenc: Remove useless inline asm for simple right shiftMans Rullgard2012-01-131-7/+1
| | | * | | | stagefright aacenc: Use ARMv6 SSAT instructionMans Rullgard2012-01-133-3/+40
* | | | | | | am 715c78b9: am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright aacenc...Jean-Baptiste Queru2012-03-011-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"Jean-Baptiste Queru2012-02-291-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "stagefright aacenc: Safeguard against overwriting bits"Jean-Baptiste Queru2012-02-291-0/+1
| | |\ \ \ \
| | | * | | | stagefright aacenc: Safeguard against overwriting bitsMartin Storsjo2012-01-311-0/+1
* | | | | | | Instead of hardcoding OMX component names in our code, supportAndreas Huber2012-03-014-227/+580
* | | | | | | Merge "Separate the notion of "stop" from that of "release", i.e."Andreas Huber2012-02-292-54/+186
|\ \ \ \ \ \ \
| * | | | | | | Separate the notion of "stop" from that of "release", i.e.Andreas Huber2012-02-282-54/+186
* | | | | | | | Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext."James Dong2012-02-286-86/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Moves TimedTextDriver.h into include/media/stagefright/timedtext.Insun Kang2012-02-276-86/+5
* | | | | | | | am 254cf597: am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: A...Jean-Baptiste Queru2012-02-283-4/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable de...Jean-Baptiste Queru2012-02-273-4/+6
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"Jean-Baptiste Queru2012-02-273-4/+6
| | |\ \ \ \ \ \
| | | * | | | | | stagefright amr: Avoid C++/C99 for loops with variable declarationMartin Storsjo2012-02-273-4/+6
* | | | | | | | | remove dependency on unneeded headersMathias Agopian2012-02-271-2/+0
* | | | | | | | | am 19bb6261: am bf826923: am faf38b24: am 9e3d9575: Merge "stagefright aacenc...Jean-Baptiste Queru2012-02-271-0/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific imple...Jean-Baptiste Queru2012-02-271-0/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge "stagefright aacenc: Add prototypes for arm specific implementations of...Jean-Baptiste Queru2012-02-271-0/+6
| | |\ \ \ \ \ \ \
| | | * | | | | | | stagefright aacenc: Add prototypes for arm specific implementations of functionsMartin Storsjo2012-02-241-0/+6
* | | | | | | | | | am 360db46e: am b7913f70: am 163777b8: am 354ac772: Merge "stagefright amrwb:...Jean-Baptiste Queru2012-02-273-13/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 354ac772: Merge "stagefright amrwb: Make local const arrays static"Jean-Baptiste Queru2012-02-273-13/+13
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "stagefright amrwb: Make local const arrays static"Jean-Baptiste Queru2012-02-273-13/+13
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | stagefright amrwb: Make local const arrays staticMartin Storsjo2012-02-243-13/+13
| | | |/ / / / / / /
* | | | | | | | | | am 5ba910d8: am 040c5b2c: am ded8e681: am 695cfe1e: Merge "stagefright amrwb:...Jean-Baptiste Queru2012-02-271-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 695cfe1e: Merge "stagefright amrwb: Change a C++ style cast into a C style...Jean-Baptiste Queru2012-02-271-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | Merge "stagefright amrwb: Change a C++ style cast into a C style cast"Jean-Baptiste Queru2012-02-271-1/+1
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | | * | | | | | | stagefright amrwb: Change a C++ style cast into a C style castMartin Storsjo2012-02-241-1/+1
| | | |/ / / / / /
* | | | | | | | | am b205a5d8: am 50ee92e9: am d91b744d: am f7f1280e: Merge changes Ib4e27ea3,I...Jean-Baptiste Queru2012-02-2729-67/+93
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am f7f1280e: Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7Jean-Baptiste Queru2012-02-2729-67/+93
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge changes Ib4e27ea3,I4ad55266,Ie32b32c7Jean-Baptiste Queru2012-02-2729-67/+93
| | |\ \ \ \ \ \ \
| | | * | | | | | | stagefright amrnb: Remove extern from table definitionsMartin Storsjo2012-02-2424-62/+73