summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/ACodec.cpp
Commit message (Expand)AuthorAgeFilesLines
* am 93f5b333: am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in ...Lajos Molnar2014-12-041-0/+1
|\
| * Merge "libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedS...Lajos Molnar2014-12-041-0/+1
| |\
| | * libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedStatePer Persson2014-12-041-0/+1
* | | resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-271-3/+0
|\ \ \ | |/ /
| * | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-251-3/+0
* | | am 6597c00f: stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-201-0/+18
|\ \ \
| * | | stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-191-0/+18
* | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-171-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-171-2/+2
| | |/ | |/|
| * | am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
| |\ \
| * \ \ am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat...Chong Zhang2014-10-131-0/+26
| |\ \ \
| * \ \ \ am 7225187b: Merge "ACodec: process deferred messages when entering Loaded st...Wei Jia2014-10-131-0/+2
| |\ \ \ \
| * \ \ \ \ am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPo...Guang Zhu2014-10-131-21/+0
| |\ \ \ \ \
| * \ \ \ \ \ am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat...Chong Zhang2014-10-101-0/+21
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled ...Rachad2014-10-071-1/+28
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am fc93499e: Merge "mediarecorder: set level if setting default profile" into...Lajos Molnar2014-10-021-0/+53
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter enable" into...Chong Zhang2014-10-011-2/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 4a34b9a4: Merge "stagefright: use frame height if slice height is 0" into ...Lajos Molnar2014-09-251-7/+14
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 0079b331: Merge "MediaBuffer: ABuffer will release MediaBuffer when it\'s ...Wei Jia2014-09-221-17/+6
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ Merge "libstagefright: set actual stride info for SW encoder input port" into...Lajos Molnar2014-10-281-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | libstagefright: set actual stride info for SW encoder input portLajos Molnar2014-10-251-1/+5
* | | | | | | | | | | | | am edcff417: am 42aae0c4: am f04e8b5e: am 25842048: Merge "stagefright: try t...Lajos Molnar2014-10-221-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | stagefright: try to free codec instance if MediaCodec.release hangsLajos Molnar2014-10-211-0/+24
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | am 6bbf27e5: am e86f4be5: am 447898bc: Merge "ACodec: only check crop rect on...Lajos Molnar2014-10-151-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| | * | | | | | | | | | ACodec: only check crop rect on output portLajos Molnar2014-10-071-2/+10
| | | |_|_|_|_|/ / / / | | |/| | | | | | | |
* | | | | | | | | | | am 3384cfaa: am 1195142c: am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG71...Chong Zhang2014-10-141-0/+26
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-devChong Zhang2014-10-131-0/+26
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-131-0/+26
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | am 7d2b381f: am e39c1929: am 7225187b: Merge "ACodec: process deferred messag...Wei Jia2014-10-131-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "ACodec: process deferred messages when entering Loaded state." into lm...Wei Jia2014-10-131-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | ACodec: process deferred messages when entering Loaded state.Wei Jia2014-10-101-0/+2
| | | |_|_|_|_|/ / | | |/| | | | | |
* | | | | | | | | am 0f69763d: am ee3f39f6: am 380757ba: Merge "Revert "handle case OMX_AUDIO_C...Guang Zhu2014-10-131-21/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"Guang Zhu2014-10-131-21/+0
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | am 1d6fe042: am 92ab9962: am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG71...Chong Zhang2014-10-111-0/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-091-0/+21
| | |/ / / / / | |/| | | | |
* | | | | | | am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate output buffers ...Rachad2014-10-071-1/+28
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "stagefright: do not allocate output buffers for tunneled playback" int...Rachad2014-10-071-1/+28
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | stagefright: do not allocate output buffers for tunneled playbackRachad2014-09-281-1/+28
* | | | | | | am 2e74aefd: am fc93499e: Merge "mediarecorder: set level if setting default ...Lajos Molnar2014-10-031-0/+53
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | mediarecorder: set level if setting default profileLajos Molnar2014-10-021-0/+53
| | |_|_|_|/ | |/| | | |
* | | | | | am 52cb10c4: am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter...Chong Zhang2014-10-021-2/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "add AAC audio decoder params for PCM limiter enable" into lmp-devChong Zhang2014-10-011-2/+10
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | add AAC audio decoder params for PCM limiter enableChong Zhang2014-10-011-2/+10
| | | |_|/ | | |/| |
* | | | | am 4a34b9a4: Merge "stagefright: use frame height if slice height is 0" into ...Lajos Molnar2014-09-251-7/+14
|\ \ \ \ \ | |/ / / /
| * | | | stagefright: use frame height if slice height is 0Lajos Molnar2014-09-241-7/+14
| |/ / /
* | | | am 0079b331: Merge "MediaBuffer: ABuffer will release MediaBuffer when it\'s ...Wei Jia2014-09-221-17/+6
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | MediaBuffer: ABuffer will release MediaBuffer when it's destructed.Wei Jia2014-09-191-17/+6
| |/
* | am 52c6a355: Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-devLajos Molnar2014-09-051-1/+0
|\ \ | |/
| * stagefright: allow P-frames spacing of 0 and 1Lajos Molnar2014-09-041-1/+0