virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
77,087 Commits 37 Branches 400 Tags 463 MiB
cd1b7e2bd7
Commit Graph

32 Commits

Author SHA1 Message Date
Paul B Mahol
cde75e3150 avfilter/vf_histogram: remove deprecated stuff 
Remove all modes except levels mode.
Users should already switch to other filters with
extended funcionality: vectorscope and waveform.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-12-01 21:55:13 +01:00
Ganesh Ajjanagadde
6aaac24d72 avfilter/all: propagate errors of functions from avfilter/formats 
Many of the functions from avfilter/formats can return errors, usually AVERROR(ENOMEM).
This propagates the return values.

All of these were found by using av_warn_unused_result, demonstrating its utility.

Tested with FATE. I am least sure of the changes to avfilter/filtergraph,
since I don't know what/how reduce_format is intended to behave and how it should
react to errors.

Fixes: CID 1325680, 1325679, 1325678.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Previous version Reviewed-by: Nicolas George <george@nsup.org>
Previous version Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
 2015-10-14 10:04:01 -04:00
Hendrik Leppkes
5d8e836d0e Replace all remaining occurances of step/depth_minus1 and offset_plus1 2015-09-08 17:10:48 +02:00
Michael Niedermayer
c97ea011f5 avfilter/vf_histogram: Fix order of operations with flags 
Fixes CID1322325

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2015-09-03 23:02:03 +02:00
Paul B Mahol
9f2fa95bd8 avfilter/vf_histogram: 9 and 10 bit depth support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-28 14:15:17 +00:00
Paul B Mahol
a16251a6d0 avfilter/vf_histogram: fix bug in checking pixel format flags 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-26 11:11:26 +00:00
Paul B Mahol
6be5b05fb1 avfilter/vf_histogram: levels: support more input pixel formats 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-23 10:13:52 +00:00
Paul B Mahol
14f97bb2bc avfilter: add waveform monitor filter 2015-08-22 19:48:42 +00:00
Paul B Mahol
4e8963fa38 avfilter: add video vectorscope filter 2015-08-20 22:57:47 +00:00
Paul B Mahol
fa95965f5a avfilter/vf_histogram: make it possible to pick color components for levels mode 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-08-19 10:05:33 +00:00
Paul B Mahol
a0854c084e avfilter: handle error in query_formats() in bunch of filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2015-04-08 13:05:06 +00:00
Michael Niedermayer
67e1562228 avfilter/vf_histogram: Change enum to int, which is accessed via AVOption as int 
This fixes depending on implementation defined behavior

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2015-03-18 12:32:56 +01: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
a2c14ba2b1 avfilter/vf_histogram: use const for variables that are not supposed to change 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-04 16:48:19 +00:00
Marton Balint
0362cf1a19 avfilter/vf_histogram: add mirrored waveform mode 
Added parameter to mirror the waveform (high values are shown on top in column mode)

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-02 21:02:59 +00:00
Marton Balint
5b5bb0d81c avfilter/vf_histogram: fix segfault in parade waveform mode for subsampled formats 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-02 21:02:54 +00:00
Paul B Mahol
edadda968c avfilter/vf_histogram: change order of histograms for planar rgb 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-01 21:22:22 +00:00
Marton Balint
cac9af68a4 avfilter/vf_histogram: add support for subsampled planar yuv modes in waveform mode 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-01 21:04:31 +00:00
Marton Balint
31a8461d64 avfilter/vf_histogram: improve waveform speed 
Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-10-01 21:04:30 +00: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
68c4633fa8 lavfi/histogram: cache log2 of max_hval 
Instead of calculating same value over and over again.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-19 14:30:42 +00:00
Paul B Mahol
c45b823bf8 lavfi/histogram: logarithmic mode for levels 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-15 12:38:39 +00:00
Paul B Mahol
1f2baec7bd lavfi: add gbrap support to some filters 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-05-08 12:48:05 +00:00
Michael Niedermayer
7a2a421d73 vf_histogram: avoid floats, unbreak fate 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-04-15 21:44:50 +02:00
Paul B Mahol
8281791d07 lavfi/histogram: remove pointless store 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-15 16:07:51 +00:00
Clément Bœsch
b2d589188f lavfi/histogram: switch to an AVOptions-based system. 2013-04-11 01:04:45 +02:00
Paul B Mahol
018cc6f026 lavfi/histogram: use standard options parsing 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-04-08 09:04:02 +00: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
Paul B Mahol
480ddf2bc9 lavfi/histogram: overlay display mode for levels histogram mode 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-18 20:13:07 +00:00
Paul B Mahol
4fa9defc7f lavfi/histogram: make waveform mode more useful 
Now it displays all color components (not just luma)
either in parade or overlay and also works with RGB colorspace.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 16:05:28 +00:00
Paul B Mahol
e5670cb8a1 lavfi/histogram: make it C90 compliant 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 12:27:49 +00:00
Paul B Mahol
29a92c0114 histogram filter 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-02-09 11:45:56 +00:00