summaryrefslogtreecommitdiff
path: root/libavcodec/j2kenc.c
Commit message (Collapse)AuthorAge
* avcodec/j2kenc: Use ret < 0 instead of ret != 0 for error checksMichael Niedermayer2015-05-16
| | | | | | This is how most code in FFmpeg checks for failures Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/j2kenc: Initialize variable to silence compiler warningsHimangi Saraogi2015-03-25
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/j2kenc: use av_malloc(z)_array()Michael Niedermayer2014-04-08
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/j2kenc: drop dependancy on sizeof(AVFrame)Michael Niedermayer2013-12-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cosmetics: group remaining .name and .long_name.Clément Bœsch2013-10-04
| | | | See b2bed9325.
* jpeg2000: fix overflow in dequantizationMichael Niedermayer2013-07-13
| | | | | | | | Fixes decoding of file generated with: ffmpeg -f lavfi -i smptehdbars=hd720 -pix_fmt rgb48 /tmp/o.jp2 Reviewed-by: Nicolas BERTRAND <nicoinattendu@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* jpeg2000: Initialize only once mqc arraysNicolas Bertrand2013-07-12
| | | | | | Increases encoding and decoding speed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k/jpeg2000dec: mergeMichael Niedermayer2013-05-31
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* jpeg2000/j2k: merge j2k/jpeg2000.c/hMichael Niedermayer2013-05-30
| | | | | | Now only j2kdec / jpeg2000dec.c remain Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k/jpeg2000: split data pointer in int & float.Michael Niedermayer2013-05-30
| | | | | | | | | | | | This fixes a TODO item and unifies both decoders structures It also fixes undefined behavior due to aliasing violations I choose 2 fields instead of a union because mistakely using the wrong type with a union will lead to hard to debug "wrong output" while with 2 fields mistakely using the wrong type will crash with a null pointer derefernce which is much easier to debug Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k/jpeg2000: merge float DWT and related codeMichael Niedermayer2013-05-29
| | | | | | | | the float conditions are largely changed to check the DWT instead of the bitexact flag, which previously was wrong (DWT53 is always int) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k/jpeg2000: split stepsize in float & int variablesMichael Niedermayer2013-05-28
| | | | | | This is more clear and less prone to mistakes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kenc: Zero DWT struct on allocationMichael Niedermayer2013-05-28
| | | | | | Should fix fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k/jpeg2000: merge lowres codeMichael Niedermayer2013-05-28
| | | | | | This also fixes lowres use with ffplay Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k/jpeg2000: merge j2k & jpeg2000 dwts, drop j2k dwtMichael Niedermayer2013-05-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kenc: Allow encoding with the 9/7 waveletMichael Niedermayer2013-05-27
| | | | | | Also add a fate test that tests 9/7 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k: change fixed point of stepsize to 16.16Michael Niedermayer2013-05-27
| | | | | | This seems more natural and matches jpeg2000 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k/jpeg2000: Partially merge quantization codeMichael Niedermayer2013-05-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k: drop cblknx/y from Jpeg2000BandMichael Niedermayer2013-05-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k/jpeg2000: drop xi/yi0/1 from Jpeg2000PrecMichael Niedermayer2013-05-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kenc: switch to cblk in precMichael Niedermayer2013-05-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k/jpeg2000: log2_prec size cleanupMichael Niedermayer2013-05-26
| | | | | | This also changes the cblk size storage method to what jpeg2000 uses Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k: s/ff_j2k_getsigctxno/ff_jpeg2000_getsigctxno/gMichael Niedermayer2013-05-26
| | | | | | Also add a related comment Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k: merge ff_j2k_init_tier1_luts()Michael Niedermayer2013-05-26
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k: s/getnbctxno/getsigctxno/gMichael Niedermayer2013-05-26
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k: redesign vert_causal_ctx_csty implementationMichael Niedermayer2013-05-26
| | | | | | | | The old implementation was incomplete and could not have worked This also fixes some warnings New code is untested as i dont seem to have a sample file that uses this. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k: rename a few inline functions and data tables to match jpeg2000Michael Niedermayer2013-05-26
| | | | | | also inlcudes some other cosmetics Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/j2k: rename J2K_ constants to JPEG2000_Michael Niedermayer2013-05-21
| | | | | | This should simplify merging the 2 decoders Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2k: Rename structs to be more similar to jpeg2000decMichael Niedermayer2013-05-21
| | | | | | This should simplify merging Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec: rename jpeg2000 decoder to j2kMichael Niedermayer2013-04-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kenc: remove duplicate debug functionsMichael Niedermayer2012-12-05
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kenc: remove unneeded dereferenceMichael Niedermayer2012-10-15
| | | | | Fixes CID703723 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* cosmetics: align more codecs declarationsPaul B Mahol2012-06-12
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* j2kenc: Fix "function declaration isn’t a prototype" warningMichael Niedermayer2012-03-30
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kenc: cosmetics: vertically align AVCodec members.Paul B Mahol2012-03-27
| | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* cosmetics: remove superfluous curly bracketsPaul B Mahol2012-03-23
| | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kenc: switch to ff_alloc_packet2()Michael Niedermayer2012-03-22
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kenc: switch to encode2Michael Niedermayer2012-02-24
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavc: constify enums for .pix_fmtsPaul B Mahol2012-01-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Use more designated initializers.Paul B Mahol2011-12-30
| | | | | | | Also remove some pointless NULL/0 assigments. C++ code must be left as it is because named struct initializers are not supported by C++ standard.
* Trivial: j2kenc: fix compiler warningDominique Leuenberger2011-11-12
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Use "JPEG 2000" as long name for j2k.Carl Eugen Hoyos2011-09-28
|
* j2kenc: Fix pointer<->integer casts.Michael Niedermayer2011-09-28
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kenc: only list pixel formats that fully work currently.Michael Niedermayer2011-09-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kenc: fix colors on yuv444Michael Niedermayer2011-09-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kenc: enable 4:2:0 YUV it works as "well" as the other subsampled yuv formatsMichael Niedermayer2011-09-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kenc: fix coded_frame and prevent null pointer dereference.Michael Niedermayer2011-09-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* j2kenc: Update ff_j2k_init_component() argumentsMichael Niedermayer2011-09-27
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-23 12:28:04 +0000