summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "Refactor AudioPolicyManager"Jean-Michel Trivi2015-02-191-1/+1
|\
| * Refactor AudioPolicyManagerJean-Michel Trivi2015-02-181-1/+1
* | am a7c1df10: am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-182-3/+95
|\ \
| * \ am a963dacc: am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-182-3/+95
| |\ \
| | * \ am 64753517: Merge "Add dumpsys info"Marco Nelissen2015-02-182-3/+95
| | |\ \
| | | * | Add dumpsys infoMarco Nelissen2015-02-182-3/+95
| * | | | am 5f136027: am faefd08b: Revert "DO NOT MERGE: stagefright: add support for ...Lajos Molnar2015-02-111-3/+1
| |\ \ \ \
| | * | | | Revert "DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in...Lajos Molnar2015-02-111-3/+1
| * | | | | Track change of IInterface::asBinder from instance method to static methodBrian Carlstrom2015-02-091-1/+1
* | | | | | Merge "stagefright: stop reading meta data after MDAT or MOOF"Chong Zhang2015-02-132-17/+18
|\ \ \ \ \ \
| * | | | | | stagefright: stop reading meta data after MDAT or MOOFChong Zhang2015-02-132-17/+18
* | | | | | | stagefright: add support for limiting framerate in GraphicBufferSourceRonghua Wu2015-02-129-45/+385
* | | | | | | Merge "process all SEI messages for CC extraction"Chong Zhang2015-02-124-28/+69
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | process all SEI messages for CC extractionChong Zhang2015-02-124-28/+69
| |/ / / / /
* | | | | | Track change of IInterface::asBinder from instance method to static methodBrian Carlstrom2015-02-101-1/+1
* | | | | | resolved conflicts for merge of 157defdd to masterLajos Molnar2015-02-104-2/+128
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pa...Lajos Molnar2015-02-104-2/+122
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-devLajos Molnar2015-02-104-2/+122
| | |\ \ \ \
| | | * | | | nuplayer: acquire wakelock during offload pause timeoutWeiyin Jiang2015-02-064-2/+122
* | | | | | | StageFrightRecorder: update setVideoFrameRate sanity checkZhijun He2015-02-092-1/+3
* | | | | | | am 6d5a1afa: am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing h...Lajos Molnar2015-02-09290-332/+4575
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing headers on h26...Lajos Molnar2015-02-07290-332/+4575
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "stagefright: change licensing headers on h264dec omxdl sources" into l...Lajos Molnar2015-02-07290-332/+4575
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | stagefright: change licensing headers on h264dec omxdl sourcesLajos Molnar2015-02-06290-332/+4575
* | | | | | | am 5421d5b2: am bff77217: am 17e95f40: stagefright: add media_codecs_google_v...Lajos Molnar2015-02-091-0/+108
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am bff77217: am 17e95f40: stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-071-0/+108
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-061-0/+108
* | | | | | | am a23eea5d: am 5dc38beb: am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-092-4/+21
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5dc38beb: am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-072-4/+21
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix GSM WAV playbackMarco Nelissen2015-02-062-4/+21
| | |/ / / /
| * | | | | am bdb1112d: am 35395ea6: DO NOT MERGE: stagefright: add support for Intel\'s...Lajos Molnar2015-02-071-1/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in Softwar...Lajos Molnar2015-02-061-1/+3
* | | | | | Merge "audio policy service: fix possible memory overflow"Eric Laurent2015-02-061-2/+20
|\ \ \ \ \ \
| * | | | | | audio policy service: fix possible memory overflowEric Laurent2015-02-061-2/+20
| | |_|/ / / | |/| | | |
* | | | | | am bb7ea7fd: am 29eb8045: am 99cef1ef: allow HLS streams with CLOSED-CAPTIONS...Chong Zhang2015-02-061-0/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 29eb8045: am 99cef1ef: allow HLS streams with CLOSED-CAPTIONS tag to playChong Zhang2015-02-061-0/+10
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | allow HLS streams with CLOSED-CAPTIONS tag to playChong Zhang2015-02-051-0/+10
* | | | | | resolved conflicts for merge of ca509506 to masterLajos Molnar2015-02-061-2/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 696cfefd: am 9578a90c: stagefright: add software renderer support to OMX_C...Lajos Molnar2015-02-061-4/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | stagefright: add software renderer support to OMX_COLOR_YUV420SemiPlanarLajos Molnar2015-02-051-4/+5
* | | | | | am 2b0fc07a: am c5a6db8d: am 5a52a060: stagefright: set consumer usage flags ...Lajos Molnar2015-02-062-4/+52
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c5a6db8d: am 5a52a060: stagefright: set consumer usage flags and desribe Y...Lajos Molnar2015-02-062-4/+52
| |\ \ \ \ \ | | |/ / / /
| | * | | | stagefright: set consumer usage flags and desribe YV12 HAL formatLajos Molnar2015-02-052-4/+52
* | | | | | am 78a0d1ac: am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video discon...Chong Zhang2015-02-061-1/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video discontinuity" into...Chong Zhang2015-02-061-1/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-devChong Zhang2015-02-041-1/+3
| | |\ \ \ \
| | | * | | | reuse CCDecoder on video discontinuityChong Zhang2015-02-041-1/+3
* | | | | | | am e5760862: am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for n...Lajos Molnar2015-02-062-19/+82
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for native flex-YU...Lajos Molnar2015-02-062-19/+82
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "stagefright: add fallback for native flex-YUV support" into lmp-mr1-devLajos Molnar2015-02-042-19/+82
| | |\ \ \ \