summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/amrwbenc
Commit message (Collapse)AuthorAgeFilesLines
* Stagefright: Fix unused variables, functions, valuesAndreas Gampe2014-11-251-1/+1
| | | | | | | For build-system CFLAGS clean-up, remove unused functions and variables. Change-Id: Ic3dee56b589ea9a693efa1d72ba394036efff168
* Remove extraneous parenthesesBernhard Rosenkränzer2014-11-181-1/+1
| | | | | | | Remove extraneous parentheses - they cause compiler warnings in clang Change-Id: Ie2efd9714f9e2251cf3b204b5c5dd1a8b8aaca13 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* 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.
| * Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-061-0/+3
| | | | | | | | | | | | | | Later we will enable integrated-as as default at the global level. BUG: 17820427 Change-Id: I8e67a152f82afdd1d6b81793ee7dd721ab2b59df
* | Resolved conflicts for merge of aed1d581 to lmp-dev-plus-aospDan Albert2014-08-081-10/+0
|\ \ | |/ | | | | Change-Id: Ib3877bfb60774d056fa2d934d2f4cb74e3b235ea
| * Merge "Revert "Fix build after side-stepping global -Bsymbolic.""Dan Albert2014-08-071-10/+0
| |\
| | * Revert "Fix build after side-stepping global -Bsymbolic."Dan Albert2014-08-081-10/+0
| | | | | | | | | | | | | | | | | | This reverts commit 3b909164de79904137bb6661514d5ca6236a49c9. Bug: 16853291
* | | am 4b599537: am 9ee1572f: Merge "Fix PIC relocations for non-Bsymbolic builds"Dan Albert2014-08-084-0/+4
|\ \ \ | |/ / | | | | | | | | | * commit '4b59953778bb49d0b316ad8f83991d5f6fb02fba': Fix PIC relocations for non-Bsymbolic builds
| * | Merge "Fix PIC relocations for non-Bsymbolic builds"Dan Albert2014-08-074-0/+4
| |\ \ | | |/ | |/|
| | * Fix PIC relocations for non-Bsymbolic buildsArd Biesheuvel2014-08-084-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ARM assembly contains a couple of hand-coded PC relative references to data defined in other object files. Make sure the externs are tagged as hidden so the linker knows that it can resolve the reference locally at build time. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@gmail.com> Bug: 16853291 Change-Id: If7bc8e5bb6a2c63b9df33666d56e6c42f398fd47
* | | Resolved conflicts for merge of 2af8711d to lmp-dev-plus-aospDan Albert2014-08-071-0/+10
|\ \ \ | |/ / | | | | | | Change-Id: I016dbca0318998f17fc741f873589c414774e7ff
| * | Fix build after side-stepping global -Bsymbolic.Dan Albert2014-08-071-0/+10
| |/ | | | | | | | | | | | | | | Some of the assembly in the codecs is generating invalid relocations without -Bsymbolic. Leave it on for these projects for the time being. Bug: 16853291 Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
| * warnings be gone.Andreas Huber2014-04-111-1/+1
| | | | | | | | | | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts or errors downstream to a minimum. Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
* | Even more warnings (now errors) fixed to unbreak the sdk-x86 build(s).Andreas Huber2014-02-121-0/+3
| | | | | | | | Change-Id: Ib4a5ab1a9e50fe9e7747a907f8b4a8c207099fdb
* | warnings be gone.Andreas Huber2014-02-116-1/+21
|/ | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* am e63f850b: am da0dc0af: Add liblogYing Wang2013-04-091-1/+1
|\ | | | | | | | | * commit 'e63f850b179a43a344d438f202ad34ec7566f955': Add liblog
| * Add liblogYing Wang2013-04-091-1/+1
| | | | | | | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* | Turn off debug tags in stagefright modules.Dan Morrill2013-03-191-1/+1
|/ | | | | | | | | LOCAL_MODULE_TAGS := debug causes the module to be included in every userdebug build, regardless of whether it's specified as a dep by the device config. This CL switches them all to optional (i.e. default behavior) so that we can do (userdebug) device builds without pulling these in. Change-Id: I4b7b65afea61865dd38b3af55550fb8f10edf66d
* hardening: eliminate more .text relocationsNick Kralevich2012-10-181-2/+4
| | | | | | | In 74bc3e133bd59a65dbed70b5fc89549f04a545e2, a bunch of text relocations were cleaned up from amrwbenc. Looks like we forgot one. Fixed. Change-Id: I80d4c68be435c3461731374d2b6d3bdbd61354a5
* Merge "hardening: eliminate text relocations from amrwb"Jean-Baptiste Queru2012-08-163-6/+12
|\
| * hardening: eliminate text relocations from amrwbArd Biesheuvel2012-08-133-6/+12
| | | | | | | | Change-Id: I47235fc4afe6b916da1e999401fb3c8b12c94e62
* | aacenc/amrwbenc: Remove the now unused LINUX defineMartin Storsjo2012-08-162-3/+1
|/ | | | | | | This is no longer used by the codec code (except for the amrwbenc sample). Change-Id: I78c7f62f257c490bf44477217975a93abcc7779e
* Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-134-0/+380
| | | | | Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26 related-to-bug: 6647465
* AV Android make files changesJames Dong2012-03-281-6/+6
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* Remove obsolete software codec header files and amr encoders.Andreas Huber2012-03-162-302/+0
| | | | Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
* Switched to use the header files in /frameworks/nativeJames Dong2012-03-121-2/+2
| | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* am ea374096: am c24f5ba4: am 9a3f3b9d: am 67cf093d: Merge "stagefright ↵Conley Owens2012-03-091-4/+0
|\ | | | | | | | | | | | | amrwbenc: Simplify the definition of static_vo" * commit 'ea374096511f92206c264f3f1eb0551a05a34cd5': stagefright amrwbenc: Simplify the definition of static_vo
| * Merge "stagefright amrwbenc: Simplify the definition of static_vo"Conley Owens2012-03-091-4/+0
| |\
| | * stagefright amrwbenc: Simplify the definition of static_voMartin Storsjo2012-01-301-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | For GCC, all of inline, __inline and __inline__ work fine. For MSVC, only __inline works. (__inline should also be accepted by RVCT.) Change-Id: Ifbb1c848b200a8c4080624a3d3bd8b6ee498edb2
* | | am 6b4d7bad: am f7210cf5: am 7346d73c: am 77576ff4: Merge "stagefright ↵Jean-Baptiste Queru2012-02-271-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | amrwbenc: Remove a useless check" * commit '6b4d7bada0b1d34f93149211cb179b71c864d5d3': stagefright amrwbenc: Remove a useless check
| * | Merge "stagefright amrwbenc: Remove a useless check"Jean-Baptiste Queru2012-02-271-1/+1
| |\ \
| | * | stagefright amrwbenc: Remove a useless checkMartin Storsjo2012-02-241-1/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the Length field is unsigned, the comparison will always be false. The corresponding code in the aac encoder doesn't have any check for Length. This avoids a warning about comparison always being false. Change-Id: I57c28ff9d09cb9ac4effeaeb40db608ab976acc6
* | | am eb483de5: am bf5c5e5b: am c1da1e1b: am 94ee1bf2: Merge "stagefright ↵Jean-Baptiste Queru2012-02-271-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | amrwbenc: Change keyword ordering" * commit 'eb483de58e4b41cb549149459e492e9ad1d65bd0': stagefright amrwbenc: Change keyword ordering
| * | stagefright amrwbenc: Change keyword orderingMartin Storsjo2012-02-241-2/+2
| |/ | | | | | | | | | | | | This avoids warnings about 'static' not being at the beginning of the declarations. Change-Id: I80f91b8a0f7f61edcdca96c206fedbd74ec0d88e
* | Move away from MediaDebug and use ADebug insteadJames Dong2012-02-101-5/+5
| | | | | | | | Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
* | The AMR WB software encoder is now an OMX component.Andreas Huber2012-02-013-0/+557
|/ | | | Change-Id: Iebfb2696783a0163369ba4e8ef72e19ee76ad893
* Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"Jean-Baptiste Queru2012-01-241-2/+7
|\
| * stagefright amrwbenc: Make the mem_malloc function 64-bit safeMartin Storsjo2012-01-131-2/+7
| | | | | | | | Change-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)Steve Block2012-01-191-5/+5
| | | | | | | | Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)Steve Block2012-01-191-2/+2
|/ | | | Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
* stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2012-01-1272-1328/+1328
| | | | | | | | | | | | | | This was applied in AOSP master earlier, in commit b21611e5b0f1797e39e781d91ade023bac87637f, but when merged into the Google internal tree in 88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these changes have been brought in. (The diff of this merge commit and its first parent, d94b71d, is empty.) Therefore, reapply the rest of these changes on the files that still are present in the current version. Change-Id: I645a9b9134769958a11808a06163123d28d83e46
* Report call status from AudioSource::start() to file writerJames Dong2011-10-261-1/+5
| | | | | Change-Id: I5109dc87a92170dede4eaa58b039efe6d8b7c330 related-to-bug: 5514288
* am b32af642: am 31140598: am 16db83c2: am eb07c531: Merge "stagefright ↵Deckard Autoverifier2011-07-181-73/+0
|\ | | | | | | | | | | | | amrwbenc: Remove a duplicate, unused file" * commit 'b32af642454f3113cb1539821eb3b0dbf4174974': stagefright amrwbenc: Remove a duplicate, unused file
| * Merge "stagefright amrwbenc: Remove a duplicate, unused file"Deckard Autoverifier2011-07-181-73/+0
| |\
| | * stagefright amrwbenc: Remove a duplicate, unused fileMartin Storsjo2011-06-231-73/+0
| | | | | | | | | | | | | | | | | | | | | This file is identical to common/cmnMemory.c, and that's the file that is used by all the makefiles, not this one. Change-Id: I6a601c24a983285e55e5356bd5569853a1e2d7fe
| * | stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2011-04-2380-1359/+1359
| |/ | | | | | | Change-Id: I3c85d8ba4cfb164455d137cdbf3b5ecc941dc6b8
| * stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-2399-19823/+19823
| | | | | | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* | Convert line breaks to Unix styleMans Rullgard2011-05-2194-19594/+19594
| | | | | | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* | Fix AMRWB test util and remove useless filesJames Dong2011-03-218-281/+13
| | | | | | | | Change-Id: Ia11a1ec053855c9e692070d23c7a690c39cb3d5e
* | frameworks/base: remove LOCAL_PRELINK_MODULEIliyan Malchev2011-03-141-1/+1
|/ | | | | Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481 Signed-off-by: Iliyan Malchev <malchev@google.com>