summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-1755-145/+143
|\ | | | | | | Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
| * am 9b77083e: Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-1755-145/+143
| |\ | | | | | | | | | | | | * commit '9b77083e582a8b6088ac6a2cb4151dfbdd324557': Update calls to IInterface::asBinder()
| | * Merge "Update calls to IInterface::asBinder()"Marco Nelissen2014-11-1755-145/+143
| | |\
| | | * Update calls to IInterface::asBinder()Marco Nelissen2014-11-1755-145/+143
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
* | | am bb0cf4d0: am d0264109: Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'bb0cf4d079290c8885e11c310c531ece23323d61': Move libldnhncr to libc++.
| * | am d0264109: Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
| |\ \ | | |/ | | | | | | | | | * commit 'd02641098b16df2fd4cd32b72a30eb6f3b64e12b': Move libldnhncr to libc++.
| | * Merge "Move libldnhncr to libc++."Dan Albert2014-11-161-1/+0
| | |\
| | | * Move libldnhncr to libc++.Dan Albert2014-11-151-1/+0
| | |/ | | | | | | | | | | | | Bug: 15193147 Change-Id: If59c4a53a497f501881d26d58b80b11371906527
* | | am addfc718: Merge "NuPlayer: tunnel decoder with renderer for data buffer ↵Wei Jia2014-11-157-124/+205
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passing." into lmp-mr1-dev automerge: b915eeb * commit 'b915eebd82cc347b182265d4f4123b11ba3db812': NuPlayer: tunnel decoder with renderer for data buffer passing.
| * \ \ am addfc718: Merge "NuPlayer: tunnel decoder with renderer for data buffer ↵Wei Jia2014-11-157-124/+205
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passing." into lmp-mr1-dev * commit 'addfc718ff85115355060d6b07ca67b41a3765c2': NuPlayer: tunnel decoder with renderer for data buffer passing.
| | * \ \ Merge "NuPlayer: tunnel decoder with renderer for data buffer passing." into ↵Wei Jia2014-11-157-124/+205
| | |\ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | | * | | NuPlayer: tunnel decoder with renderer for data buffer passing.Wei Jia2014-11-147-124/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18342383 Change-Id: I182928007814c146c01a86196c4fda1d46e74ea4
* | | | | | am f97dfbc9: Merge "PlaylistFetcher: handle sporadic fetch erros" into ↵Robert Shih2014-11-151-27/+37
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 3db2e5a * commit '3db2e5a6bd218ba185a1387d91a974d561d304d5': PlaylistFetcher: handle sporadic fetch erros
| * | | | | am f97dfbc9: Merge "PlaylistFetcher: handle sporadic fetch erros" into ↵Robert Shih2014-11-151-27/+37
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit 'f97dfbc9e20a61e56a03058af7d947b17c48515e': PlaylistFetcher: handle sporadic fetch erros
| | * | | | Merge "PlaylistFetcher: handle sporadic fetch erros" into lmp-mr1-devRobert Shih2014-11-151-27/+37
| | |\ \ \ \
| | | * | | | PlaylistFetcher: handle sporadic fetch errosRobert Shih2014-11-131-27/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17490472 Change-Id: I2c04e2352f13db762b845f4d35db0a8b851a148c
* | | | | | | am 0ef3210f: am 14a74010: Merge "Include AudioPolicyInterface.h only when ↵Chih-Hung Hsieh2014-11-152-0/+3
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | needed." * commit '0ef3210f77799b5e0086c7a0f9244aefdf403805': Include AudioPolicyInterface.h only when needed.
| * | | | | | am 14a74010: Merge "Include AudioPolicyInterface.h only when needed."Chih-Hung Hsieh2014-11-152-0/+3
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | * commit '14a74010125880ff30386b69e21310f38008e0eb': Include AudioPolicyInterface.h only when needed.
| | * | | | | Merge "Include AudioPolicyInterface.h only when needed."Chih-Hung Hsieh2014-11-152-0/+3
| | |\ \ \ \ \
| | | * | | | | Include AudioPolicyInterface.h only when needed.Chih-Hung Hsieh2014-11-142-0/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both legacy and non-legacy AudioPolicyInterface define extern "C" functions createAudioPloicyManager and destroyAudioPloicyManager. Standard C++ does not allow overloading of extern C functions. g++ did not catch this problem but clang++ does. Change-Id: I80869cdb26e7721777e53d4eff71c5c733044abf
* | | | | | | am 339b5f77: am a82b5f57: Merge "libstagefright: use __predict_false from ↵Mark Salyzyn2014-11-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bionic rather than CONDITION from log/log.h" * commit '339b5f778354cb221e5f76c1c2a5df497301da6b': libstagefright: use __predict_false from bionic rather than CONDITION from log/log.h
| * | | | | | am a82b5f57: Merge "libstagefright: use __predict_false from bionic rather ↵Mark Salyzyn2014-11-121-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than CONDITION from log/log.h" * commit 'a82b5f575d0b7f9465cd879be04929fefd4cc5c5': libstagefright: use __predict_false from bionic rather than CONDITION from log/log.h
| | * | | | | Merge "libstagefright: use __predict_false from bionic rather than CONDITION ↵Mark Salyzyn2014-11-121-1/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | from log/log.h"
| | | * | | | | libstagefright: use __predict_false from bionic rather than CONDITION from ↵Mark Salyzyn2014-11-111-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log/log.h Change-Id: Ieb07a4f58c96326553e87dacca11e3980e283dc8
* | | | | | | am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into ↵Eric Laurent2014-11-143-30/+15
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 0e8a328 * commit '0e8a3284c6828e561f58e66a014c3b7ee37325cf': remove AudioSystem::getOutputSamplingRateForAttr()
| * | | | | | am 990dad99: Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into ↵Eric Laurent2014-11-143-30/+15
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '990dad996b748fdaa2041cc6d039e96ccfeae6fb': remove AudioSystem::getOutputSamplingRateForAttr()
| | * | | | | Merge "remove AudioSystem::getOutputSamplingRateForAttr()" into lmp-mr1-devEric Laurent2014-11-143-30/+15
| | |\ \ \ \ \
| | | * | | | | remove AudioSystem::getOutputSamplingRateForAttr()Eric Laurent2014-11-123-30/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is safer to query the output sampling rate once the output have been acquired by calling getOutputForAttr(). Bug: 16009464. Change-Id: Ib561facd19fba5359a6b837d75f1a1cd2dc51b29
* | | | | | | | am 41907c44: am cede28e2: Merge "stagefright: add runtime debug support" ↵Lajos Molnar2014-11-1411-440/+830
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '41907c44a597ceb258495715d3dd391fef2907e3': stagefright: add runtime debug support
| * | | | | | | am cede28e2: Merge "stagefright: add runtime debug support" into lmp-mr1-devLajos Molnar2014-11-1411-440/+830
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cede28e22bce0c92a6d139b51d2c007d2e3f6fca': stagefright: add runtime debug support
| | * | | | | | Merge "stagefright: add runtime debug support" into lmp-mr1-devLajos Molnar2014-11-1411-440/+830
| | |\ \ \ \ \ \
| | | * | | | | | stagefright: add runtime debug supportLajos Molnar2014-11-1211-440/+830
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18285408 Change-Id: I56346f4652b2c5f7ef5fa3003fd8676051339384
* | | | | | | | | am 08961d0b: am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode ↵Chong Zhang2014-11-142-168/+105
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for recording" into lmp-mr1-dev * commit '08961d0b57f33e0486db2ff135f0f7fa4b1a8c58': Stagefright: use MediaCodec in async mode for recording audio policy: move intializations to onFirstRef()
| * | | | | | | | am 97e6ca1a: Merge "Stagefright: use MediaCodec in async mode for recording" ↵Chong Zhang2014-11-132-168/+105
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '97e6ca1a0be83e420ab238d9a1c31d3112126646': Stagefright: use MediaCodec in async mode for recording audio policy: move intializations to onFirstRef()
| | * | | | | | | Merge "Stagefright: use MediaCodec in async mode for recording" into lmp-mr1-devChong Zhang2014-11-132-168/+105
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Stagefright: use MediaCodec in async mode for recordingPraveen Chavan2014-11-122-168/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Async mode reduces the number of messages posted between MediaCodec and MediaCodecSource. This reduces thread wakeups and helps reduce CPU utilization. Bug: 18246026 Change-Id: I4b0837f309fdd12e323c1dfa72525f5a31971a03
| | | * | | | | | merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-060-0/+0
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1cf9ad1abb599ce4057189e0db154cf00b4913f8
| | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-050-0/+0
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed1e55c5276a1c031e9b2f016387c7d2fe7bc47f
| | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-040-0/+0
| | | | | |\ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | ed1e55c5276a1c031e9b2f016387c7d2fe7bc47f
| | | | | * | | | | | merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-030-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 151b3f41ffcdf187580542ba0c0d3b84df16beed
| | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-020-0/+0
| | | | | | |\ \ \ \ \ \ | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | 151b3f41ffcdf187580542ba0c0d3b84df16beed
| | | | | | * | | | | | merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-11-010-0/+0
| | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9cfeb447356cb6334379eaf5da1e49424eb5979
| | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-300-0/+0
| | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7011ee31d65917a9e15b271942e863f06eee2da1
| | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-290-0/+0
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e8212b2a02685e50d0c093a6f44d9af636261d9
| | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-280-0/+0
| | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 701b96474dc8afd16046e440975e00be57cc4874
| | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-270-0/+0
| | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8bfa96c2f7c098550b00b84677088f84e81f4ed4
| | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-260-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8bfa96c2f7c098550b00b84677088f84e81f4ed4
| | | | | | | | | | | * | | | | | merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-250-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8bfa96c2f7c098550b00b84677088f84e81f4ed4
| | | | | | | | | | | * | | | | | merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-230-0/+0
| | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9b21bc11bfb6e77cc0f9e9a31de02342ab9d653
| | | | | | | | | | | | * \ \ \ \ \ merge in lmp-mr1-release history after reset to ↵The Android Automerger2014-10-220-0/+0
| | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 171fa1607e8bc3e94c2c9ff080777fcdf06f60d9
generated by cgit v1.1 at 2025-01-08 17:37:09 +0000