summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am bf5e2397: am 5baf2af5: more support for audio effect offloadEric Laurent2013-09-182-13/+50
|\
| * am 5baf2af5: more support for audio effect offloadEric Laurent2013-09-182-13/+50
| |\
| | * more support for audio effect offloadEric Laurent2013-09-182-13/+50
* | | Merge "Fully reset SkipCutBuffer state in clear()"Marco Nelissen2013-09-181-1/+2
|\ \ \
| * | | Fully reset SkipCutBuffer state in clear()Marco Nelissen2013-09-181-1/+2
* | | | am 684e0ae8: am 9a98b6de: Merge "Partial fix for SoundPool not terminating" i...Glenn Kasten2013-09-181-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | am 9a98b6de: Merge "Partial fix for SoundPool not terminating" into klp-devGlenn Kasten2013-09-181-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Partial fix for SoundPool not terminating" into klp-devGlenn Kasten2013-09-181-2/+2
| | |\ \
| | | * | Partial fix for SoundPool not terminatingGlenn Kasten2013-09-181-2/+2
* | | | | am ec467110: am ab6c93b4: Merge "Use changed MediaCodec.PARAMETER_KEY_VIDEO_B...Lajos Molnar2013-09-182-2/+2
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am ab6c93b4: Merge "Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value"...Lajos Molnar2013-09-182-2/+2
| |\ \ \ | | |/ /
| | * | Merge "Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE value" into klp-devLajos Molnar2013-09-182-2/+2
| | |\ \ | | | |/ | | |/|
| | | * Use changed MediaCodec.PARAMETER_KEY_VIDEO_BITRATE valueLajos Molnar2013-09-172-2/+2
* | | | am 232d05ca: am 6cc3a994: LoudnessEnhancer audio effect implementationJean-Michel Trivi2013-09-1719-0/+1872
|\ \ \ \ | |/ / /
| * | | am 6cc3a994: LoudnessEnhancer audio effect implementationJean-Michel Trivi2013-09-1719-0/+1872
| |\ \ \ | | |/ /
| | * | LoudnessEnhancer audio effect implementationJean-Michel Trivi2013-09-1719-0/+1872
| | |/
* | | am 11454092: am 18f86140: Merge "Fix underruns when fast track denied due to ...Glenn Kasten2013-09-172-37/+37
|\ \ \ | |/ /
| * | am 18f86140: Merge "Fix underruns when fast track denied due to SRC" into klp...Glenn Kasten2013-09-172-37/+37
| |\ \ | | |/
| | * Merge "Fix underruns when fast track denied due to SRC" into klp-devGlenn Kasten2013-09-172-37/+37
| | |\
| | | * Fix underruns when fast track denied due to SRCGlenn Kasten2013-09-172-37/+37
* | | | am 440b5a49: am fc270954: am e56f3c96: Merge "strtok stores its values in thr...Glenn Kasten2013-09-171-2/+3
|\ \ \ \ | |/ / /
| * | | am fc270954: am e56f3c96: Merge "strtok stores its values in thread local sto...Glenn Kasten2013-09-171-2/+3
| |\ \ \
| | * \ \ am e56f3c96: Merge "strtok stores its values in thread local storage. So it c...Glenn Kasten2013-09-171-2/+3
| | |\ \ \
| | | * | | strtok stores its values in thread local storage.seunghak.han2013-09-171-2/+3
* | | | | | am 83774965: am bc910e5c: Merge "Fix hang" into klp-devMarco Nelissen2013-09-161-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am bc910e5c: Merge "Fix hang" into klp-devMarco Nelissen2013-09-161-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "Fix hang" into klp-devMarco Nelissen2013-09-161-1/+1
| | |\ \ \ \
| | | * | | | Fix hangMarco Nelissen2013-09-161-1/+1
* | | | | | | am fcb7a247: am a5652e9c: Merge "Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK...Chong Zhang2013-09-162-5/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a5652e9c: Merge "Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see ...Chong Zhang2013-09-162-5/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags" into k...Chong Zhang2013-09-162-5/+9
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flagsChong Zhang2013-09-112-5/+9
* | | | | | | am 617e2a1c: am d176ec1e: Merge "Fix SoundPool.play() looping" into klp-devGlenn Kasten2013-09-131-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am d176ec1e: Merge "Fix SoundPool.play() looping" into klp-devGlenn Kasten2013-09-131-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix SoundPool.play() looping" into klp-devGlenn Kasten2013-09-141-2/+2
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Fix SoundPool.play() loopingGlenn Kasten2013-09-111-2/+2
| | | |/ / /
* | | | | | am 49d62d66: am 877c673c: Merge "ACodec: fix flush/resume for decoder-output-...Lajos Molnar2013-09-121-2/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 877c673c: Merge "ACodec: fix flush/resume for decoder-output-meta-data mod...Lajos Molnar2013-09-121-2/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | ACodec: fix flush/resume for decoder-output-meta-data modeLajos Molnar2013-09-121-2/+5
* | | | | | am 33010b80: am a911f51c: Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a911f51c: Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
| | |/ / /
* | | | | am 1024ffd7: am 7f9551f7: MediaMuxer: Hook up setLocation methodZhijun He2013-09-101-0/+10
|\ \ \ \ \ | |/ / / /
| * | | | am 7f9551f7: MediaMuxer: Hook up setLocation methodZhijun He2013-09-101-0/+10
| |\ \ \ \ | | |/ / /
| | * | | MediaMuxer: Hook up setLocation methodZhijun He2013-09-091-0/+10
* | | | | Merge "HDCP: use getCaps() to query HDCP caps"Chong Zhang2013-09-101-5/+1
|\ \ \ \ \
| * | | | | HDCP: use getCaps() to query HDCP capsChong Zhang2013-09-071-5/+1
* | | | | | am a28539b0: am 60c60df7: Effect Offload Proxy for effects offloadjpadmana2013-09-064-1/+408
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am 60c60df7: Effect Offload Proxy for effects offloadjpadmana2013-09-064-1/+408
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Effect Offload Proxy for effects offloadjpadmana2013-09-064-1/+408