summaryrefslogtreecommitdiff
path: root/libavcodec/dcadec.c
Commit message (Collapse)AuthorAge
...
* | Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'Michael Niedermayer2015-03-04
|\| | | | | | | | | | | | | | | | | | | | | * commit '25f613f8be3b51e4396b93cda131e4631ba54302': dca: Move syncword definitions to a separate header Conflicts: libavcodec/dca_parser.c libavformat/dtsdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Move syncword definitions to a separate headerDiego Biurrun2015-03-04
| |
* | avcodec/dca: move remaining tables to dcadataMichael Niedermayer2015-02-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86'Michael Niedermayer2015-02-17
|\| | | | | | | | | | | | | | | | | | | | | * commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86': dca: Remove separate header for DCA ExSS Conflicts: libavcodec/dca.h libavcodec/dca_exss.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Remove separate header for DCA ExSSDiego Biurrun2015-02-16
| | | | | | | | There is no point in having a separate header for a single declaration.
* | Merge commit '3a651f599a18b023602370b67a77eb0efa309b20'Michael Niedermayer2015-02-16
|\| | | | | | | | | | | | | | | | | | | | | | | * commit '3a651f599a18b023602370b67a77eb0efa309b20': dca: Move data tables from a header to an object file Conflicts: libavcodec/Makefile libavcodec/dcadata.h libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Move data tables from a header to an object fileDiego Biurrun2015-02-15
| | | | | | | | This allows sharing them with the DCA XLL extension w/o duplication.
* | avcodec/dcadec: Move remaining tables to dcadata.hMichael Niedermayer2015-02-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664'Michael Niedermayer2015-02-14
|\| | | | | | | | | | | | | | | | | | | * commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664': dca: Move all tables into dcadata.h Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Move all tables into dcadata.hDiego Biurrun2015-02-14
| |
* | Merge commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3'Michael Niedermayer2015-02-14
|\| | | | | | | | | | | | | * commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3': dca: Remove trace debugging code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Remove trace debugging codeDiego Biurrun2015-02-14
| |
* | Merge commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0'Michael Niedermayer2015-02-14
|\| | | | | | | | | | | | | | | | | | | | | * commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0': dca: Split code for handling the EXSS extension off into a separate file Conflicts: libavcodec/Makefile libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Split code for handling the EXSS extension off into a separate fileDiego Biurrun2015-02-14
| |
* | Merge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'Michael Niedermayer2015-02-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0': avcodec: Don't anonymously typedef structs Conflicts: libavcodec/alac.c libavcodec/cinepak.c libavcodec/cscd.c libavcodec/dcadec.c libavcodec/g723_1.c libavcodec/gif.c libavcodec/iff.c libavcodec/kgv1dec.c libavcodec/libopenjpegenc.c libavcodec/libspeexenc.c libavcodec/ra288.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avcodec: Don't anonymously typedef structsDiego Biurrun2015-02-14
| |
* | avcodec/dcadec: Check that the added xch channel isnt already thereMichael Niedermayer2014-12-17
| | | | | | | | | | | | | | Fixes null pointer dereference Fixes: signal_sigsegv_369609d_623_cov_2008234281_ES_6.1_16bit.dts Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: Use avpriv_float_dsp_alloc()Michael Niedermayer2014-11-20
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a'Michael Niedermayer2014-11-13
|\| | | | | | | | | | | | | | | | | | | | | * commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a': dcadec: initialize variables before use Conflicts: libavcodec/dcadec.c See: 53918a1c54b49e76c3ca517e2caada8372995712 Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dcadec: initialize variables before useVittorio Giovara2014-11-13
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 700751 / CID 700752
* | Merge commit '103391ca90b2f7c56ae756d76c76f7c3dfa28dd4'Michael Niedermayer2014-09-21
|\| | | | | | | | | | | | | * commit '103391ca90b2f7c56ae756d76c76f7c3dfa28dd4': dca: Remove some commented-out cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Remove some commented-out cruftDiego Biurrun2014-09-20
| |
* | Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'Michael Niedermayer2014-09-16
|\| | | | | | | | | | | | | | | | | | | | | * commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce': dca: K&R formatting cosmetics Conflicts: libavcodec/dca_parser.c libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: K&R formatting cosmeticsGabriel Dume2014-09-16
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec/dca: Make ff_dca_convert_bitstream() available to libavformat, ↵Michael Niedermayer2014-08-06
| | | | | | | | | | | | needed for dts_probe() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: remove unsignedness from constantMichael Niedermayer2014-06-18
| | | | | | | | | | | | | | POSIX gurantees >=32bit so it all fits in signed int Also >=32bit ints are assumed througout the codebase Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f2ce63246f5c934429f9cb857a794e07624d7912'Michael Niedermayer2014-06-18
|\| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f2ce63246f5c934429f9cb857a794e07624d7912': dcadec: replace ldexpf with a multiplication by a constant Conflicts: libavcodec/dcadec.c See: 6da06ef6bbc01b713f67ffb94e7697eb2393ebe4 See: 9ccb5455ca8c63eb330abd3c2ed6a9b0ae3b755e See: 6b88f22e895314164eef00ccbdbf11ad97a7c56f Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dcadec: replace ldexpf with a multiplication by a constantNiels Möller2014-06-18
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/dcadec: Check dca_dmixtable indexMichael Niedermayer2014-06-04
| | | | | | | | | | Found-by: Niels Möller <nisse@lysator.liu.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: remove fishy FFMAX()Michael Niedermayer2014-06-04
| | | | | | | | | | | | | | | | | | These where intended to maintain the previous behavior before dca_dmix_code() but it is unclear (to me) which way is correct and no sample seem to trigger the case, also they are incomplete for the purprose of error checking Found-by: Niels Möller <nisse@lysator.liu.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fix various typosLou Logan2014-06-03
| | | | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: dont use hex float, msvc doesnt support itMichael Niedermayer2014-05-23
| | | | | | | | | | Found-by: nevcairiel Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: use a constant instead of assuming every compiler can ↵Michael Niedermayer2014-05-23
| | | | | | | | | | | | | | optimize pow(2,-15) Idea-by: nevcairiel and wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: make dca_dmix_code() 650% fasterMichael Niedermayer2014-05-23
| | | | | | | | | | | | | | This effectively replaces the ldexpf() function call by a multiplication with a constant. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | dcadec: fix xxch_dmix_coeff and xxch_dmix_sf after mergeMichael Niedermayer2014-05-23
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6b7b8585d73548f08b98959df39d80b97677662f'Michael Niedermayer2014-05-23
|\| | | | | | | | | | | | | | | | | | | * commit '6b7b8585d73548f08b98959df39d80b97677662f': dca: Convert dca_dmixtable to integers Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Convert dca_dmixtable to integersNiels Möller2014-05-23
| | | | | | | | | | | | | | | | Also include zero in the table, eliminating a special case in the decoder. Signed-off-by: Niels Möller <nisse@southpole.se> Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/dcadec: add an assert to silence a uninitialized variable warningMichael Niedermayer2014-05-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: remove always true if()Michael Niedermayer2014-05-08
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: fix error message suppression codeMichael Niedermayer2014-04-16
| | | | | | | | | | | | Fixes part of Ticket3466 Found-by: Andrey_Karpov / PVS-Studio Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'b3d905b702dcdda9e3ae2bcb7b5580ca77a96ab7'Michael Niedermayer2014-04-14
|\| | | | | | | | | | | | | * commit 'b3d905b702dcdda9e3ae2bcb7b5580ca77a96ab7': dcadec: Delete redundant init_get_bits call Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dcadec: Delete redundant init_get_bits callNiels Möller2014-04-14
| | | | | | | | | | | | | | | | No initialization is needed in dca_decode_frame, because the next thing it does is calling dca_parse_frame_header, which takes care of the needed initialization. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '801c39e1e3058fc4ba822bfb5d8612d777111e32'Michael Niedermayer2014-04-13
|\| | | | | | | | | | | | | | | | | | | * commit '801c39e1e3058fc4ba822bfb5d8612d777111e32': dcadec: Use correct channel count in stereo downmix check Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dcadec: Use correct channel count in stereo downmix checkTim Walker2014-04-12
| | | | | | | | | | | | | | s->prim_channels is greater than num_core_channels when an XCh extension is present in the bitstream. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560'Michael Niedermayer2014-04-13
|\| | | | | | | | | | | | | | | | | | | * commit 'c8cf461c19e8e35df4b7364d9b90aa42f1ab4560': dcadec: Do not decode the XCh extension when downmixing to stereo Conflicts: libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dcadec: Do not decode the XCh extension when downmixing to stereoTim Walker2014-04-12
| | | | | | | | | | | | This is neither necessary nor currently supported. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Fix spelling error 'Inconsistant -> Inconsistent'Andreas Cadhalpun2014-03-06
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '4cb6964244fd6c099383d8b7e99731e72cc844b9'Michael Niedermayer2014-02-28
|\| | | | | | | | | | | | | | | | | | | | | * commit '4cb6964244fd6c099383d8b7e99731e72cc844b9': dcadec: simplify decoding of VQ high frequencies Conflicts: configure libavcodec/dcadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dcadec: simplify decoding of VQ high frequenciesChristophe Gisquet2014-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The vector dequantization has a test in a loop preventing effective SIMD implementation. By moving it out of the loop, this loop can be DSPized. Therefore, modify the current DSP implementation. In particular, the DSP implementation no longer has to handle null loop sizes. The decode_hf implementations have following timings: For x86 Arrandale: C SSE SSE2 SSE4 win32: 260 162 119 104 win64: 242 N/A 89 72 The arm NEON optimizations follow in a later patch as external asm. The now unused check for the y modifier in arm inline asm is removed from configure.
* | avcodec/dcadec: use brackets to ensure that no slow division is usedMichael Niedermayer2014-02-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>