summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Track change of IInterface::asBinder from instance method to static methodBrian Carlstrom2015-02-091-1/+1
| | | | Change-Id: Iee262d4223ec3c61dab5ca8d9d7e4a14795da1c3
* am 4fc5d758: am 0c11f31b: Merge "nuplayer: acquire wakelock during offload ↵Lajos Molnar2015-02-105-2/+190
|\ | | | | | | | | | | | | pause timeout" into lmp-mr1-dev * commit '4fc5d758d6722bedf341e5d93a0ba5698c658c29': nuplayer: acquire wakelock during offload pause timeout
| * am 0c11f31b: Merge "nuplayer: acquire wakelock during offload pause timeout" ↵Lajos Molnar2015-02-105-2/+190
| |\ | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '0c11f31b610534754f48b40d0a6ccdd311d43fcf': nuplayer: acquire wakelock during offload pause timeout
| | * Merge "nuplayer: acquire wakelock during offload pause timeout" into lmp-mr1-devLajos Molnar2015-02-105-2/+190
| | |\
| | | * nuplayer: acquire wakelock during offload pause timeoutWeiyin Jiang2015-02-065-2/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hold a wakelock while paused in audio offload mode, until audio teardown event is received, or pause is canceled. Since ARM cores are sleeping, the delayed AMessage will not be received, and the audio output driver will not be closed. This blocks XO shutdown. Bug: 19297092 Change-Id: I3d11fef633e3f2783f4aa31e71285e2fa09d234c
* | | | am 6d5a063d: am 0c11001c: Merge "stagefright: change licensing headers on ↵Lajos Molnar2015-02-07290-332/+4575
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | h264dec omxdl sources" into lmp-mr1-dev * commit '6d5a063de358312e6d133f8937ffb1b795116129': stagefright: change licensing headers on h264dec omxdl sources
| * | | am 0c11001c: Merge "stagefright: change licensing headers on h264dec omxdl ↵Lajos Molnar2015-02-07290-332/+4575
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | sources" into lmp-mr1-dev * commit '0c11001c58526cddc7f6135982f456fff6e34aeb': stagefright: change licensing headers on h264dec omxdl sources
| | * | Merge "stagefright: change licensing headers on h264dec omxdl sources" into ↵Lajos Molnar2015-02-07290-332/+4575
| | |\ \ | | | |/ | | |/| | | | | lmp-mr1-dev
| | | * stagefright: change licensing headers on h264dec omxdl sourcesLajos Molnar2015-02-06290-332/+4575
| | | | | | | | | | | | | | | | | | | | Bug: 19030684 Change-Id: I6d4674fad126c26d3b6819fde91277a92dfd8862
* | | | am bff77217: am 17e95f40: stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-071-0/+108
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'bff7721722138b652e9a8f38e9d36a0ea12c38f1': stagefright: add media_codecs_google_video_le.xml
| * | | am 17e95f40: stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-071-0/+108
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '17e95f40a534101e2df48f077a8029430adef6c3': stagefright: add media_codecs_google_video_le.xml
| | * | stagefright: add media_codecs_google_video_le.xmlLajos Molnar2015-02-061-0/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used by low-end devices Bug: 19027495 Change-Id: I2cf90bf5a9a95b3f38c32eef2a950c9e33c70a7a
* | | | am 5dc38beb: am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-072-4/+21
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5dc38bebd45edbcc17b2f5cf3c3b2929b5842f3c': Fix GSM WAV playback
| * | | am 41d3f579: Fix GSM WAV playbackMarco Nelissen2015-02-062-4/+21
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '41d3f579d2c166984958263533284209b90c87d5': Fix GSM WAV playback
| | * | Fix GSM WAV playbackMarco Nelissen2015-02-062-4/+21
| | |/ | | | | | | | | | | | | Bug:19289381 Change-Id: If7bbf1ecf1cb8796188e61bc2c42f8a099510424
* | | am bdb1112d: am 35395ea6: DO NOT MERGE: stagefright: add support for ↵Lajos Molnar2015-02-071-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | Intel\'s YUV420SP format in SoftwareRenderer * commit 'bdb1112d2c9a818d34094e58c74055131fc27f45': DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer
| * | am 35395ea6: DO NOT MERGE: stagefright: add support for Intel\'s YUV420SP ↵Lajos Molnar2015-02-061-1/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | format in SoftwareRenderer * commit '35395ea6ad11824a4a89cc1ab9ee84f936188296': DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in SoftwareRenderer
| | * DO NOT MERGE: stagefright: add support for Intel's YUV420SP format in ↵Lajos Molnar2015-02-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | SoftwareRenderer This seems to have the same layout as OMX_COLOR_FormatYUV420SemiPlanar Bug: 19246722 Change-Id: Ief41bfaf997426a6900c3632dadaf8f4a6a38baf
* | | am 29eb8045: am 99cef1ef: allow HLS streams with CLOSED-CAPTIONS tag to playChong Zhang2015-02-061-0/+10
|\ \ \ | |/ / | | | | | | | | | * commit '29eb804501a993ecdd4d1073240f2998264508ff': allow HLS streams with CLOSED-CAPTIONS tag to play
| * | am 99cef1ef: allow HLS streams with CLOSED-CAPTIONS tag to playChong Zhang2015-02-061-0/+10
| |\ \ | | |/ | | | | | | | | | * commit '99cef1ef1cf1232966fabf3793ce7964c01474d7': allow HLS streams with CLOSED-CAPTIONS tag to play
| | * allow HLS streams with CLOSED-CAPTIONS tag to playChong Zhang2015-02-051-0/+10
| | | | | | | | | | | | | | | bug: 19284568 Change-Id: I2ccf1c5952c13d1332b6a91f967af0bd3ee67451
* | | am 696cfefd: am 9578a90c: stagefright: add software renderer support to ↵Lajos Molnar2015-02-061-4/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | OMX_COLOR_YUV420SemiPlanar * commit '696cfefd49335fef13414d52daa95544298359e5': stagefright: add software renderer support to OMX_COLOR_YUV420SemiPlanar
| * | am 9578a90c: stagefright: add software renderer support to ↵Lajos Molnar2015-02-051-4/+5
| |\ \ | | |/ | | | | | | | | | | | | | | | OMX_COLOR_YUV420SemiPlanar * commit '9578a90c214e430334b8696999f921290c35d067': stagefright: add software renderer support to OMX_COLOR_YUV420SemiPlanar
| | * stagefright: add software renderer support to OMX_COLOR_YUV420SemiPlanarLajos Molnar2015-02-051-4/+5
| | | | | | | | | | | | | | | Bug: 19179927 Change-Id: I3accaa655e9bad2b0efcac98c5dd95a23f8d6671
* | | am c5a6db8d: am 5a52a060: stagefright: set consumer usage flags and desribe ↵Lajos Molnar2015-02-062-4/+52
|\ \ \ | |/ / | | | | | | | | | | | | | | | YV12 HAL format * commit 'c5a6db8de459f25c72b0ca7b55942ddd4f90b1a8': stagefright: set consumer usage flags and desribe YV12 HAL format
| * | am 5a52a060: stagefright: set consumer usage flags and desribe YV12 HAL formatLajos Molnar2015-02-052-4/+52
| |\ \ | | |/ | | | | | | | | | * commit '5a52a060fcbe4804bcf4f61b8a457fe0e18a9014': stagefright: set consumer usage flags and desribe YV12 HAL format
| | * stagefright: set consumer usage flags and desribe YV12 HAL formatLajos Molnar2015-02-052-4/+52
| | | | | | | | | | | | | | | | | | | | | Bug: 17906609 Bug: 19179288 Bug: 19179927 Change-Id: I3713d4e894d3350d46e25dc0206b21c0ff3b9009
* | | am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video discontinuity" ↵Chong Zhang2015-02-061-1/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '04d2804a212c2625425cb23b2b778ab4f3683769': reuse CCDecoder on video discontinuity
| * | am 13cfe85a: Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-devChong Zhang2015-02-051-1/+3
| |\ \ | | |/ | | | | | | | | | * commit '13cfe85ae9f4daab1d0bfcd248fc2576585e259a': reuse CCDecoder on video discontinuity
| | * 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
| | | | | | | | | | | | | | | | | | | | bug: 19266084 Change-Id: I06ef57b09b048a85f77be4dee27599c4f60aacc9
* | | | am bcd22f0f: am 0662f5b0: Merge "stagefright: add fallback for native ↵Lajos Molnar2015-02-063-20/+83
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | flex-YUV support" into lmp-mr1-dev * commit 'bcd22f0f3a4cd5f78e03af23aafadb2d1aec6794': stagefright: add fallback for native flex-YUV support
| * | | am 0662f5b0: Merge "stagefright: add fallback for native flex-YUV support" ↵Lajos Molnar2015-02-053-20/+83
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '0662f5b0c43fcfdf055704d02ea41202c9b6094a': stagefright: add fallback for native flex-YUV support
| | * | Merge "stagefright: add fallback for native flex-YUV support" into lmp-mr1-devLajos Molnar2015-02-043-20/+83
| | |\ \
| | | * | stagefright: add fallback for native flex-YUV supportLajos Molnar2015-02-043-20/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use software renderer if codec cannot support flex-YUV on a surface Bug: 17906609 Change-Id: I3d0e3ff5fee7d7b3e2416892968fa18f6139598a
* | | | | am a291dabc: am 6fbcf633: Merge "httplive: Set start time and segment start ↵Robert Shih2015-02-042-6/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | time in conjunction." into lmp-mr1-dev * commit 'a291dabcab10cafc1749d1d9493d269049502256': httplive: Set start time and segment start time in conjunction.
| * | | | am 6fbcf633: Merge "httplive: Set start time and segment start time in ↵Robert Shih2015-02-042-6/+14
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | conjunction." into lmp-mr1-dev * commit '6fbcf6331abfbbc935bf89332f84303733e578b2': httplive: Set start time and segment start time in conjunction.
| | * | | Merge "httplive: Set start time and segment start time in conjunction." into ↵Robert Shih2015-02-042-6/+14
| | |\ \ \ | | | |/ / | | |/| | | | | | | lmp-mr1-dev
| | | * | httplive: Set start time and segment start time in conjunction.Robert Shih2015-02-042-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add comments describing how start time and segment start time are used. Based on AOSP CL https://android-review.googlesource.com/127653 by Joakim Johansson <joakim.c.johansson@sonymobile.com> but uses the lowest segment start time instead of highest. Bug: 18821145 Change-Id: I14cf1186d0daf517a24e8423c3a708b4c9ba06c4
* | | | | am 7b66f713: am 57f75272: Merge "stagefright: add support for native ↵Lajos Molnar2015-02-043-40/+95
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | flex-YUV formats" into lmp-mr1-dev * commit '7b66f713fc53ee81453763788c02f3c741d19520': stagefright: add support for native flex-YUV formats
| * | | | am 57f75272: Merge "stagefright: add support for native flex-YUV formats" ↵Lajos Molnar2015-02-043-40/+95
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '57f75272fcd16b205ed60cdd0b33ffc19991fd10': stagefright: add support for native flex-YUV formats
| | * | | Merge "stagefright: add support for native flex-YUV formats" into lmp-mr1-devLajos Molnar2015-02-043-40/+95
| | |\ \ \
| | | * | | stagefright: add support for native flex-YUV formatsLajos Molnar2015-02-043-40/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17906609 Change-Id: I14116796eaa94aa8ae62dcc29f67cb7d2c060d34
* | | | | | am 6a025acb: am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."Elliott Hughes2015-02-0414-54/+54
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a025acb630a3ac4a84715d188aeb48f1946bc3f': Move AString's StringPrintf out of the way.
| * \ \ \ \ \ am ec0472ba: Merge "Move AString\'s StringPrintf out of the way."Elliott Hughes2015-02-0414-54/+54
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec0472ba9c1cfaee293636536f3951c0e6e671b4': Move AString's StringPrintf out of the way.
| | * \ \ \ \ \ Merge "Move AString's StringPrintf out of the way."Elliott Hughes2015-02-0414-54/+54
| | |\ \ \ \ \ \
| | | * | | | | | Move AString's StringPrintf out of the way.Elliott Hughes2015-02-0414-54/+54
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should come back and replace AString with std::string and switch to the "real" StringPrintf family, but this fixes the ODR violation that was preventing us from booting. Bug: 19265750 Change-Id: I798eb9ca5dd634e44625af5e583439ef9f0cdc35
* | | | | | | | am 5d46bd54: am 3ae5f313: audiopolicy: send device connect notification to HALsEric Laurent2015-02-041-2/+15
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '5d46bd54a279f24d0476b83947ce29e786b5c72c': audiopolicy: send device connect notification to HALs
| * | | | | | | am 3ae5f313: audiopolicy: send device connect notification to HALsEric Laurent2015-02-041-2/+15
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | * commit '3ae5f31393609b7fa92f24132c66e9a8c9244a45': audiopolicy: send device connect notification to HALs
| | * | | | | | audiopolicy: send device connect notification to HALsEric Laurent2015-02-041-2/+15
| | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Device disconnect notifications are sent from audiopolicy to the HALs. Send connect notifications as well. Bug: 19249796. Bug: 17785277. Change-Id: Ia823ed154d6a0c7ceb84b0a94f0c3b78392faaf6