summaryrefslogtreecommitdiff
path: root/libavcodec/wmalosslessdec.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| |
* | Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2012-02-161-18/+24
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * shariman/wmall: Do not try to read residue if ave_mean <= 1 Move some variable declarations to comply with C90 Cosmetics: fix some whitespace errors Support 24-bit decoding wmall: remove ;; Conflicts: libavcodec/wmalosslessdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Do not try to read residue if ave_mean <= 1Mashiat Sarker Shakkhar2012-02-161-3/+8
| | | | | | | | | | | | Otherwise, we end up with with log(0) or log(1). av_ceil_log2 simply assumes the argument is non-zero and returns wrong result when it is. (Not that there is a proper way of returning an undefined value.)
| * Move some variable declarations to comply with C90Mashiat Sarker Shakkhar2012-02-161-2/+4
| |
| * Cosmetics: fix some whitespace errorsMashiat Sarker Shakkhar2012-02-161-13/+12
| |
| * Support 24-bit decodingMashiat Sarker Shakkhar2012-02-161-9/+9
| |
| * wmall: remove ;;Michael Niedermayer2012-02-161-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-02-011-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (29 commits) fate: add golomb-test golomb-test: K&R formatting cosmetics h264: Split h264-test off into a separate file - golomb-test.c. h264-test: cleanup: drop timer invocations, commented out code and other cruft h264-test: Remove unused DSP and AVCodec contexts and related init calls. adpcm: Add missing stdint.h #include to fix standalone header compilation. lavf: add functions for accessing the fourcc<->CodecID mapping tables. lavc: set AVCodecContext.codec in avcodec_get_context_defaults3(). lavc: make avcodec_close() work properly on unopened codecs. lavc: add avcodec_is_open(). lavf: rename AVInputFormat.value to raw_codec_id. lavf: remove the pointless value field from flv and iv8 lavc/lavf: remove unnecessary symbols from the symbol version script. lavc: reorder AVCodec fields. lavf: reorder AVInput/OutputFormat fields. mp3dec: Fix a heap-buffer-overflow adpcmenc: remove some unneeded casts adpcmenc: use int16_t and uint8_t instead of short and unsigned char. adpcmenc: fix adpcm_ms extradata allocation adpcmenc: return proper AVERROR codes instead of -1 ... Conflicts: doc/APIchanges libavcodec/Makefile libavcodec/adpcmenc.c libavcodec/avcodec.h libavcodec/h264.c libavcodec/libavcodec.v libavcodec/mpc7.c libavcodec/mpegaudiodec.c libavcodec/options.c libavformat/Makefile libavformat/avformat.h libavformat/flvdec.c libavformat/libavformat.v Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2012-01-311-2/+2
|\ \ | |/ | | | | | | | | | | | | * shariman/wmall: Cosmetics: Fix some whitespace errors and indentation Use correct variable type for 32-bit samples buffer Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Cosmetics: Fix some whitespace errors and indentationMashiat Sarker Shakkhar2012-01-271-3/+3
| |
| * Use correct variable type for 32-bit samples bufferMashiat Sarker Shakkhar2012-01-221-2/+2
| |
* | wmalossless: Fix incompatoble pointer type warningsMichael Niedermayer2012-01-191-2/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmall: remove ;;Michael Niedermayer2012-01-031-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2012-01-031-31/+72
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * shariman/wmall: Fix audio output Suppress dumping of residues buffer Use quantizer value read from bitstream Cosmetics: Remove two empty lines and realign some code Reset acfilter_prevvalues buffer in clear_codec_buffers() Fix AC filter buffers and AC filter reversion Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix audio outputMashiat Sarker Shakkhar2012-01-031-10/+40
| | | | | | | | | | | | | | | | | | | | Up until now, the decoder didn't output anything in the data buffer. This fixes all the issues related to sample format, removes leftover code and actually outputs some audio to data buffer. With this, the only sample we have can be played. Seeking is still broken though.
| * Suppress dumping of residues bufferMashiat Sarker Shakkhar2012-01-031-1/+1
| |
| * Use quantizer value read from bitstreamMashiat Sarker Shakkhar2012-01-011-4/+4
| | | | | | | | | | | | Currently the code initializes quantizer even before reading it from bitstream and uses that to dequantize samples.
| * Cosmetics: Remove two empty lines and realign some codeMashiat Sarker Shakkhar2012-01-011-3/+2
| |
| * Reset acfilter_prevvalues buffer in clear_codec_buffers()Mashiat Sarker Shakkhar2011-12-311-0/+1
| |
| * Fix AC filter buffers and AC filter reversionMashiat Sarker Shakkhar2011-12-311-13/+24
| |
* | Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2011-12-241-32/+86
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shariman/wmall: Perform dequantization of channel coefficients Perform inverse inter-channel decorrelation and ac-filter Implement revert_inter_ch_decorr() and revert_acfilter() Enable inverse-MCLMS filter Fix inverse-MCLMS filtering routines Do not update buffers in case no speed change is necessary Use int for channel_coeffs instead of int16_t Conflicts: libavcodec/wmalosslessdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Perform dequantization of channel coefficientsMashiat Sarker Shakkhar2011-12-231-2/+7
| |
| * Perform inverse inter-channel decorrelation and ac-filterMashiat Sarker Shakkhar2011-12-231-0/+4
| |
| * Implement revert_inter_ch_decorr() and revert_acfilter()Mashiat Sarker Shakkhar2011-12-231-0/+35
| |
| * Enable inverse-MCLMS filterMashiat Sarker Shakkhar2011-12-221-0/+2
| |
| * Fix inverse-MCLMS filtering routinesMashiat Sarker Shakkhar2011-12-221-27/+31
| |
| * Do not update buffers in case no speed change is necessaryMashiat Sarker Shakkhar2011-12-091-2/+6
| |
| * Use int for channel_coeffs instead of int16_tMashiat Sarker Shakkhar2011-12-091-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) asfdec: add side data to ASFStream packet instead of output packet. idroqdec: set AVFMTCTX_NOHEADER and create streams as they occur. nellymoserdec: Indicate that the decoder can handle changed parameters libavcodec: Apply parameter change side data when decoding audio flvdec: Add param change side data if the sample rate or channels have changed libavformat: Add a utility function for adding parameter change side data libavcodec: Define a side data type for parameter changes aacdec: Handle new extradata passed as side data flvdec: Export new AAC/H.264 extradata as side data on the next packet libavcodec: Define a side data type for new extradata flacdec: skip all track indices at once instead of looping. mxf: Add PictureEssenceCoding UL for V210. mxfdec: consider QuantizationBits between 17 and 24 to be pcm_s24* mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container. mxf: H.264/MPEG-4 AVC Intra support configure: Show whether the safe bitstream reader is enabled x86: Tighten register constraints for decode_significance*_x86. Replace Subversion revisions in comments by Git hashes. h264_cabac: synchronize decode_significance_*_x86 conditionals w32threads: wait for the waked thread in pthread_cond_signal. ... Conflicts: libavcodec/avcodec.h libavcodec/version.h libavformat/flvdec.c libavformat/utils.c tests/ref/lavfi/pixdesc tests/ref/lavfi/pixfmts_copy tests/ref/lavfi/pixfmts_null tests/ref/lavfi/pixfmts_scale tests/ref/lavfi/pixfmts_vflip Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status