summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Refactor AudioPolicyManagerJean-Michel Trivi2015-02-181-1/+1
* 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
| | |\ \
| | | * | stagefright: add fallback for native flex-YUV supportLajos Molnar2015-02-042-19/+82
* | | | | Merge "opus: Support for > 2 channels"Vignesh Venkatasubramanian2015-02-052-3/+31
|\ \ \ \ \
| * | | | | opus: Support for > 2 channelsVignesh Venkatasubramanian2015-01-262-3/+31
* | | | | | Add additional info to AudioPort for enum/selection API.Paul McLean2015-02-052-5/+13
* | | | | | Merge "mediaplayer: Add MediaClock component and use it in NuPlayerRenderer."Wei Jia2015-02-045-295/+396
|\ \ \ \ \ \
| * | | | | | mediaplayer: Add MediaClock component and use it in NuPlayerRenderer.Wei Jia2015-02-035-295/+396
* | | | | | | am 7dbbc7ec: am a291dabc: am 6fbcf633: Merge "httplive: Set start time and se...Robert Shih2015-02-042-6/+14
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | am a291dabc: am 6fbcf633: Merge "httplive: Set start time and segment start t...Robert Shih2015-02-042-6/+14
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge "httplive: Set start time and segment start time in conjunction." into ...Robert Shih2015-02-042-6/+14
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | httplive: Set start time and segment start time in conjunction.Robert Shih2015-02-042-6/+14
* | | | | | | am 3b5d1195: am 7b66f713: am 57f75272: Merge "stagefright: add support for na...Lajos Molnar2015-02-042-36/+90
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 7b66f713: am 57f75272: Merge "stagefright: add support for native flex-YUV...Lajos Molnar2015-02-042-36/+90
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | stagefright: add support for native flex-YUV formatsLajos Molnar2015-02-042-36/+90