summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/ACodec.cpp
Commit message (Collapse)AuthorAgeFilesLines
* am 93f5b333: am 050ff19e: Merge "libstagefright: defer kWhatSetParameters in ↵Lajos Molnar2014-12-041-0/+1
|\ | | | | | | | | | | | | OutputPortSettingsChangedState" * commit '93f5b333d31fd5fe425faa01b25d1b4d3115a8e6': libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedState
| * Merge "libstagefright: defer kWhatSetParameters in ↵Lajos Molnar2014-12-041-0/+1
| |\ | | | | | | | | | OutputPortSettingsChangedState"
| | * libstagefright: defer kWhatSetParameters in OutputPortSettingsChangedStatePer Persson2014-12-041-0/+1
| | | | | | | | | | | | | | | | | | | | | Change-Id: I9719f1698bf411914eb753d3c349a15b9fbf9df6 Signed-off-by: Per Persson <per.persson@intel.com> Signed-off-by: Persson, Mikael <mikael.persson@intel.com> Signed-off-by: Fagerstedt, Axel <axel.fagerstedt@intel.com> Signed-off-by: Yong Yao <yong.yao@intel.com>
* | | resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-271-3/+0
|\ \ \ | |/ / | | | | | | Change-Id: Iea12c8a6cabf84584e4a89ad80e298c1f4ea3dd7
| * | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-251-3/+0
| | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused functions and variables. Change-Id: Ic3dee56b589ea9a693efa1d72ba394036efff168
* | | am 6597c00f: stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-201-0/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | automerge: 73c5c94 * commit '73c5c94ab53bf0c14fffe5edc62706865cff271d': stagefright: add (temporary) support for automatic video frc
| * | | stagefright: add (temporary) support for automatic video frcLajos Molnar2014-11-191-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use MediaFormat.setInteger("auto-frc", 1) to turn this feature on. If supported, this feature will show up in codec.getOutputFormat().getInteger("auto-frc") Otherwise, this key will not be present. Bug: 17383204 Change-Id: I03549b3ede4de156e9e2d81b3883010360bb42ae
* | | | resolved conflicts for merge of e78a27ca to lmp-mr1-dev-plus-aospMarco Nelissen2014-11-171-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: If10a9cc17245f95d5e10b1507445abbb4020670e
| * | | Update calls to IInterface::asBinder()Marco Nelissen2014-11-171-2/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | to use the new static version. Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a Conflicts: media/libmedia/IAudioFlinger.cpp media/libmedia/IMediaPlayer.cpp media/libstagefright/CameraSource.cpp
| * | am 447898bc: Merge "ACodec: only check crop rect on output port" into lmp-devLajos Molnar2014-10-141-2/+10
| |\ \ | | | | | | | | | | | | | | | | * commit '447898bca790fae2fdae304073162e980d816b79': ACodec: only check crop rect on output port
| * \ \ am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ↵Chong Zhang2014-10-131-0/+26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat" into lmp-dev * commit '801a3ff80c36aa9b55dc9b360d0e59f863011a39': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| * \ \ \ am 7225187b: Merge "ACodec: process deferred messages when entering Loaded ↵Wei Jia2014-10-131-0/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state." into lmp-dev * commit '7225187b5126b921e40f0221db158a16c366344e': ACodec: process deferred messages when entering Loaded state.
| * \ \ \ \ am 380757ba: Merge "Revert "handle case OMX_AUDIO_CodingG711 in ↵Guang Zhu2014-10-131-21/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat"" into lmp-dev * commit '380757ba5c927015d403e3b97cc418413330453e': Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"
| * \ \ \ \ \ am aec1dbfd: Merge "handle case OMX_AUDIO_CodingG711 in ↵Chong Zhang2014-10-101-0/+21
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat" into lmp-dev * commit 'aec1dbfd10150da3f28b64471b4dc249a58a104e': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| * \ \ \ \ \ \ am 584c14c3: Merge "stagefright: do not allocate output buffers for tunneled ↵Rachad2014-10-071-1/+28
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback" into lmp-dev * commit '584c14c370f141685b7e8963a13ed91584383ca1': stagefright: do not allocate output buffers for tunneled playback
| * \ \ \ \ \ \ \ am fc93499e: Merge "mediarecorder: set level if setting default profile" ↵Lajos Molnar2014-10-021-0/+53
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'fc93499e83403d5959693efa040cb29fd6825abb': mediarecorder: set level if setting default profile
| * \ \ \ \ \ \ \ \ am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter enable" ↵Chong Zhang2014-10-011-2/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'd0b9efe7d8300e48f7a99c1dd746d60060206b3c': add AAC audio decoder params for PCM limiter enable
| * \ \ \ \ \ \ \ \ \ am 4a34b9a4: Merge "stagefright: use frame height if slice height is 0" into ↵Lajos Molnar2014-09-251-7/+14
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '4a34b9a4759d7dcc2d2ad5bd96ea8477915dd67a': stagefright: use frame height if slice height is 0
| * \ \ \ \ \ \ \ \ \ \ am 0079b331: Merge "MediaBuffer: ABuffer will release MediaBuffer when it\'s ↵Wei Jia2014-09-221-17/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | destructed." into lmp-dev * commit '0079b331227fc1555d7c5305f33917a570d44890': MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
* | \ \ \ \ \ \ \ \ \ \ \ Merge "libstagefright: set actual stride info for SW encoder input port" ↵Lajos Molnar2014-10-281-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 701b964 automerge: 294c7f3 * commit '294c7f36e6a92419017e7fe2a204fba1284cdc08': libstagefright: set actual stride info for SW encoder input port
| * | | | | | | | | | | | libstagefright: set actual stride info for SW encoder input portLajos Molnar2014-10-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes encoding flexible YUV content using SW encoders. Also skip setting input color format if it is flexible YUV, as it has already been translated to a color format supported by the codec. Bug: 18124320 Change-Id: I423782936986f4d6cf65ea9ef89ae77a92e30140
* | | | | | | | | | | | | am edcff417: am 42aae0c4: am f04e8b5e: am 25842048: Merge "stagefright: try ↵Lajos Molnar2014-10-221-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to free codec instance if MediaCodec.release hangs" into lmp-dev * commit 'edcff417bbb2e76245b559e7c9a8b98c2a60e102': stagefright: try to free codec instance if MediaCodec.release hangs
| * | | | | | | | | | | | stagefright: try to free codec instance if MediaCodec.release hangsLajos Molnar2014-10-211-0/+24
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18033275 Change-Id: If86cd26566d7b75941976f37829bbec619800778
* | | | | | | | | | | | am 6bbf27e5: am e86f4be5: am 447898bc: Merge "ACodec: only check crop rect ↵Lajos Molnar2014-10-151-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on output port" into lmp-dev * commit '6bbf27e5a3beeca3046caef70e4e5acc487dd062': ACodec: only check crop rect on output port
| * | | | | | | | | | | 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
| | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17789956 Change-Id: I0e17660d95ac0b3b051e7f555820188d9286571a
* | | | | | | | | | | am 3384cfaa: am 1195142c: am 801a3ff8: Merge "handle case ↵Chong Zhang2014-10-141-0/+26
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev * commit '3384cfaa4b933e4406a41bc4362a74511e0a0e79': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| * | | | | | | | | | 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
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935293 Change-Id: Id09190ae813aa9e00a3c1ef6fb8a1bd3021deb6e
* | | | | | | | | | am 7d2b381f: am e39c1929: am 7225187b: Merge "ACodec: process deferred ↵Wei Jia2014-10-131-0/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | messages when entering Loaded state." into lmp-dev * commit '7d2b381f6a611e60f715e8356269c71ecc7f5884': ACodec: process deferred messages when entering Loaded state.
| * | | | | | | | | Merge "ACodec: process deferred messages when entering Loaded state." into ↵Wei Jia2014-10-131-0/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | lmp-dev
| | * | | | | | | | ACodec: process deferred messages when entering Loaded state.Wei Jia2014-10-101-0/+2
| | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17792260 Change-Id: Ie8154cf41be5672fc8a9f3a2a82b7ede0a8b828f
* | | | | | | | | am 0f69763d: am ee3f39f6: am 380757ba: Merge "Revert "handle case ↵Guang Zhu2014-10-131-21/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMX_AUDIO_CodingG711 in ACodec::getPortFormat"" into lmp-dev * commit '0f69763d41c101a2afcac7f10be86b41974f1279': Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"
| * | | | | | | | Revert "handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat"Guang Zhu2014-10-131-21/+0
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935293 fix 64-bit builds This reverts commit 9c78328f4dfd2c8a1dd5d31010f10ffcd762f04b. Change-Id: Ifbc499342fb47fd67cae02a79cb900e701caed68
* | | | | | | | am 1d6fe042: am 92ab9962: am aec1dbfd: Merge "handle case ↵Chong Zhang2014-10-111-0/+21
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev * commit '1d6fe0424915ce575747c2c2fe7c79a911df7e37': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| * | | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-091-0/+21
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935293 Change-Id: I8eab0acf55df6934e05947b0dbdd1fd456130088
* | | | | | | am 42fc04ff: am 584c14c3: Merge "stagefright: do not allocate output buffers ↵Rachad2014-10-071-1/+28
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for tunneled playback" into lmp-dev * commit '42fc04ff4db20f2de12834818a73778ec9ede052': stagefright: do not allocate output buffers for tunneled playback
| * | | | | | Merge "stagefright: do not allocate output buffers for tunneled playback" ↵Rachad2014-10-071-1/+28
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | into lmp-dev
| | * | | | | stagefright: do not allocate output buffers for tunneled playbackRachad2014-09-281-1/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not allocate native window buffers for tunneled video playback codecs. Bug: 17112525 Change-Id: I262d8030a9df6188938fde5d62ebce8faf7dba1f
* | | | | | | am 2e74aefd: am fc93499e: Merge "mediarecorder: set level if setting default ↵Lajos Molnar2014-10-031-0/+53
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | profile" into lmp-dev * commit '2e74aefdc1e77e6623bd869fb94eba1e1a7eeb0c': mediarecorder: set level if setting default profile
| * | | | | | mediarecorder: set level if setting default profileLajos Molnar2014-10-021-0/+53
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 17676461 Change-Id: If01ccd09935945d330de0842be95c3544951b6b9
* | | | | | am 52cb10c4: am d0b9efe7: Merge "add AAC audio decoder params for PCM ↵Chong Zhang2014-10-021-2/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | limiter enable" into lmp-dev * commit '52cb10c4d794e5041e04f20d716aac82c325b06b': add AAC audio decoder params for PCM limiter enable
| * | | | | 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
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Bug: 17470065 Change-Id: Ib67aa1c50e3b6c24c4b12b0f31a996cc6874abd1
* | | | | am 4a34b9a4: Merge "stagefright: use frame height if slice height is 0" into ↵Lajos Molnar2014-09-251-7/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '4a34b9a4759d7dcc2d2ad5bd96ea8477915dd67a': stagefright: use frame height if slice height is 0
| * | | | stagefright: use frame height if slice height is 0Lajos Molnar2014-09-241-7/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for some vendors that set slice height to 0. Android uses slice height is the vertical stride for YUV planar and semiplanar formats. Bug: 13433554 Change-Id: I4da038e7a768dcd8360c33fa1a9ce95a172f16bb
* | | | am 0079b331: Merge "MediaBuffer: ABuffer will release MediaBuffer when it\'s ↵Wei Jia2014-09-221-17/+6
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | destructed." into lmp-dev * commit '0079b331227fc1555d7c5305f33917a570d44890': MediaBuffer: ABuffer will release MediaBuffer when it's destructed.
| * | MediaBuffer: ABuffer will release MediaBuffer when it's destructed.Wei Jia2014-09-191-17/+6
| |/ | | | | | | | | Bug: 17454455 Change-Id: Ia423bcc2e1fa39137f114eac44912ed15357bb99
* | am 52c6a355: Merge "stagefright: allow P-frames spacing of 0 and 1" into lmp-devLajos Molnar2014-09-051-1/+0
|\ \ | |/ | | | | | | * commit '52c6a355503dbbe9bb134af07faee982534031dd': stagefright: allow P-frames spacing of 0 and 1
| * stagefright: allow P-frames spacing of 0 and 1Lajos Molnar2014-09-041-1/+0
| | | | | | | | | | Bug: 17387418 Change-Id: Ib966496b4ca220d96fb3741c29002c13cd2db848
generated by cgit v1.1 at 2024-05-20 08:52:48 +0000