summaryrefslogtreecommitdiffstats
path: root/libavcodec/dcadec.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-271-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'def97856de6021965db86c25a732d78689bd6bb0': lavc: AV-prefix all codec capabilities Conflicts: cmdutils.c ffmpeg.c ffplay.c libavcodec/8svx.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/adpcm.c libavcodec/alac.c libavcodec/atrac3plusdec.c libavcodec/bink.c libavcodec/dnxhddec.c libavcodec/dvdec.c libavcodec/dvenc.c libavcodec/ffv1dec.c libavcodec/ffv1enc.c libavcodec/fic.c libavcodec/flacdec.c libavcodec/flacenc.c libavcodec/flvdec.c libavcodec/fraps.c libavcodec/frwu.c libavcodec/gifdec.c libavcodec/h261dec.c libavcodec/hevc.c libavcodec/iff.c libavcodec/imc.c libavcodec/libopenjpegdec.c libavcodec/libvo-aacenc.c libavcodec/libvorbisenc.c libavcodec/libvpxdec.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/mjpegdec.c libavcodec/mpegaudiodec_float.c libavcodec/msmpeg4dec.c libavcodec/mxpegdec.c libavcodec/nvenc_h264.c libavcodec/nvenc_hevc.c libavcodec/pngdec.c libavcodec/qpeg.c libavcodec/ra288.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/sp5xdec.c libavcodec/takdec.c libavcodec/tiff.c libavcodec/tta.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/vp6.c libavcodec/vp9.c libavcodec/wavpack.c libavcodec/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec capabilitiesVittorio Giovara2015-07-271-1/+1
| | | | | | | | | | | | Express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec flagsVittorio Giovara2015-07-271-1/+1
| | | | | | | | | | | | Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | avcodec/dcadec: silence request_channels deprecation warningsJames Almer2015-07-121-2/+14
| | | | | | | | | | | | | | | | This also prevents an eventual compilation failure once request_channels is removed. Reviewed-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: James Almer <jamrial@gmail.com>
* | avcodec/dcadec: Search and decode frame in case it starts later in a packetMichael Niedermayer2015-05-231-2/+5
| | | | | | | | | | | | This fixes decoding the first frame of some dts files Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: Check active_bandsMichael Niedermayer2015-05-151-1/+6
| | | | | | | | | | | | Fixes CID1297594 part2 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: Check scale table indexMichael Niedermayer2015-05-151-4/+15
| | | | | | | | | | | | Fixes CID1297594 part 1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: Check subsubframesMichael Niedermayer2015-05-141-0/+4
| | | | | | | | | | | | Fixes: CID1239152 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: Check nchansMichael Niedermayer2015-05-141-0/+8
| | | | | | | | | | | | Fixes CID1239110 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'Michael Niedermayer2015-04-201-5/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25': lavc: Replace av_dlog and tprintf with internal macros Conflicts: libavcodec/aacdec.c libavcodec/audio_frame_queue.c libavcodec/bitstream.c libavcodec/dcadec.c libavcodec/dnxhddec.c libavcodec/dvbsubdec.c libavcodec/dvdec.c libavcodec/dvdsubdec.c libavcodec/get_bits.h libavcodec/gifdec.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_refs.c libavcodec/imc.c libavcodec/interplayvideo.c libavcodec/jpeglsdec.c libavcodec/libopencore-amr.c libavcodec/mjpegdec.c libavcodec/mpeg12dec.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_parser.c libavcodec/pngdec.c libavcodec/ratecontrol.c libavcodec/rv10.c libavcodec/svq1dec.c libavcodec/vqavideo.c libavcodec/wmadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: Replace av_dlog and tprintf with internal macrosVittorio Giovara2015-04-191-5/+5
| |
* | lavc/dts: Do not set bitrate for DTS-HD Master and High Resolution.Carl Eugen Hoyos2015-03-181-1/+3
| | | | | | | | | | | | Fixes ticket #4375. Reviewed-by: Hendrik Leppkes
* | avcodec/dcadec: if XLL is enabled use xll channelsMichael Niedermayer2015-03-161-1/+1
| | | | | | | | | | | | Fixes outputting 14 channels instead of 7 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: Only upsample as much data as is thereMichael Niedermayer2015-03-161-1/+1
| | | | | | | | | | Found-by: carl Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '217e4ff4d1f845b76e44634e29371cd09313d1c2'Michael Niedermayer2015-03-151-23/+180
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '217e4ff4d1f845b76e44634e29371cd09313d1c2': dca: Support for XLL (lossless extension) Conflicts: Changelog doc/general.texi libavcodec/Makefile libavcodec/dca.h libavcodec/dca_exss.c libavcodec/dcadata.h libavcodec/dcadec.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Support for XLL (lossless extension)Niels Möller2015-03-151-21/+178
| | | | | | | | | | | | Cleanup and integration by Diego Biurrun. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'Michael Niedermayer2015-03-041-3/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-041-3/+4
| |
* | avcodec/dca: move remaining tables to dcadataMichael Niedermayer2015-02-201-92/+4
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'f8c1719771dc4ac2e13e6bc8bf741854a30e3a86'Michael Niedermayer2015-02-171-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-161-1/+0
| | | | | | | | There is no point in having a separate header for a single declaration.
* | Merge commit '3a651f599a18b023602370b67a77eb0efa309b20'Michael Niedermayer2015-02-161-42/+131
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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-151-39/+39
| | | | | | | | This allows sharing them with the DCA XLL extension w/o duplication.
* | avcodec/dcadec: Move remaining tables to dcadata.hMichael Niedermayer2015-02-151-89/+0
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '2a9c6fae927964b5dd0b5d3d9292f5621bd21664'Michael Niedermayer2015-02-141-89/+0
|\ \ | |/ | | | | | | | | | | | | | | | | * 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-141-89/+0
| |
* | Merge commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3'Michael Niedermayer2015-02-141-146/+1
|\ \ | |/ | | | | | | | | | | * commit '8a213179aff0174d81b3e889134a3b4f7d21f5c3': dca: Remove trace debugging code Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Remove trace debugging codeDiego Biurrun2015-02-141-146/+1
| |
* | Merge commit 'b339019de4e5f4d3c661bbdba98ae248ab77e2f0'Michael Niedermayer2015-02-141-490/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-141-439/+2
| |
* | Merge commit '7f9f771eac0d37a632e0ed9bd89961d57fcfb7e0'Michael Niedermayer2015-02-141-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-141-2/+2
| |
* | avcodec/dcadec: Check that the added xch channel isnt already thereMichael Niedermayer2014-12-171-0/+4
| | | | | | | | | | | | | | 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-201-5/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'd5d2d6c3b8cff61eb26c18bbd977881cf6d5524a'Michael Niedermayer2014-11-131-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-131-2/+2
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 700751 / CID 700752
* | Merge commit '103391ca90b2f7c56ae756d76c76f7c3dfa28dd4'Michael Niedermayer2014-09-211-3/+1
|\ \ | |/ | | | | | | | | | | * commit '103391ca90b2f7c56ae756d76c76f7c3dfa28dd4': dca: Remove some commented-out cruft Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * dca: Remove some commented-out cruftDiego Biurrun2014-09-201-3/+1
| |
* | Merge commit '45ff7c93dd84a254cc96acc589e5ac3d7bd16bce'Michael Niedermayer2014-09-161-116/+117
|\ \ | |/ | | | | | | | | | | | | | | | | | | * 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-161-118/+118
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | avcodec/dca: Make ff_dca_convert_bitstream() available to libavformat, ↵Michael Niedermayer2014-08-061-1/+1
| | | | | | | | | | | | needed for dts_probe() Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avcodec/dcadec: remove unsignedness from constantMichael Niedermayer2014-06-181-8/+1
| | | | | | | | | | | | | | 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-181-0/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | * 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-181-1/+1
| | | | | | | | Signed-off-by: Anton Khirnov <anton@khirnov.net>
* | avcodec/dcadec: Check dca_dmixtable indexMichael Niedermayer2014-06-041-0/+10
| | | | | | | | | | 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-041-2/+2
| | | | | | | | | | | | | | | | | | 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-031-1/+1
| | | | | | | | | | 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-231-1/+2
| | | | | | | | | | 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-231-1/+1
| | | | | | | | | | | | | | optimize pow(2,-15) Idea-by: nevcairiel and wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud