Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-09avcodec/j2kenc: use av_malloc(z)_array()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-17avcodec/j2kenc: drop dependancy on sizeof(AVFrame)Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04cosmetics: group remaining .name and .long_name.Clément Bœsch
See b2bed9325.
2013-07-13jpeg2000: fix overflow in dequantizationMichael Niedermayer
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>
2013-07-13jpeg2000: Initialize only once mqc arraysNicolas Bertrand
Increases encoding and decoding speed Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-31j2k/jpeg2000dec: mergeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-30jpeg2000/j2k: merge j2k/jpeg2000.c/hMichael Niedermayer
Now only j2kdec / jpeg2000dec.c remain Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-30j2k/jpeg2000: split data pointer in int & float.Michael Niedermayer
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>
2013-05-29j2k/jpeg2000: merge float DWT and related codeMichael Niedermayer
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>
2013-05-29j2k/jpeg2000: split stepsize in float & int variablesMichael Niedermayer
This is more clear and less prone to mistakes. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28j2kenc: Zero DWT struct on allocationMichael Niedermayer
Should fix fate Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-28j2k/jpeg2000: merge lowres codeMichael Niedermayer
This also fixes lowres use with ffplay Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27j2k/jpeg2000: merge j2k & jpeg2000 dwts, drop j2k dwtMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27j2kenc: Allow encoding with the 9/7 waveletMichael Niedermayer
Also add a fate test that tests 9/7 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27j2k: change fixed point of stepsize to 16.16Michael Niedermayer
This seems more natural and matches jpeg2000 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27j2k/jpeg2000: Partially merge quantization codeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27j2k: drop cblknx/y from Jpeg2000BandMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27j2k/jpeg2000: drop xi/yi0/1 from Jpeg2000PrecMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27j2kenc: switch to cblk in precMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-27j2k/jpeg2000: log2_prec size cleanupMichael Niedermayer
This also changes the cblk size storage method to what jpeg2000 uses Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26j2k: s/ff_j2k_getsigctxno/ff_jpeg2000_getsigctxno/gMichael Niedermayer
Also add a related comment Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26j2k: merge ff_j2k_init_tier1_luts()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26j2k: s/getnbctxno/getsigctxno/gMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-26j2k: redesign vert_causal_ctx_csty implementationMichael Niedermayer
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>
2013-05-26j2k: rename a few inline functions and data tables to match jpeg2000Michael Niedermayer
also inlcudes some other cosmetics Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21avcodec/j2k: rename J2K_ constants to JPEG2000_Michael Niedermayer
This should simplify merging the 2 decoders Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21j2k: Rename structs to be more similar to jpeg2000decMichael Niedermayer
This should simplify merging Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22avcodec: rename jpeg2000 decoder to j2kMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-05j2kenc: remove duplicate debug functionsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-15j2kenc: remove unneeded dereferenceMichael Niedermayer
Fixes CID703723 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer
* 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>
2012-08-08Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer
* 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>
2012-06-13cosmetics: align more codecs declarationsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2012-03-30j2kenc: Fix "function declaration isn’t a prototype" warningMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-27j2kenc: cosmetics: vertically align AVCodec members.Paul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-23cosmetics: remove superfluous curly bracketsPaul B Mahol
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-22j2kenc: switch to ff_alloc_packet2()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-24j2kenc: switch to encode2Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-12lavc: constify enums for .pix_fmtsPaul B Mahol
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-30Use more designated initializers.Paul B Mahol
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.
2011-11-13Trivial: j2kenc: fix compiler warningDominique Leuenberger
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-28Use "JPEG 2000" as long name for j2k.Carl Eugen Hoyos
2011-09-28j2kenc: Fix pointer<->integer casts.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27j2kenc: only list pixel formats that fully work currently.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27j2kenc: fix colors on yuv444Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27j2kenc: enable 4:2:0 YUV it works as "well" as the other subsampled yuv formatsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27j2kenc: fix coded_frame and prevent null pointer dereference.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27j2kenc: Update ff_j2k_init_component() argumentsMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27j2kenc: fix arguments for ff_j2k_getnbctxno()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-27j2kenc: mark as experimental.Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>