summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/codecs/mp3dec
Commit message (Collapse)AuthorAgeFilesLines
* codecs: update for check ifeq ($(TARGET_ARCH),arm)Yongqin Liu2016-01-081-5/+8
| | | | | | | | | | This condition check will only pass when compile for 32bit platform. It will not pass when generate the 32bit binary or libarary for 64bit platform. update it with variants like LOCAL_SRC_FILES_arm to make it used by 32bit binary or library on 64biy platform as well Change-Id: Ia887610a97c68fa58925d2d86c5eb29cb397d6ef Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
* stagefright: Add support for custom size i/p buffervivek mehta2015-10-062-4/+30
| | | | | | | - handle non default input buffer size - fix issues associated with non-default buffer size Change-Id: Iad31f5c85601983b01e18e130b1c3eecb3988e30
* stagefright: Fix to play a specific Mp4 clip due to SYNCH_LOST_ERROR.Mingming Yin2015-10-061-5/+8
| | | | | | | | - Unable to play a Specific Mp4 clip. - Mp3 playback is stopped if the Decoder errors out with SYNCH_LOST_ERROR. - Ignore the frame with SYNCH_LOST_ERROR and play silence instead. Change-Id: I6b94a83cf89e8bc6792d8ee3804042d629aa505b
* Fix SoftMP3 divide by 0Andy Hung2015-06-301-2/+6
| | | | | Bug: 21525346 Change-Id: I19f1ec0f4e9571bd6aeb26efbcba5f16dc664e47
* 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
* 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-081-0/+1
|\ \ \ | |/ / | | | | | | | | | * commit '4b59953778bb49d0b316ad8f83991d5f6fb02fba': Fix PIC relocations for non-Bsymbolic builds
| * | Merge "Fix PIC relocations for non-Bsymbolic builds"Dan Albert2014-08-071-0/+1
| |\ \ | | |/ | |/|
| | * Fix PIC relocations for non-Bsymbolic buildsArd Biesheuvel2014-08-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | am b6af7c63: am 05eaf105: Merge "Mp3decoder: Remove unused arm assembly files"Narayan Kamath2014-06-035-1413/+0
|\ \ | |/ | | | | | | * commit 'b6af7c635113d288d16a4f549679beffd86822d8': Mp3decoder: Remove unused arm assembly files
| * Mp3decoder: Remove unused arm assembly filesAshok Bhat2014-05-275-1413/+0
| | | | | | | | | | | | | | | | | | The unused ARM assembly files were written for legacy proprietary ARM compilers. They are not needed when gcc or clang compiler is used. Change-Id: I8dfe9ad458efbb34922094e943ad334cc34f59a3 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
| * warnings be gone.Andreas Huber2014-04-112-2/+2
| | | | | | | | | | | | | | | | (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
| * Fix decoder EOS handlingMarco Nelissen2014-04-022-53/+63
| | | | | | | | | | | | | | | | | | | | Conceptually it should be the same whether EOS is signalled on the last buffer holding data, or an empty buffer that follows. Make it so that this actually behaves the same for mp3, AAC and Vorbis. b/8747869 Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
* | MediaCodec: add getInputFormat() methodLajos Molnar2014-03-101-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional input-port format item: int32: "adaptive-playback" video decoders only whether codec is configured for adaptive playback. In this case, if codec has max-width/height limits, those limits are also exposed (int32: "max-width", "max-height") Also, getInput/OutputFormat() is now callable in CONFIGURED and STARTING states, although output format may be missing CSD fields until INFO_OUTPUT_FORMAT_CHANGED message. Includes missing OMX support for MP3 software decoder. Bug: 11785204 Change-Id: I90c7e34ba81c7b81c43641599f3f496e838958c6
* | warnings be gone.Andreas Huber2014-02-113-2/+6
| | | | | | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* | Fix restart after EOS for mp3Marco Nelissen2014-02-051-0/+3
| | | | | | | | | | | | b/12890850 Change-Id: I985a1ae94d7d62701296d95da34974eb29fcc535
* | Fix decoder EOS handlingMarco Nelissen2013-09-042-53/+63
|/ | | | | | | | | | Conceptually it should be the same whether EOS is signalled on the last buffer holding data, or an empty buffer that follows. Make it so that this actually behaves the same for mp3, AAC and Vorbis. b/8747869 Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
* Revert "Fix decoder EOS handling"Eric Laurent2013-08-302-63/+53
| | | | | | | This reverts commit 9da36a6c8df70a5c8179ac78fab33cfbb5078cb2. Bug: 10571297. Change-Id: I76f20fe34872ea54fce626077462fb86c8c3f02e
* Fix decoder EOS handlingMarco Nelissen2013-08-302-53/+63
| | | | | | | | | | Conceptually it should be the same whether EOS is signalled on the last buffer holding data, or an empty buffer that follows. Make it so that this actually behaves the same for mp3, AAC and Vorbis. b/8747869 Change-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92
* Fix our software decoders to reset (more of) their internal stateAndreas Huber2013-06-031-0/+2
| | | | | | | properly on a transition from idle->loaded. Change-Id: I56ccfeef24c391e50e42b522194206e35c7ab700 related-to-bug: 9105408
* Apparently the mp3 decoder glitches if it was configured with the wrongAndreas Huber2013-04-171-0/+15
| | | | | | | sample rate. Make sure we tell it about the one the extractor provides. Change-Id: Ice5b9cf55485ca1a8f099a14be0202be9540e781 related-to-bug: 8621639
* Add liblogYing Wang2013-04-091-1/+1
| | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* Make codecs reconfigurableMarco Nelissen2012-12-182-0/+6
| | | | Change-Id: I3dd46cb4401493becbf6152f4dcd5a8f1e9a0b44
* am 0df213ba: am dde79acf: Merge "hardening: eliminate text relocations from mp3"Jean-Baptiste Queru2012-08-163-7/+9
|\ | | | | | | | | * commit '0df213babc4fb41b7daa05cb3c08071f2b60f6a5': hardening: eliminate text relocations from mp3
| * hardening: eliminate text relocations from mp3Ard Biesheuvel2012-08-133-7/+9
| | | | | | | | Change-Id: I671ed4c8c7bb15172a8b64d513e2844319495102
* | Only emit padding at the end of the stream in the aac and mp3 decodersAndreas Huber2012-08-071-6/+18
|/ | | | | | if we actually discarded content at the beginning of the stream. Change-Id: I1e79835bb3a02350060a137b94f85f2c90f4a12b
* Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-132-0/+190
| | | | | Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26 related-to-bug: 6647465
* Ignore sideband parsing errors and spit out a frame of silence.Andreas Huber2012-05-151-6/+6
| | | | | Change-Id: I274d8e9018e02eb42121a2440b42caefeca94fb0 related-to-bug: 6498193
* AV Android make files changesJames Dong2012-03-281-2/+2
| | | | | | | 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
* Support gapless playback for mp3 and m4aMarco Nelissen2012-03-222-6/+20
| | | | | | | | | Gapless playback for appropriately tagged mp3 and m4a files. Currently this is implemented in OMXCodec, which most players use, but should be easy to support in other players as well by using the SkipCutBuffer utility class. Change-Id: I748c669adc1cfbe5ee9a7dea2fad945d48882551
* Switched to use the header files in /frameworks/nativeJames Dong2012-03-121-1/+1
| | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-2/+2
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-1/+1
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Remove old-style software decoders.Andreas Huber2011-07-132-227/+0
| | | | Change-Id: Ie0729d6a65470ffdc38229791f25a75a22c724d8
* Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.Andreas Huber2011-05-251-0/+1
| | | | Change-Id: I9d2ee63495f161e30daba7c3aab16cb9d8ced6a5
* Fix module tags on stagefright software decoders.Andreas Huber2011-05-161-1/+1
| | | | | Change-Id: I8b3f60760e1e8eaa0f66eb6c7ce3df8e425638fb related-to-bug: 4427361
* Squashed commit of the following:Andreas Huber2011-05-113-0/+428
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit c80992e419ed567abef451042f09c4958534b90d Author: Andreas Huber <andih@google.com> Date: Wed May 11 14:00:07 2011 -0700 Support for the mp3 audio decoder as a software OMX component. Change-Id: I66e10c4d0be4c3aecdef1c21b15a2c7359ceb807 commit a358d0e1bf2a88897887445f42ccdda0f5f2f528 Author: Andreas Huber <andih@google.com> Date: Wed May 11 13:11:23 2011 -0700 Support for G.711 alaw and mulaw decoders as software OMX components Change-Id: Ia5c76c02cb83a9f94ce39a27b2251e5880218f03 commit 79088b9c9a5c8b8c97ea66cb4f90a2b0f0d34553 Author: Andreas Huber <andih@google.com> Date: Thu May 5 15:43:32 2011 -0700 Instead of using an RGB surface and conversion yuv420->rgb565 convert from OMX_COLOR_FormatYUV420Planar to HAL_PIXEL_FORMAT_YV12 instead. Change-Id: I8c4fc3c54c963f0d4ba6377f3c4ab4e0013152e5 related-to-bug: 4394005 commit 69469d3bd84425777b11b9fc938c5e0c61af26a7 Author: Andreas Huber <andih@google.com> Date: Tue May 10 15:46:42 2011 -0700 voip mustn't link against libstagefright.so Change-Id: I4d0ba9a8b9dc9380b792a1bd04bcda231964862c commit 2a9a9eeeeeb36ae3a9e680469c3016d509ff08c3 Author: Andreas Huber <andih@google.com> Date: Tue May 10 14:37:10 2011 -0700 Remove most non-OMX software decoders by default Change-Id: Ic56514bc1b56b8fa952e8c4a164ea7379ecb69d0 commit a4de62c37b335c318217765403a9fb282b20a216 Author: Andreas Huber <andih@google.com> Date: Mon May 9 16:50:02 2011 -0700 Conditionally build the old-style software decoders. Change-Id: I5de609e1d76c92d26d6eb81d1551462258f3f15f commit 5d8b039f9449dc3dad1e77c42c80cc0b54b0c846 Author: Andreas Huber <andih@google.com> Date: Mon May 9 16:13:12 2011 -0700 Support for MPEG4 and H.263 video decoders as soft OMX components. Change-Id: I5e3a4835afab89f98e3aa128d013628f5830eafe commit b25a1bfbeb0ff6e62e1cc694ce2599c91489c7d0 Author: Andreas Huber <andih@google.com> Date: Mon May 9 11:49:10 2011 -0700 Boost Soft OMX thread priority, fix timestamp handling in vorbis Soft OMX decoder. Change-Id: I68d26d4999f06fcc451d69e5303663fab0cba9e8 commit c0574362f8dc3319ce84d981097867062a698527 Author: Andreas Huber <andih@google.com> Date: Mon May 9 11:28:53 2011 -0700 Support for the AMR decoders (NB and WB) as Soft OMX components. Change-Id: Ia565f59833fb52653e23f26536e7e41fc329a754 commit 3e5575a8f0e27a490cb7bde77bd9456087837f08 Author: Andreas Huber <andih@google.com> Date: Wed May 4 13:41:25 2011 -0700 Signal an error if the aac decoder failed to initialize from codec specific data. Change-Id: I01da7831bdf722edd7d6dc5974486daa2cf2b209 related-to-bug: 4272179 commit f94aeaa9886e772ff4823e671ed237096649f4af Author: Andreas Huber <andih@google.com> Date: Tue May 3 13:07:38 2011 -0700 Software OMX nodes don't (yet?) support native_window mode. Change-Id: I7d9ca9164ef4abf66b573ca21dba12d672f8b12d commit eefdfabac8dc659e00daa56da69aea705c49cb67 Author: Andreas Huber <andih@google.com> Date: Tue May 3 12:57:16 2011 -0700 Fixing the OMX tests to refer to appropriate files from test content. Change-Id: I5b61c3498749bfb876abbd3946a5132356e3f6ff commit f31b7326aef14b6a1b7946520a9688f092e844d5 Author: Andreas Huber <andih@google.com> Date: Tue May 3 11:08:38 2011 -0700 Soft OMX components are now dynamiclly loaded/unloaded, not directly linked against. Change-Id: I1e2ecfbfab67a8869886f738eaf0c7b3c948b6d9 commit b7f0343879e4df06f0a1c9bfece24df557954e2f Author: Andreas Huber <andih@google.com> Date: Mon May 2 15:58:36 2011 -0700 Support for the AVC software decoder as an OMX component. Change-Id: I13c12df435ba4afbd968a9fc659f66b91c818bc2 commit 5bb9e616d6c8e1b13d531fe996b9a9affdfb2977 Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 12:05:37 2011 -0700 Fix Vorbis OMX decoder's component role. Change-Id: I5e871e5e11b3f951c93590210e63fd7987c467b5 commit 089c91f2333062e196c7afd5fb0ca914878aa474 Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 12:05:18 2011 -0700 Support vorbis_decoder OMX testing. Change-Id: I1985be178a12ae3f8768bc72067d9236238be170 commit 56e241fa36fc37219bc536b823bdc2ab82dc1fad Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 12:01:46 2011 -0700 SoftVorbis OMX component now respects the number of valid frames per page. Change-Id: I82a117a064d9b083fc58a54ad900a987a763ef03 commit fcd618ec520c376fdb78f4cbb44b8d9f5d213e2b Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 10:59:38 2011 -0700 Support for the vorbis audio decoder as a soft OMX component. Change-Id: Iaeb057e58ca306d3dce205c0445b74d5aefef492 commit d1fcc3203fc8003ad79c6e96b3a1fc4261743f16 Author: Andreas Huber <andih@google.com> Date: Fri Apr 29 10:07:50 2011 -0700 VPX decoder now properly resizes buffers after a port settings change. Change-Id: I110749a31b6cba087891d8e5dfe420830bdbf831 commit 35c7168243cb69849d88911144a2c7fdfed5c54e Author: Andreas Huber <andih@google.com> Date: Thu Apr 28 13:23:34 2011 -0700 Support for the VPX video decoder as a Software OMX component. Change-Id: Ic345add2d6d768d4af631160153f2e9b97fcea71 commit 923b2534b4211fc5405377b5190bfa6f2dd27f32 Author: Andreas Huber <andih@google.com> Date: Thu Apr 28 11:34:40 2011 -0700 Table-based registration of soft omx components. Change-Id: I7f45f0fa5b3a7950776e69c66349731f7674e937 commit 04a88f3edb2266a463da9c4481b80178be460902 Author: Andreas Huber <andih@google.com> Date: Thu Apr 28 11:22:31 2011 -0700 Apparently OMX_GetParameter is valid in any state other than OMX_StateInvalid OMX_SetParameter is still constrained to OMX_StateLoaded or a disabled port. Change-Id: I1032d7cf4011982d306aa369d4158a82830d26fb commit 9d70ca68445e7c40f5c9b2d12466e468f514de88 Author: Andreas Huber <andih@google.com> Date: Wed Apr 27 15:03:18 2011 -0700 Use the new soft OMX aac decoder for HTTP live playback. Change-Id: Ifbcfb732a9edb855cb46b49f6d0ac942170ee28f commit 213fe4a10ea93cce08e8622dc3908053f29878a1 Author: Andreas Huber <andih@google.com> Date: Tue Apr 12 16:39:45 2011 -0700 Foundation for supporting software decoders as OMX components Change-Id: I7fdab256563b35d1d090617abaea9a26b198d816 Change-Id: I83e9236beed4af985d10333c203f065df9e09a42
* If MP3 decoder output frame size were 0, media server would crash.James Dong2011-03-111-1/+9
| | | | | | This is to log an error message should that happen. Change-Id: I0f947cd7a8e6639b4f11a928bf90286a34cc652e
* PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in ↵James Dong2011-03-021-2/+4
| | | | | | | | unit of bits bug - 3464899 Change-Id: Idef81a1bd3846d60fc5e4a40c11ce1ba78ebaa23
* libstagefright: Compile MP3 & AAC decoders in 32bit ARM ModeJames Wylder2010-12-091-0/+2
| | | | | | | | Speeds up the decoding leaving more time for cpuidle (lp2), thus lowering overall current drain. Change-Id: Ia4e0636b1813810072fe0a4f94f6921adf2eab31 Signed-off-by: James Wylder <james.wylder@motorola.com>
* Increase scratch buffers sizes in mp3 software decoder, this integrates a PV ↵Andreas Huber2010-10-073-4/+4
| | | | | | | master/opensource patch. Change-Id: I5a637f1b380e44c94040ec507843d58a1f5a9b61 related-to-bug: 3065605
* Properly flush the AudioTrack/AudioSink on a seek request and make sure that ↵Andreas Huber2010-09-281-0/+4
| | | | | | | both the mp3 decoder and aac software decoders start fresh after a seek without any dependency on previously decoded content. Change-Id: I4909fdf19518dbabb6c340e2a31b50dfe6c5b067 related-to-bug: 3029947
* Support finer seek control on MediaSources.Andreas Huber2010-07-211-1/+2
| | | | | | related-to-bug: 2858448 Change-Id: Ifb4b13b990fd5889113e47e2c62249ac43391fa1
* Fix a number of timestamp mismatches in the mp3 extractor and decoder that ↵Andreas Huber2010-06-231-27/+30
| | | | | | | would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s. Change-Id: I11abc05b62a958ffbc99ca997cd184a2f2199352 related-to-bug: 2667479
* Properly fill in the component name for the software decoders.Andreas Huber2010-03-301-0/+2
| | | | | Change-Id: I92071481f7ed94922b10856c981e507a9eec4c0c related-to-bug: 2557787
* Either the software mp3 decoder's CRC computation is wrong (and PV never ↵Andreas Huber2010-03-181-1/+1
| | | | | | | enabled it before) or there are files in the wild with wrong CRCs that nonetheless decode correctly, either way, opt out of CRC verification. Change-Id: I1d9bd78f4efb53faa82c67110cf61f78122e40f8 related-to-bug: 2511393