summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | am 80ddb730: am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-092-4/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '80ddb73058d33fa45408a3538649867eda3f881b': Stagefright: Fix unused variables
| * | | | am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables"Andreas Gampe2014-12-092-4/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit 'ce48b3a821f0c17aa68b114d964a26fce22cdd49': Stagefright: Fix unused variables
| | * | | Stagefright: Fix unused variablesAndreas Gampe2014-12-042-4/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, fix unused variables. These variables are unused in aarch64. Bug: 18632512 Change-Id: I6ae41f64e721a0f3188f0ee045a734b366ee72a6
* | | | stagefright: support VP9 frame parallel decode in Soft VPXhkuang2014-12-052-66/+179
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VPX component now works with both serial decode mode and frame parallel mode. But VP9 frame parallel decode is not enabled yet until libvpx library enable it. In frame parallel decode, libvpx decoder decodes several frames on all cpus in parallel fashion. If not being flushed, it will only return frame when all the cpus are busy. If getting flushed, it will return all the frames in the decoder. Compare with current serial decode mode in which libvpx decoder is idle between decode calls, libvpx decoder is busy between decode calls. VP9 frame parallel decode is >30% faster than serial decode which will makes devices play 1080P VP9 videos more easily. Bug:17325438 Change-Id: I3c53329c6d0a9ff44f5a34d91ea06697478f08e2
* | | resolved conflicts for merge of e5ba80c5 to lmp-mr1-dev-plus-aospAndreas Gampe2014-11-2723-113/+24
|\ \ \ | |/ / | | | | | | Change-Id: Iea12c8a6cabf84584e4a89ad80e298c1f4ea3dd7
| * | Merge "Stagefright: Fix unused variables, functions, values"Andreas Gampe2014-11-2623-116/+24
| |\ \
| | * | Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-2523-116/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For build-system CFLAGS clean-up, remove unused functions and variables. Change-Id: Ic3dee56b589ea9a693efa1d72ba394036efff168
* | | | am e464018a: am f59eae94: Merge "Fix overload of ↵Chih-hung Hsieh2014-11-252-3/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | SoftVideoDecoderOMXComponent::updatePortDefinitions" * commit 'e464018a7fdacdc3bef3058620eb09ec60d3cccf': Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions
| * | | Merge "Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions"Chih-hung Hsieh2014-11-252-3/+3
| |\ \ \
| | * | | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-11-202-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An overloaded function should take the same parameters as the function it is overloading. Change-Id: I8327fe1b363917515cf76c8f76bdbc05b2c0fbf0 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | am 7fca411f: am b44760cf: Merge "Remove deprecated register keyword"Chih-hung Hsieh2014-11-251-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '7fca411f36f76493491fd45f91fac2e9bd70fd6d': Remove deprecated register keyword
| * | | | Remove deprecated register keywordBernhard Rosenkränzer2014-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In C++11 mode, clang errors out on the register keyword. Change-Id: I034ba5815e37e3ff5e017551977e97b8516123e8 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | am 112ba592: am 6c7d332f: Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-252-4/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '112ba59269c4d7192cb4f590b05c6058f5daafb9': Remove bogus forward declarations
| * | | | Merge "Remove bogus forward declarations"Chih-hung Hsieh2014-11-242-4/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove bogus forward declarationsBernhard Rosenkränzer2014-11-202-4/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove forward declarations of MediaBuffer -- they're not needed because MediaBuffer.h is included earlier in the file anyway, and they incorrectly declared MediaBuffer as a struct instead of a class. Change-Id: Ia35ea8f938553e39244032b6fd6c061aa388859f Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | am 128b7850: am db1ce33e: Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-251-4/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '128b785027033c8c74a858a3dac27cfcb2a9ae7f': Remove check for an impossible condition
| * | | Merge "Remove check for an impossible condition"Chih-hung Hsieh2014-11-241-4/+0
| |\ \ \
| | * | | Remove check for an impossible conditionBernhard Rosenkraenzer2014-10-041-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | offset_for_ref_frame is an array rather than a pointer - it can't be NULL (and the check causes a warning in clang). Change-Id: I9b96e1e723e3b8caebd41821137ed6fb669d8cd4 Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | am d6048672: am 9d2e0dae: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-201-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'd60486723cdc0b4b83b77d57ce35023a7516c471': Remove extraneous parentheses
| * | | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-201-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Remove extraneous parentheses that cause compiler warnings in clang Change-Id: I88a3d84738433db85e4a04b673f82da7b0b1be10 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | am 5f3eef9a: am 7a200235: Merge "Remove extraneous parentheses"Chih-hung Hsieh2014-11-182-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '5f3eef9a6a946347bc7d8c5dc76290c9e780f818': Remove extraneous parentheses
| * | | Remove extraneous parenthesesBernhard Rosenkränzer2014-11-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extraneous parentheses - they cause compiler warnings in clang Change-Id: Ie2efd9714f9e2251cf3b204b5c5dd1a8b8aaca13 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | am eb0827f3: am c5160b34: Merge "Remove the executable bit from source files"Glenn Kasten2014-11-1091-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'eb0827f34ef34c9ff84ab4d857af4b6215839fa3': Remove the executable bit from source files
| * | | Remove the executable bit from source filesMartin Storsjo2014-11-0791-0/+0
| | | | | | | | | | | | | | | | Change-Id: I3c105b7e2736ade22de0bb12f396859816b3adf7
| * | | am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-161-0/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '8a8f2fdccf149cbddcbf4ae6ce12cf68ae0febf2': Add -no-integrated-as at local level.
| * \ \ \ resolved conflicts for merge of 2edda09a to lmp-dev-plus-aospLajos Molnar2014-10-147-362/+70
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I760286b72fe1ebda3e8b058ca2138cb97fbdb7e1
| * \ \ \ \ am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ↵Chong Zhang2014-10-131-1/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat" into lmp-dev * commit '801a3ff80c36aa9b55dc9b360d0e59f863011a39': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| * \ \ \ \ \ am 5002d02e: Merge "Recover from errors" into lmp-devMarco Nelissen2014-10-071-5/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5002d02e545dafbcf129b2e5bccf087e765019e5': Recover from errors
| * \ \ \ \ \ \ am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-061-0/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '566a6fba127771c752fd40db84f1e7aafa520ea6': Add -no-integrated-as at local level.
| * \ \ \ \ \ \ \ am b220fe0e: Merge "stagefright: fix fake-stride handling for H263 SW ↵Ronghua Wu2014-10-031-2/+3
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder" into lmp-dev * commit 'b220fe0e40bc3752b62a9576fc824634a16fc3ab': stagefright: fix fake-stride handling for H263 SW decoder
| * \ \ \ \ \ \ \ \ am d0b9efe7: Merge "add AAC audio decoder params for PCM limiter enable" ↵Chong Zhang2014-10-011-0/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'd0b9efe7d8300e48f7a99c1dd746d60060206b3c': add AAC audio decoder params for PCM limiter enable
| * \ \ \ \ \ \ \ \ \ am ea55da94: Merge "Fix SoftAAC2 flush" into lmp-devMarco Nelissen2014-09-251-4/+8
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ea55da9434f674efaacaa443c97a411bdef4ff1a': Fix SoftAAC2 flush
| * \ \ \ \ \ \ \ \ \ \ am cae1c0fa: Merge "stagefright: fix cropping handling for SoftAVC and ↵Ronghua Wu2014-09-253-15/+21
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SoftMEPEG4." into lmp-dev * commit 'cae1c0fa3f4d5e2387f05a6055bf356914851c4b': stagefright: fix cropping handling for SoftAVC and SoftMEPEG4.
| * \ \ \ \ \ \ \ \ \ \ \ am 80ec934a: Merge "stagefright: add adaptive playback support to SoftHEVC ↵Ronghua Wu2014-09-242-80/+125
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder." into lmp-dev * commit '80ec934ae7d4e3a78af87554fdb77a58f6386ba0': stagefright: add adaptive playback support to SoftHEVC decoder.
| * \ \ \ \ \ \ \ \ \ \ \ \ am 4409ba46: Merge "Fix ringbuffer handling" into lmp-devMarco Nelissen2014-09-192-24/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4409ba46fab830d81860edba056c3dc6e1c7c003': Fix ringbuffer handling
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am b0ed4e3e: Merge "Always consider first buffer to be config" into lmp-devMarco Nelissen2014-09-191-0/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b0ed4e3e482cbdc2fa6c7853526597f4ae3f0972': Always consider first buffer to be config
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 999b888f: Merge "Fix null pointer dereference" into lmp-devMarco Nelissen2014-09-171-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '999b888f07f4549b1f8490d7153e3b1704684ca2': Fix null pointer dereference
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "libstagefright: set actual stride info for SW encoder input port" ↵Lajos Molnar2014-10-283-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-253-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 fd460a1f: am 097fc64d: Merge "Don\'t signal an error at the end of a ↵Marco Nelissen2014-10-211-21/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | short file" into lmp-mr1-dev * commit 'fd460a1ff29132d31e51409f99ff4fedb59f0818': Don't signal an error at the end of a short file
| * | | | | | | | | | | | | | | | Don't signal an error at the end of a short fileMarco Nelissen2014-10-161-21/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just signaling EOS is sufficient Bug: 17933838 Change-Id: I04a1af57378115731febe7cacb35af5e55d5db83
* | | | | | | | | | | | | | | | | am 8a8f2fdc: am 589a89f5: Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-161-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8a8f2fdccf149cbddcbf4ae6ce12cf68ae0febf2': Add -no-integrated-as at local level.
| * | | | | | | | | | | | | | | | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-161-0/+2
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Later we will enable integrated-as as default at the global level. BUG: 17820427 Change-Id: I5d95ef260c097961cb2bf2f15155572c2b24cb0e
* | | | | | | | | | | | | | | | resolved conflicts for merge of f4147ee9 to lmp-mr1-dev-plus-aospLajos Molnar2014-10-147-362/+70
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3b66673012989ab3707852b257844f2c3851f753
| * | | | | | | | | | | | | | | am 48be19a4: am 2edda09a: stagefright: fix surface input handling of ↵Lajos Molnar2014-10-147-349/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | software encoders * commit '48be19a4a17cfc1e0627039bf740fffd2fcbd9f8': stagefright: fix surface input handling of software encoders
| | * | | | | | | | | | | | | | stagefright: fix surface input handling of software encodersLajos Molnar2014-10-137-349/+72
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added SoftVideoEncoder for common color conversion and extension handling logic - fix YUV420 SemiPlanar handling that should be NV12 not NV21 Bug: 17935149 Change-Id: I9b8d05678b1862dd37bf349ea83d67bdf1bb5560
* | | | | | | | | | | | | | | am 3384cfaa: am 1195142c: am 801a3ff8: Merge "handle case ↵Chong Zhang2014-10-141-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OMX_AUDIO_CodingG711 in ACodec::getPortFormat" into lmp-dev * commit '3384cfaa4b933e4406a41bc4362a74511e0a0e79': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| * | | | | | | | | | | | | | am 1195142c: am 801a3ff8: Merge "handle case OMX_AUDIO_CodingG711 in ↵Chong Zhang2014-10-131-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ACodec::getPortFormat" into lmp-dev * commit '1195142cec56fdfd509294da724ce3e13c628be5': handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormat
| | * | | | | | | | | | | | | handle case OMX_AUDIO_CodingG711 in ACodec::getPortFormatChong Zhang2014-10-131-1/+8
| | | |_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17935293 Change-Id: Id09190ae813aa9e00a3c1ef6fb8a1bd3021deb6e
* | | | | | | | | | | | | | am dba83c1c: libstagefright: compile errorsMark Salyzyn2014-10-082-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'dba83c1cb1bef03bc5d1760c2639d06ff71c0fa7': libstagefright: compile errors