summaryrefslogtreecommitdiffstats
path: root/libavcodec/wmalosslessdec.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-061-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) dfa: use more meaningful return codes eatgv: check vector_bits eatgv: check motion vectors Mark a number of variables only used in av_dlog() calls as av_unused. dvdec: drop const qualifier from variable to eliminate a warning avcodec: Improve comment for thread_safe_callbacks to avoid misinterpretation. tests/utils: don't ignore the return value of fwrite() lavfi/formats: use sizeof(var) instead of sizeof(type). lavfi: remove avfilter_default_config_input_link() declaration lavfi: always enable the scale filter and depend on sws. vf_split: support user-specifiable number of outputs. avconv: remove stray useless comment. mpegmux: add stuffing to avoid incomplete PCM frames rtsp: avoid const warnings from strtol() call avserver: check return value of ftruncate() lagarith: make offset array type unsigned dfa: add some checks to ensure that decoder won't write past frame end aacps: NEON optimisations aacps: align some arrays aacps: move some loops to function pointers ... Conflicts: configure doc/filters.texi libavcodec/dfa.c libavcodec/eatgv.c libavfilter/Makefile libavfilter/allfilters.c libavfilter/avfilter.h libavfilter/formats.c libavfilter/vf_split.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Mark a number of variables only used in av_dlog() calls as av_unused.Diego Biurrun2012-05-061-1/+2
| | | | | | | | This fixes a number of unused-but-set gcc warnings.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-051-3/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: tests: Refactor rotozoom/videogen common code into a separate file. tests: Mark some file-internal symbols as static. build: Drop leftover .exp pattern from LIBSUFFIXES list. vsrc_buffer: return EAGAIN if no frame is available. WMAL: Shift output samples by the specified number of padding zeroes. WMAL: Restore removed code in mclms_predict() rtpdec_h264: Remove a useless ifdef rtpdec_h264: Remove outdated/useless/incorrect comments rtpdec_h264: Remove useless memory corruption checks rtpdec_h264: Return proper error codes rtpdec_h264: Check the available data length before reading rtpdec_h264: Add input size checks png: check bit depth for PAL8/Y400A pixel formats. ea: check chunk_size for validity. celp filters: Do not read earlier than the start of the 'out' vector. Conflicts: libavcodec/pngdec.c libavfilter/src_buffer.c tests/rotozoom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * WMAL: Shift output samples by the specified number of padding zeroes.Jakub Stachowski2012-05-051-2/+2
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * WMAL: Restore removed code in mclms_predict()Mashiat Sarker Shakkhar2012-05-051-0/+2
| | | | | | | | | | | | Based on observations made by Jakub Stachowski <qbast@go2.pl> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-031-4/+5
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpeg12: fixed parsing in some mpeg2 streams Add SMPTE240M transfer characteristics flag. mpegts: Some additional HDMV types and reg descriptors for mpegts motionpixels: Clip YUV values after applying a gradient. jpeg: handle progressive in second field of interlaced. ituh263dec: Implement enough of Annex O (scalability) to fix a FPE. h263: more strictly forbid frame size changes with frame-mt. h264: additional protection against unsupported size/bitdepth changes. tta: prevents overflows for 32bit integers in header. configure: remove malloc_aligned. vp8: update frame size changes on thread context switches. snowdsp: explicitily state instruction size. wmall: fix reconstructing audio with uncoded channels WMAL cosmetics: fix indentation gitignore: add Win32 library suffixes Conflicts: configure libavcodec/h263dec.c libavcodec/h264.c libavcodec/ituh263dec.c libavcodec/mjpegdec.c libavcodec/wmalosslessdec.c libavcodec/x86/snowdsp_mmx.c libavformat/mpegts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmall: fix reconstructing audio with uncoded channelsKostya Shishkov2012-05-021-3/+3
| |
| * WMAL cosmetics: fix indentationMashiat Sarker Shakkhar2012-05-021-1/+1
| | | | | | | | Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | Don't restrict reverse decorrelation to both coded channels. It is also used ↵Jakub Stachowski2012-05-021-1/+1
| | | | | | | | | | | | for mono data. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-011-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avplay: use libavresample for sample format conversion and channel mixing Fix compilation with YASM/NASM without AVX support. WMAL: do not output last frame again if nothing was decoded in current packet WMAL: do not start decoding if frame does not end in current packet adpcm-thp: fix invalid array indexing ppc: add const where needed in scalarproduct_int16_altivec() ppc: remove shift parameter from scalarproduct_int16_altivec() ppc: dsputil: do unaligned block accesses correctly dvenc: do not call dsputil functions with stride not a multiple of 16 APIchanges: fill in some dates and commit hashes Conflicts: doc/APIchanges ffplay.c libavcodec/adpcm.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * WMAL: do not output last frame again if nothing was decoded in current packetJakub Stachowski2012-05-011-0/+2
| | | | | | | | | | | | Reviewed-by: Mashiat Sarker Shakkhar <mashiat.sarker@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
| * WMAL: do not start decoding if frame does not end in current packetMashiat Sarker Shakkhar2012-05-011-2/+2
| | | | | | | | | | | | | | This fixes decoding of frames which span more than two packets. Tested with recit24.wma. Signed-off-by: Kostya Shishkov <kostya.shishkov@gmail.com>
* | wmalossless: Ensure that last frame is not written again if nothing was ↵Jakub Stachowski2012-04-211-0/+2
| | | | | | | | | | | | | | decoded in current packet. Reviewed-by: Mashiat Sarker Shakkhar <mashiat.sarker@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-04-141-9/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vsrc_buffer: fix check from 7ae7c41. libxvid: Reorder functions to avoid forward declarations; make functions static. libxvid: drop some pointless dead code wmal: vertical alignment cosmetics wmal: Warn about missing bitstream splicing feature and ask for sample. wmal: Skip seekable_frame_in_packet. wmal: Drop unused variable num_possible_block_size. avfiltergraph: make the AVFilterInOut alloc/free API public graphparser: allow specifying sws flags in the graph description. graphparser: fix the order of connecting unlabeled links. graphparser: add avfilter_graph_parse2(). vsrc_buffer: allow using a NULL buffer to signal EOF. swscale: handle last pixel if lines have an odd width. qdm2: fix a dubious pointer cast WMAL: Do not try to read rawpcm coefficients if bits is invalid mov: Fix detecting there is no sync sample. tiffdec: K&R cosmetics avf: has_duration does not check the global one dsputil: fix optimized emu_edge function on Win64. Conflicts: doc/APIchanges libavcodec/libxvid_rc.c libavcodec/libxvidff.c libavcodec/tiff.c libavcodec/wmalosslessdec.c libavfilter/avfiltergraph.h libavfilter/graphparser.c libavfilter/version.h libavfilter/vsrc_buffer.c libswscale/output.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmal: vertical alignment cosmeticsMashiat Sarker Shakkhar2012-04-141-2/+2
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * wmal: Warn about missing bitstream splicing feature and ask for sample.Mashiat Sarker Shakkhar2012-04-141-0/+2
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * wmal: Skip seekable_frame_in_packet.Mashiat Sarker Shakkhar2012-04-141-3/+2
| | | | | | | | | | | | | | There is no point in storing the value in a variable, since it is not used anywhere else in the decoder. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * wmal: Drop unused variable num_possible_block_size.Mashiat Sarker Shakkhar2012-04-141-2/+1
| | | | | | | | | | | | This is probably a leftover from WMA Pro. Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * WMAL: Do not try to read rawpcm coefficients if bits is invalidMichael Niedermayer2012-04-131-0/+5
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Clear residues only in not coded channel. This fixes overwriting coded ↵Jakub Stachowski2012-04-141-1/+1
| | | | | | | | | | | | residues with zeros if first channel is coded and second is not. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmalosslessdec: Reset put bit buffer when num_saved_bits is reset.Michael Niedermayer2012-04-141-0/+2
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmalosslessdec: Fix reading too many bits in decode_channel_residues()Michael Niedermayer2012-04-141-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmalosslessdec: fix a get_bits(0) in decode_ac_filterMichael Niedermayer2012-04-141-1/+1
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmalosslessdec: make mclms arrays big enough for whats written into them.Michael Niedermayer2012-04-141-2/+2
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmalosslessdec: Make arrays WMALL_BLOCK_MAX_SIZE big and check ↵Michael Niedermayer2012-04-141-5/+9
| | | | | | | | | | | | | | | | | | samples_per_frame. The samples_per_frame check is ported from wmaprodec.c Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmalosslessdec: Reset residues to 0 if they were not decoded from bitstream.Jakub Stachowski2012-04-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | If channel residues are have not been decoded from bitstream, they should be initialized to 0 instead of using values from previous subframe. This causes bursts of noise in silent parts of some files. This patch fixes bug #1055 Reviewed-by: Benjamin Larsson <benjamin@southpole.se> Reviewed-by: Mashiat Sarker Shakkhar <mashiat.sarker@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmalosslessdec: rawpcm_tile fixes to keep get_bits() values within defined ↵Michael Niedermayer2012-04-071-1/+5
| | | | | | | | | | | | range. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmalosslessdec: channel residues can be 32 bit thus need _long bitreader.Michael Niedermayer2012-04-071-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-301-8/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mp3dec: perform I/S and M/S only when frame mode is joint stereo. id3v2: add another mimetype for JPEG image lzw: prevent buffer overreads. WMAL: Remove inaccurate and unnecessary doxy h264: fix cabac-on-stack after safe cabac reader. truemotion2: convert packet header reading to bytestream2. Conflicts: libavcodec/lzw.c libavcodec/truemotion2.c libavformat/id3v2.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * WMAL: Remove inaccurate and unnecessary doxyMashiat Sarker Shakkhar2012-03-291-8/+0
| | | | | | | | | | | | | | | | A call to decode_packet() does not always decode a complete WMA packet. Moreover, this is not the correct place to document calls that are part of the public API. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-291-0/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: asf: only set index_read if the index contained entries. cabac: add overread protection to BRANCHLESS_GET_CABAC(). cabac: increment jump locations by one in callers of BRANCHLESS_GET_CABAC(). cabac: remove unused argument from BRANCHLESS_GET_CABAC_UPDATE(). cabac: use struct+offset instead of memory operand in BRANCHLESS_GET_CABAC(). h264: add overread protection to get_cabac_bypass_sign_x86(). h264: reindent get_cabac_bypass_sign_x86(). h264: use struct offsets in get_cabac_bypass_sign_x86(). h264: fix overreads in cabac reader. wmall: fix seeking. lagarith: fix buffer overreads. dvdec: drop unnecessary dv_tablegen.h #include build: fix doc generation errors in parallel builds Replace memset(0) by zero initializations. faandct: Remove FAAN_POSTSCALE define and related code. dvenc: print allowed profiles if the video doesn't conform to any of them. avcodec_encode_{audio,video}: only reallocate output packet when it has non-zero size. FATE: add a test for vp8 with changing frame size. fate: add kgv1 fate test. oggdec: calculate correct timestamps in Ogg/FLAC Conflicts: libavcodec/4xm.c libavcodec/cook.c libavcodec/dvdata.c libavcodec/dvdsubdec.c libavcodec/lagarith.c libavcodec/lagarithrac.c libavcodec/utils.c tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmall: fix seeking.Ronald S. Bultje2012-03-281-0/+13
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-221-24/+54
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: xwma: Validate channels and bits_per_coded_sample. mov: Do not read past the end of the ctts_data table. mov: Add missing terminator to mov_ch_layout_map_1ch. asf: reset side data elements on packet copy. wmavoice: fix stack overread. wmalossless: error out if a subframe is not used by any channel. vqa: check palette chunk size before reading data. wmalossless: reset sample pointer for each subframe. wmalossless: error out on invalid values for order. Conflicts: libavcodec/vqavideo.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmalossless: error out if a subframe is not used by any channel.Ronald S. Bultje2012-03-221-3/+10
| | | | | | | | | | | | | | Prevents infinite loop because min_channel_len never increments. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * wmalossless: reset sample pointer for each subframe.Ronald S. Bultje2012-03-221-12/+19
| | | | | | | | | | | | | | Prevents overwrites when some subframes only encode some channels. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
| * wmalossless: error out on invalid values for order.Ronald S. Bultje2012-03-221-9/+25
| | | | | | | | | | Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-221-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: FATE: Add ZeroCodec test oggparseogm: fix order of arguments of avpriv_set_pts_info(). pngenc: better upper bound for encoded frame size. aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C aiffdec: do not set bit rate if block duration is unknown wmall: output packet only if we have decoded some samples Conflicts: libavcodec/pngenc.c tests/fate/lossless-video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmall: output packet only if we have decoded some samplesKostya Shishkov2012-03-221-2/+2
| | | | | | | | | | Also set CODEC_CAP_DELAY to indicate that decoder may still have some undecoded data left in internal buffer.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-081-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) sbrdsp.asm: convert all instructions to float/SSE ones. dv: cosmetics. dv: check buffer size before reading profile. Revert "AAC SBR: group some writes." udp: Print an error message if bind fails cook: extend channel uncoupling tables so the full bit range is covered. roqvideo: cosmetics. roqvideo: convert to bytestream2 API. dca: don't use av_clip_uintp2(). wmall: fix build with -DDEBUG enabled. smc: port to bytestream2 API. AAC SBR: group some writes. dsputil: remove shift parameter from scalarproduct_int16 SBR DSP: unroll sum_square rv34: remove dead code in intra availability check rv34: clean a bit availability checks. v4l2: update documentation tgq: convert to bytestream2 API. parser: remove forward declaration of MpegEncContext dca: prevent accessing static arrays with invalid indexes. ... Conflicts: doc/indevs.texi libavcodec/Makefile libavcodec/dca.c libavcodec/dvdata.c libavcodec/eatgq.c libavcodec/mmvideo.c libavcodec/roqvideodec.c libavcodec/smc.c libswscale/output.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * wmall: fix build with -DDEBUG enabled.Ronald S. Bultje2012-03-071-9/+8
| |
| * wma: Refactor common code to fix standalone compilation of WMA lossless decoder.Diego Biurrun2012-03-071-0/+1
| |
* | Remove AV_LOG_DEBUG from av_dlog() calls.Carl Eugen Hoyos2012-03-051-8/+8
| | | | | | | | AV_LOG_DEBUG is forced by the av_dlog definition.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-031-648/+334
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) amrwb: remove duplicate arguments from extrapolate_isf(). amrwb: error out early if mode is invalid. h264: change underread for 10bit QPEL to overread. matroska: check buffer size for RM-style byte reordering. vp8: disable mmx functions with sse/sse2 counterparts on x86-64. vp8: change int stride to ptrdiff_t stride. wma: fix invalid buffer size assumptions causing random overreads. Windows Media Audio Lossless decoder rv10/20: Fix slice overflow with checked bitstream reader. h263dec: Disallow width/height changing with frame threads. rv10/20: Fix a buffer overread caused by losing track of the remaining buffer size. rmdec: Honor .RMF tag size rather than assuming 18. g722: Fix the QMF scaling r3d: don't set codec timebase. electronicarts: set timebase for tgv video. electronicarts: parse the framerate for cmv video. ogg: don't set codec timebase electronicarts: don't set codec timebase avs: don't set codec timebase wavpack: Fix an integer overflow ... Conflicts: libavcodec/arm/vp8dsp_init_arm.c libavcodec/fraps.c libavcodec/h264.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/msmpeg4.c libavcodec/pnmdec.c libavcodec/qpeg.c libavcodec/rawenc.c libavcodec/ulti.c libavcodec/vcr1.c libavcodec/version.h libavcodec/wmalosslessdec.c libavformat/electronicarts.c libswscale/ppc/yuv2rgb_altivec.c tests/ref/acodec/g722 tests/ref/fate/ea-cmv Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Windows Media Audio Lossless decoderMashiat Sarker Shakkhar2012-03-021-0/+1248
| | | | | | | | | | | | Decodes 16-bit WMA Lossless encoded files. 24-bit is not supported yet. Bitstream parser written by Andreas Öman with contributions from Baptiste Coudurier and Ulion. Includes a number of bug-fixes from Benjamin Larsson, Michael Niedermayer and Konstantin Shishkov, shine and polish by Diego Biurrun. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* wmalossless: Fix infinite loop.Michael Niedermayer2012-02-191-1/+4
| | | | | | Fixes more of Ticket1000 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wmalossless: Switch to new audio APIMichael Niedermayer2012-02-191-23/+13
| | | | | | Partially fixes Ticket1000 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* wmalossless: remove tabMichael Niedermayer2012-02-191-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2012-02-191-2/+2
|\ | | | | | | | | | | | | | | * shariman/wmall: Perform inter-channel decorr. only if both channels are coded Use fixed-length array in revert_mclms() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Perform inter-channel decorr. only if both channels are codedMashiat Sarker Shakkhar2012-02-181-1/+1
| |
| * Use fixed-length array in revert_mclms()Benjamin Larsson2012-02-161-1/+1
| |
OpenPOWER on IntegriCloud