summaryrefslogtreecommitdiff
path: root/libavcodec/j2kenc.c
Commit message (Collapse)AuthorAge
* lavc/j2kenc: Remove experimental flag.Carl Eugen Hoyos2015-09-04
| | | | The encoder produces valid and - if requested - lossless files.
* Merge commit '059a934806d61f7af9ab3fd9f74994b838ea5eba'Michael Niedermayer2015-07-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '059a934806d61f7af9ab3fd9f74994b838ea5eba': lavc: Consistently prefix input buffer defines Conflicts: doc/examples/decoding_encoding.c libavcodec/4xm.c libavcodec/aac_adtstoasc_bsf.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.h libavcodec/asvenc.c libavcodec/avcodec.h libavcodec/avpacket.c libavcodec/dvdec.c libavcodec/ffv1enc.c libavcodec/g2meet.c libavcodec/gif.c libavcodec/h264.c libavcodec/h264_mp4toannexb_bsf.c libavcodec/huffyuvdec.c libavcodec/huffyuvenc.c libavcodec/jpeglsenc.c libavcodec/libxvid.c libavcodec/mdec.c libavcodec/motionpixels.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/noise_bsf.c libavcodec/nuv.c libavcodec/nvenc.c libavcodec/options.c libavcodec/parser.c libavcodec/pngenc.c libavcodec/proresenc_kostya.c libavcodec/qsvdec.c libavcodec/svq1enc.c libavcodec/tiffenc.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/utvideoenc.c libavcodec/vc1dec.c libavcodec/wmalosslessdec.c libavformat/adxdec.c libavformat/aiffdec.c libavformat/apc.c libavformat/apetag.c libavformat/avidec.c libavformat/bink.c libavformat/cafdec.c libavformat/flvdec.c libavformat/id3v2.c libavformat/isom.c libavformat/matroskadec.c libavformat/mov.c libavformat/mpc.c libavformat/mpc8.c libavformat/mpegts.c libavformat/mvi.c libavformat/mxfdec.c libavformat/mxg.c libavformat/nutdec.c libavformat/oggdec.c libavformat/oggparsecelt.c libavformat/oggparseflac.c libavformat/oggparseopus.c libavformat/oggparsespeex.c libavformat/omadec.c libavformat/rawdec.c libavformat/riffdec.c libavformat/rl2.c libavformat/rmdec.c libavformat/rtpdec_latm.c libavformat/rtpdec_mpeg4.c libavformat/rtpdec_qdm2.c libavformat/rtpdec_svq3.c libavformat/sierravmd.c libavformat/smacker.c libavformat/smush.c libavformat/spdifenc.c libavformat/takdec.c libavformat/tta.c libavformat/utils.c libavformat/vqf.c libavformat/westwood_vqa.c libavformat/xmv.c libavformat/xwma.c libavformat/yop.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'def97856de6021965db86c25a732d78689bd6bb0'Michael Niedermayer2015-07-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
* avcodec: Add a min size parameter to ff_alloc_packet2()Michael Niedermayer2015-07-27
| | | | | | | | This parameter can be used to inform the allocation code about how much downsizing might occur, and can be used to optimize how to allocate the packet Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* avcodec/j2kenc: remove unused variableMichael Niedermayer2015-07-10
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* lavc/j2kenc: Enable yuv42x and yuv41x encoding.Carl Eugen Hoyos2015-07-06
| | | | | Fixes ticket #535. Fixes ticket #4524.
* avcodec/j2kenc: Support user specified tile dimensionsMichael Niedermayer2015-07-03
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavc/j2kenc: Make jp2 output compatible with Kakadu.Carl Eugen Hoyos2015-06-30
| | | | Fixes ticket #4689.
* avcodec/j2kenc: store libavcodec ident in a comment unless bitexact mode is usedMichael Niedermayer2015-06-30
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/jpeg2000: Remove CBLK limitMichael Niedermayer2015-06-26
| | | | | | | | | This also reduces the amount of memory needed Fixes Ticket4672 The new code seems slightly faster as well, probably due to better cache usage Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/j2kenc: Use JP2 format by defaultMichael Niedermayer2015-06-19
| | | | | | | | Without the JP2 fields its not possible to identify the colorspace Fixes Ticket538 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/j2kenc: Support writing JP2 encapsulationMichael Niedermayer2015-06-19
| | | | | | The added option matches openjpeg Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/j2kenc: YUV should not use the ICTMichael Niedermayer2015-06-19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* avcodec/j2kenc: Properly flush the end of the truncated AC streamMichael Niedermayer2015-06-17
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 21:56:20 +0000