summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Update Policy PFW plugin makefile for PFW release 2.6.0" into mnc-devJean-Michel Trivi2015-07-161-6/+1
|\
| * Update Policy PFW plugin makefile for PFW release 2.6.0François Gaffie2015-07-151-6/+1
* | Merge "libstagefright: remove CHECK from SoftHEVC ctor." into mnc-devRonghua Wu2015-07-162-2/+12
|\ \
| * | libstagefright: remove CHECK from SoftHEVC ctor.Ronghua Wu2015-07-142-2/+12
* | | Merge "Revert "Camera2Client: handle slower jpeg stream sensor"" into mnc-devZhijun He2015-07-165-145/+18
|\ \ \
| * | | Revert "Camera2Client: handle slower jpeg stream sensor"Zhijun He2015-07-165-145/+18
* | | | Merge "mediaplayer: fix audio attributes override by stream type" into mnc-devEric Laurent2015-07-163-11/+31
|\ \ \ \
| * | | | mediaplayer: fix audio attributes override by stream typeEric Laurent2015-07-153-11/+31
* | | | | Merge "Camera2Client: handle slower jpeg stream sensor" into mnc-devYin-Chia Yeh2015-07-155-18/+145
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Camera2Client: handle slower jpeg stream sensorYin-Chia Yeh2015-07-145-18/+145
* | | | | Merge "NuPlayer: fix handling of teardown event during flushing or shutting d...Wei Jia2015-07-151-4/+24
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | NuPlayer: fix handling of teardown event during flushing or shutting down.Wei Jia2015-07-151-4/+24
* | | | | Merge "NuPlayer: pull more video buffers in advance in GenericSource" into mn...Chong Zhang2015-07-153-1/+23
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | NuPlayer: pull more video buffers in advance in GenericSourceChong Zhang2015-07-143-1/+23
* | | | | Merge "HLS: temporarily blacklist a variant if failed to fetch" into mnc-devChong Zhang2015-07-153-14/+145
|\ \ \ \ \
| * | | | | HLS: temporarily blacklist a variant if failed to fetchChong Zhang2015-07-143-14/+145
* | | | | | Merge "NuPlayer: determine audio mode before instantiating audio decoder." in...Wei Jia2015-07-142-28/+32
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | NuPlayer: determine audio mode before instantiating audio decoder.Wei Jia2015-07-142-28/+32
| | |_|_|/ | |/| | |
* | | | | Merge "mediaresourcemanager: handle the case when there's no client holding r...Ronghua Wu2015-07-143-103/+128
|\ \ \ \ \
| * | | | | mediaresourcemanager: handle the case when there's no client holding resource...Ronghua Wu2015-07-133-103/+128
* | | | | | Merge "libstagefright: get secure and non-secure codec policy from mediacodec...Ronghua Wu2015-07-141-0/+6
|\ \ \ \ \ \
| * | | | | | libstagefright: get secure and non-secure codec policy from mediacodec list g...Ronghua Wu2015-07-081-0/+6
| |/ / / / /
* | | | | | Merge "Check buffer size before using it" into mnc-devLajos Molnar2015-07-141-0/+8
|\ \ \ \ \ \
| * | | | | | Check buffer size before using itMarco Nelissen2015-07-011-0/+8
* | | | | | | Merge "MediaCodec: remove legacy-setsurface experiment from setOutputSurface"...Lajos Molnar2015-07-141-3/+1
|\ \ \ \ \ \ \
| * | | | | | | MediaCodec: remove legacy-setsurface experiment from setOutputSurfaceLajos Molnar2015-07-101-3/+1
* | | | | | | | Merge "nuplayer: use codec->setSurface when possible to avoid seeking" into m...Lajos Molnar2015-07-146-3/+74
|\ \ \ \ \ \ \ \
| * | | | | | | | nuplayer: use codec->setSurface when possible to avoid seekingLajos Molnar2015-07-136-3/+74
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge "MediaCodec: consider usage bits when changing surface." into mnc-devLajos Molnar2015-07-142-5/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | MediaCodec: consider usage bits when changing surface.Lajos Molnar2015-07-132-5/+23
| |/ / / / / / /
* | | | | | | | Merge "NuPlayerRenderer: clear first audio anchor time only when audio is flu...Wei Jia2015-07-141-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | NuPlayerRenderer: clear first audio anchor time only when audio is flushed.Wei Jia2015-07-131-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge "audioflinger: flush HAL when transitioning to next direct track" into ...Eric Laurent2015-07-131-9/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | audioflinger: flush HAL when transitioning to next direct trackEric Laurent2015-07-071-9/+12
* | | | | | | Merge "NuPlayer: seek to current position when changing video surface and aud...Wei Jia2015-07-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | NuPlayer: seek to current position when changing video surface and audio deco...Wei Jia2015-07-101-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge "stagefright: allow controlling experiments from property" into mnc-devLajos Molnar2015-07-103-26/+44
|\ \ \ \ \ \ \
| * | | | | | | stagefright: allow controlling experiments from propertyLajos Molnar2015-07-103-26/+44
* | | | | | | | Merge "mpeg2ts: keep the size of the sync points at most 5mb per a track" int...Jinsuk Kim2015-07-101-2/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | mpeg2ts: keep the size of the sync points at most 5mb per a trackJaesung Chung2015-07-091-2/+13
* | | | | | | | Merge "ACodec: call cancelBufferToNativeWindow() only when the buffer is owne...Wei Jia2015-07-101-6/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | ACodec: call cancelBufferToNativeWindow() only when the buffer is owned by us.Wei Jia2015-07-101-6/+10
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "libmediaplayerservice: Serialize access to AudioOutput" into mnc-devAndy Hung2015-07-102-45/+155
|\ \ \ \ \ \ \ \
| * | | | | | | | libmediaplayerservice: Serialize access to AudioOutputAndy Hung2015-07-102-45/+155
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge "audio: several fixes in audio routing callbacks" into mnc-devEric Laurent2015-07-107-45/+66
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | audio: several fixes in audio routing callbacksEric Laurent2015-07-107-45/+66
| |/ / / / / /
* | | | | | | Merge "SimpleSoftOMXComponent: change CHECK to error notification." into mnc-devWei Jia2015-07-094-16/+49
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | SimpleSoftOMXComponent: change CHECK to error notification.Wei Jia2015-07-084-16/+49
| | |/ / / / | |/| | | |
* | | | | | audio policy: session route: move SessionRoute to commonFrançois Gaffie2015-07-095-179/+244
| |_|_|_|/ |/| | | |
* | | | | Merge "audio policy: add support for device combo with speaker safe" into mnc...Eric Laurent2015-07-092-4/+12
|\ \ \ \ \