summaryrefslogtreecommitdiffstats
path: root/libavcodec/wmalosslessdec.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
* | Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2011-12-081-2/+2
|\ \ | |/ | | | | | | | | | | * shariman/wmall: Pass pointer to integer buffer instead of integer to memcpy Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Pass pointer to integer buffer instead of integer to memcpyMashiat Sarker Shakkhar2011-12-081-2/+2
| |
* | Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2011-12-081-60/+58
|\ \ | |/ | | | | | | | | | | | | | | | | * shariman/wmall: Partially fix CDLMS prediction Conflicts: libavcodec/wmalosslessdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Partially fix CDLMS predictionMashiat Sarker Shakkhar2011-12-081-60/+58
| |
* | Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2011-12-071-20/+110
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shariman/wmall: Fix lms_update() Move num_lms reading out of a loop Use correct value for range Fix some int / int16_t / int32_t confusion Implement revert_mclms() and associated functions Fix two more int16_t vs. int confusion Init s->cdlms[][].recent to order - 1 Add a size argument to dump_int_buffer() Get rid of logging that are not required anymore Fix some int vs. int16_t confusion Conflicts: libavcodec/wmalosslessdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Fix lms_update()Mashiat Sarker Shakkhar2011-12-021-4/+6
| |
| * Move num_lms reading out of a loopMashiat Sarker Shakkhar2011-12-021-1/+1
| |
| * Use correct value for rangeMashiat Sarker Shakkhar2011-12-021-1/+1
| | | | | | | | | | | | The current range value causes an underflow when negated and pushes anything less than zero to the minimum.
| * Fix some int / int16_t / int32_t confusionMashiat Sarker Shakkhar2011-12-021-2/+3
| | | | | | | | | | For now force everything to int16_t, except for variables used as index
| * Implement revert_mclms() and associated functionsMashiat Sarker Shakkhar2011-11-301-0/+87
| |
| * Fix two more int16_t vs. int confusionMashiat Sarker Shakkhar2011-11-301-2/+2
| | | | | | | | | | If everything works fine for 16-bit streams, the current code could be extended to do 24-bit.
| * Init s->cdlms[][].recent to order - 1Mashiat Sarker Shakkhar2011-11-301-1/+1
| | | | | | | | | | | | Not sure if this is correct. But looks like it was giving us off-by-one's when used to index buffers.
| * Add a size argument to dump_int_buffer()Mashiat Sarker Shakkhar2011-11-301-3/+3
| |
| * Get rid of logging that are not required anymoreMashiat Sarker Shakkhar2011-11-301-4/+4
| | | | | | | | (Resolves some conflicts)
| * Fix some int vs. int16_t confusionMashiat Sarker Shakkhar2011-11-301-6/+6
| | | | | | | | | | Size should be determined from bits per sample. The current code only accepts 16-bit streams.
* | wmall: fix return type of dump_int_buffer()Michael Niedermayer2011-11-301-1/+1
| | | | | | | | | | Found-by: Dominique Leuenberger Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | wmall: remove tabs that leaked in from a merge and seem to haveMichael Niedermayer2011-11-301-143/+143
| | | | | | | | | | | | managed to silently bypass the push checks. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2011-11-221-4/+5
|\ \ | |/ | | | | | | | | | | | | | | * shariman/wmall: call revert_cdlms() Fix some loop conditions to prevent overreads Initialize pred in lms_predict() Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * call revert_cdlms()Mashiat Sarker Shakkhar2011-11-221-0/+1
| |
| * Fix some loop conditions to prevent overreadsMashiat Sarker Shakkhar2011-11-221-3/+3
| |
| * Initialize pred in lms_predict()Mashiat Sarker Shakkhar2011-11-221-1/+1
| |
* | Merge remote-tracking branch 'shariman/wmall'Michael Niedermayer2011-11-201-163/+220
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shariman/wmall: (24 commits) Clean-up dump_int_buffer() to dump samples from a buffer Implement revert_cdlms() Doxy for reset_codec() Store transient state and position of transient area Implement use_high_update_speed() and use_normal_update_speed() Initialize num_logged_tiles and remove unnecessary codes Log index for each line of output Log tile size Output decoded residues Replace placeholders with actual calls to clear_codec_buffers() and reset_codec() Implement lms_update() Implement lms_predict() Implement reset_codec() Add missing syntax elements to WmallDecodeCtx Add .recent syntax element to cdlms struct Implement clear_codec_buffers() Add buffers to context necessary for reverting cdmls and mclms filter Use avpriv_copy_bits() instead of ff_copy_bits() Cosmetics ... Conflicts: libavcodec/wmalosslessdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
OpenPOWER on IntegriCloud