generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
66,328 Commits 24 Branches 241 Tags 173 MiB
41d82b85ab
Commit Graph

48 Commits

Author SHA1 Message Date
Pascal Massimino
e3fd6a3a4e av_filter/x86/idet: MMX/SSE2 implementation of 16bits filter_line() 
tested on http://ps-auxw.de/10bit-h264-sample/10bit-eldorado.mkv
MMX: ~30% faster decoding overall
SSE2:~40% faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-09 16:47:22 +02:00
skal
406a9ccffe avfilter/vf_idet: MMX/MMXEXT/SSE2 implementation of idet's filter_line() 
integration by Neil Birkbeck, with help from Vitor Sessak.
core SSE2 loop by Skal (pascal.massimino@gmail.com)

Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-09-04 22:19:00 +02:00
Michael Niedermayer
325f6e0a97 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavfi: do not export the filters from shared objects

Conflicts:
	libavfilter/af_amix.c
	libavfilter/af_anull.c
	libavfilter/asrc_anullsrc.c
	libavfilter/f_select.c
	libavfilter/f_settb.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/vf_aspect.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_colorbalance.c
	libavfilter/vf_copy.c
	libavfilter/vf_crop.c
	libavfilter/vf_cropdetect.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_format.c
	libavfilter/vf_framestep.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_hflip.c
	libavfilter/vf_libopencv.c
	libavfilter/vf_lut.c
	libavfilter/vf_null.c
	libavfilter/vf_overlay.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_unsharp.c
	libavfilter/vf_vflip.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 11:58:11 +01:00
Paul B Mahol
b211607b5c avfilter: various cosmetics 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-12 14:01:43 +00:00
Paul B Mahol
a8e00cf926 avfilter: remove redundant use of AV_NE() macro 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-09-11 15:05:21 +00:00
Paul B Mahol
c63e4e6569 lavfi/idet: remove request_frame hack 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-27 09:55:39 +00:00
Clément Bœsch
61b268eeda lavfi/idet: fix chroma subsampling with odd sizes. 2013-05-16 23:20:00 +02:00
Michael Niedermayer
fd6228e657 lavfi: remove now unused args parameter from AVFilter.init and init_opaque 
This is mostly automated global search and replace

The deprecated aconvert filter is disabled, if it still has users
it should be updated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-12 11:54:39 +02:00
Clément Bœsch
7668b6832d lavfi/idet: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
Clément Bœsch
ab228f9163 lavfi/idet: use standard options parsing. 2013-03-24 12:26:25 +01:00
Clément Bœsch
96e4b00d62 lavfi: remove remaining forgotten min/rej perms. 2013-03-10 02:38:21 +01:00
Michael Niedermayer
a05a44e205 Merge commit '7e350379f87e7f74420b4813170fe808e2313911' 
* commit '7e350379f87e7f74420b4813170fe808e2313911':
  lavfi: switch to AVFrame.

Conflicts:
	doc/filters.texi
	libavfilter/af_ashowinfo.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersink.c
	libavfilter/buffersrc.c
	libavfilter/buffersrc.h
	libavfilter/f_select.c
	libavfilter/f_setpts.c
	libavfilter/fifo.c
	libavfilter/split.c
	libavfilter/src_movie.c
	libavfilter/version.h
	libavfilter/vf_aspect.c
	libavfilter/vf_bbox.c
	libavfilter/vf_blackframe.c
	libavfilter/vf_delogo.c
	libavfilter/vf_drawbox.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_fieldorder.c
	libavfilter/vf_fps.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_gradfun.c
	libavfilter/vf_hqdn3d.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_showinfo.c
	libavfilter/vf_transpose.c
	libavfilter/vf_vflip.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavfilter/yadif.h

Following are notes about the merge authorship and various technical details.

Michael Niedermayer:
  * Main merge operation, notably avfilter.c and video.c
  * Switch to AVFrame:
    - afade
    - anullsrc
    - apad
    - aresample
    - blackframe
    - deshake
    - idet
    - il
    - mandelbrot
    - mptestsrc
    - noise
    - setfield
    - smartblur
    - tinterlace
  * various merge changes and fixes in:
    - ashowinfo
    - blackdetect
    - field
    - fps
    - select
    - testsrc
    - yadif

Nicolas George:
  * Switch to AVFrame:
    - make rawdec work with refcounted frames. Adapted from commit
      759001c534 by Anton Khirnov.
      Also, fix the use of || instead of | in a flags check.
    - make buffer sink and src, audio and video work all together

Clément Bœsch:
  * Switch to AVFrame:
    - aevalsrc
    - alphaextract
    - blend
    - cellauto
    - colormatrix
    - concat
    - earwax
    - ebur128
    - edgedetect
    - geq
    - histeq
    - histogram
    - hue
    - kerndeint
    - life
    - movie
    - mp (with the help of Michael)
    - overlay
    - pad
    - pan
    - pp
    - pp
    - removelogo
    - sendcmd
    - showspectrum
    - showwaves
    - silencedetect
    - stereo3d
    - subtitles
    - super2xsai
    - swapuv
    - thumbnail
    - tile

Hendrik Leppkes:
  * Switch to AVFrame:
    - aconvert
    - amerge
    - asetnsamples
    - atempo
    - biquads

Matthieu Bouron:
  * Switch to AVFrame
    - alphamerge
    - decimate
    - volumedetect

Stefano Sabatini:
  * Switch to AVFrame:
    - astreamsync
    - flite
    - framestep

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-10 01:40:35 +01:00
Michael Niedermayer
cdb7a1ac63 vf_idet: adapt default scores due to bugfix 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 01:58:07 +01:00
Michael Niedermayer
dc9edb06b0 vf_idet: Fix macro arguments sideeffect 
Fixes valgrind errors
should improve detection scores

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-02-21 01:58:07 +01:00
Michael Niedermayer
a2349dc3f0 vf_idet: fix type of stats 
Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-26 17:27:28 +01:00
Clément Bœsch
d155abd1fc lavfi/idet: remove unused assert include. 2012-12-26 17:17:36 +01:00
Clément Bœsch
a7f0af1b9a lavfi/idet: remove unecessary context assignment. 2012-12-26 17:17:36 +01:00
Clément Bœsch
43cbd4406e lavfi/idet: support named parameters. 
The parameters are currently not documented in doc/filters.texi, but now
they at least appear in the automatic help.
 2012-12-26 17:17:36 +01:00
Clément Bœsch
915d7487d7 lavfi/idet: remove unecessary poll_frame callback. 2012-12-26 17:17:36 +01:00
Matthieu Bouron
4cd40ef343 lavfi/idet: switch to filter_frame API 
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-12-08 17:19:17 +01:00
Clément Bœsch
2d9d444051 lavfi: convert remaining input/output list compound literals to named objects. 
This is following 568c70e79e.
 2012-11-28 23:19:20 +01:00
Hendrik Leppkes
79393a8363 Replace usage of the deprecated av_pix_fmt_descriptors array with av_pix_fmt_desc_get 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-20 18:00:13 +02:00
Michael Niedermayer
31fdf3065d vf_idet: reorder operations to avoid division by 0 
Fixes CID733738
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-19 19:59:32 +02:00
Michael Niedermayer
4d4f431ab7 vf_idet: zero pointers after freeing references 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 02:21:28 +02:00
Michael Niedermayer
cac749a551 vf_idet: fix free after use 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-11 02:21:28 +02:00
Matthieu Bouron
f94edfe484 vf_idet: remove some unnecessary statement and unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-10-10 16:48:58 +02:00
Michael Niedermayer
ac627b3d38 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 
* 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-10-08 21:06:57 +02:00
Derek Buitenhuis
3fe303a27d vf_idet: Remove emms 
There is no MMX code anyway.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-09-07 20:08:12 +02:00
Nicolas George
5ec6ae91ba vf_idet: fix permissions. 
Only write needs to be removed, other can be left.
 2012-08-17 18:26:41 +02:00
Michael Niedermayer
88beb2df98 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  FATE: fix the asyncts test
  build: Drop gcc-specific warning flag from header compilation rule
  FATE: add a test for the asyncts audio filter.
  matroskadec: return more correct error code on read error.
  buffersrc: check ff_get_audio_buffer() for errors.
  lavfi: check all ff_get_video_buffer() calls for errors.
  lavfi: check all avfilter_ref_buffer() calls for errors.
  vf_select: avoid an unnecessary avfilter_ref_buffer().
  buffersrc: avoid creating unnecessary buffer reference
  lavfi: use avfilter_unref_bufferp() where appropriate.
  vf_fps: add more error checks.
  vf_fps: fix a memleak on malloc failure.
  lavfi: check all ff_start_frame/draw_slice/end_frame calls for errors
  lavfi: add error handling to end_frame().
  lavfi: add error handling to draw_slice().
  lavfi: add error handling to start_frame().

Conflicts:
	Makefile
	ffplay.c
	libavfilter/buffersrc.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_frei0r.c
	libavfilter/vf_hflip.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/video.c
	libavfilter/vsrc_color.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-07-22 23:56:21 +02:00
Michael Niedermayer
052f4f859c Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a' 
* commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a':
  lavfi: remove 'opaque' parameter from AVFilter.init()
  mov: do not try to read total disc/track number if data atom is too short.
  avconv: fix -force_key_frames
  dxva2_h264: fix signaling of mbaff frames
  x86: fft: elf64: fix PIC build

Conflicts:
	ffmpeg.c
	libavcodec/v210dec.h
	libavfilter/asrc_anullsrc.c
	libavfilter/buffersrc.c
	libavfilter/src_movie.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_overlay.c
	libavfilter/vsrc_color.c
	libavfilter/vsrc_testsrc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-26 23:57:07 +02:00
Michael Niedermayer
1c60088885 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: Only use optimizations with cmov if the CPU supports the instruction
  x86: Add CPU flag for the i686 cmov instruction
  x86: remove unused inline asm macros from dsputil_mmx.h
  x86: move some inline asm macros to the only places they are used
  lavfi: Add the af_channelmap audio channel mapping filter.
  lavfi: add join audio filter.
  lavfi: allow audio filters to request a given number of samples.
  lavfi: support automatically inserting the fifo filter when needed.
  lavfi/audio: eliminate ff_default_filter_samples().

Conflicts:
	Changelog
	libavcodec/x86/h264dsp_mmx.c
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/version.h
	libavutil/x86/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-06-24 02:09:53 +02:00
Paul B Mahol
c9e183b490 lavfi: update some deprecated functions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-06-16 15:15:16 +00:00
Michael Niedermayer
98e409ecaa vf_idet: remove unused variables 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-10 20:07:23 +02:00
Michael Niedermayer
648dbae519 vf_idet: fix pointer type (const) warning 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-05-10 20:07:20 +02:00
Michael Niedermayer
fa1f92a4f1 vf_idet: clean detected frame types based on a 4 frame history. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-05 09:11:15 +02:00
Michael Niedermayer
c59e73d2c8 vf_idet: change individual per frame statistics to debug log level. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-05 09:11:15 +02:00
Michael Niedermayer
4d4df310f2 vf_idet: print accumulated statistics for single and multi frame detection 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-05 09:11:15 +02:00
Michael Niedermayer
0477254dd2 vf_idet: Print both the single frame based detection and the multi frame one. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-05 06:38:48 +02:00
Michael Niedermayer
1a5c08eef6 vf_idet: Add last_type variable to make code more readable. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-05 06:33:40 +02:00
Michael Niedermayer
ca2b450cee vf_idet: use enum to represent the type. 
This will simplify future code.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-05 06:25:32 +02:00
Michael Niedermayer
6fb35dbad1 vf_idet: print accumulated statistics at end 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-04 16:31:31 +02:00
Michael Niedermayer
baf0c79a4d vf_idet: set interlaced flags 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-04 16:27:24 +02:00
Michael Niedermayer
2941a937f2 vf_idet: fix indention 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-04 16:22:01 +02:00
Michael Niedermayer
5d9cfd8726 vf_idet: move statistic variables into the context 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-04 16:22:01 +02:00
Michael Niedermayer
02567bd73c vf_idet: remove unused function 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-04 16:22:01 +02:00
Michael Niedermayer
398491ae01 vf_idet: pass context to av_log() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-04 16:22:01 +02:00
Michael Niedermayer
e3e89b6d8b libavfilter: Add interlace detect filter. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-04-04 15:27:30 +02:00