Commit Graph

650 Commits

Author SHA1 Message Date
Michael Niedermayer 575399c7e1 Merge commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d'
* commit 'fc18cc44ebfae07da153dc782572e7ce2f6fe47d':
  fate: add CVFC1_Sony_C to h264 conformance tests
  doc/APIchanges: add missing hashes and dates

Conflicts:
	doc/APIchanges
	tests/fate/h264.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-25 09:54:11 +02:00
Nicolas George 70feca926b lavc: check decoded subtitles encoding.
Address trac ticket #2431.
2013-04-24 19:41:27 +02:00
Vittorio Giovara fc18cc44eb fate: add CVFC1_Sony_C to h264 conformance tests
The sample is already included in the FATE suite, but is not tested
because cropping wasn't fully supported before.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-04-24 17:44:11 +02:00
Michael Niedermayer e2e9bee2da Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avcodec: Bump minor for JPEG 2000 decoder
  JPEG 2000 decoder for DCinema

The mqc code is merged, the rest is added independent of
the existing jpeg2000 decoder and encoder.

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/mqc.c
	libavcodec/mqc.h
	libavcodec/mqcdec.c
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 20:00:54 +02:00
Michael Niedermayer c1c2b0b339 avcodec: rename jpeg2000 decoder to j2k
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 19:28:33 +02:00
Nicolas Bertrand c81a706381 JPEG 2000 decoder for DCinema
Based on the 2007 GSoC project from Kamil Nowosad <k.nowosad@students.mimuw.edu.pl>
Updated to current programming standards, style and many more small
fixes by Diego Biurrun <diego@biurrun.de>.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-22 15:38:29 +02:00
Michael Niedermayer 80d4d3a41d fate: re-enable af_join test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 14:54:38 +02:00
Michael Niedermayer e4c0f258d3 Merge commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d'
* commit '9bfc6e02bae9de354fb9ba09a8a140e83eeadf7d':
  afifo: fix request_samples on the last frame in certain cases

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-22 13:02:29 +02:00
Anton Khirnov 9bfc6e02ba afifo: fix request_samples on the last frame in certain cases
The current code can fail to return the last frame if it contains
exactly the requested number of samples.

Fixes the join filter test, which previously did not include the last
408 samples in most cases.

CC:libav-stable@libav.org

Signed-off-by: Diego Biurrun <diego@biurrun.de>
2013-04-22 02:29:56 +02:00
Michael Niedermayer 8f116bf71b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: cosmetics: More sensible order for entries in video filter file

Conflicts:
	tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19 23:34:58 +02:00
Michael Niedermayer e07e8882ae Merge commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a'
* commit 'a77aed142cade3beb0cd43f879d4f47daae23b8a':
  fate: Rename video filters file and add separate video filters target

Conflicts:
	tests/fate/filter-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19 23:26:55 +02:00
Michael Niedermayer 6c5989cce9 Merge commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1'
* commit 'b357f1d1d3dd1d6672df6a397a31be425d31b6d1':
  fate: Split audio filters into their own separate file

Conflicts:
	tests/Makefile
	tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19 23:13:20 +02:00
Michael Niedermayer 4cb59ad84b Merge commit '3eec1d41b4a947ba497f528e68da14a8befb85b9'
* commit '3eec1d41b4a947ba497f528e68da14a8befb85b9':
  fate: Reuse VREF and AREF variables where appropriate

Conflicts:
	tests/fate/filter.mak
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-19 22:55:21 +02:00
Diego Biurrun bc7fbd36ea fate: cosmetics: More sensible order for entries in video filter file 2013-04-19 18:07:48 +02:00
Diego Biurrun a77aed142c fate: Rename video filters file and add separate video filters target 2013-04-19 18:07:48 +02:00
Diego Biurrun b357f1d1d3 fate: Split audio filters into their own separate file 2013-04-19 18:07:48 +02:00
Diego Biurrun 3eec1d41b4 fate: Reuse VREF and AREF variables where appropriate 2013-04-19 18:07:48 +02:00
Clément Bœsch 3d786591b8 fate/gif: create meaningful gif encoding tests. 2013-04-19 02:05:01 +02:00
Clément Bœsch 3db3b278f2 lavfi/lut: add direct path. 2013-04-17 19:18:08 +02:00
Michael Niedermayer 7e20f80d2c fate: fix histogram test, try #2
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 03:52:51 +02:00
Michael Niedermayer 7ed691e2db Merge remote-tracking branch 'qatar/master'
* qatar/master:
  fate: Set the bitexact flag for vp3/vp5/vp6 tests

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-16 01:02:14 +02:00
Paul B Mahol a4f03f082b FATE: add a test for the histogram filter
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-15 16:40:26 +00:00
Martin Storsjö 6add6272da fate: Set the bitexact flag for vp3/vp5/vp6 tests
This is required since there are bit-inexact implementations
of the vp3 idct (for bfin).

Signed-off-by: Martin Storsjö <martin@martin.st>
2013-04-15 14:19:16 +03:00
Michael Niedermayer ebbd4fd5f0 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  FATE: add a test for the interlace filter
  lavfi: new interlace filter

Conflicts:
	Changelog
	configure
	doc/filters.texi
	libavfilter/Makefile
	libavfilter/allfilters.c
	tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-12 16:32:33 +02:00
Michael Niedermayer b3c3996212 avcodec: rename prores encoders
Using the first names of authors sounds somewhat unprofessional
and might be considered offensive which is not intended.
The new names use the initials of the authors due to simplicity
and the possibility to apply it consistently without the need
to find political correct names for each future case where
alternative codecs might exist. Also its shorter ...

If someone has a better idea, like maybe 2 random letters
and people prefer it then iam happy to switch to that ...

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-04-11 23:13:34 +02:00
Vittorio Giovara 25882a7ff6 FATE: add a test for the interlace filter
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2013-04-11 21:33:58 +02:00
Nicolas George 08dd2c9df1 fate: add tests for unknown channel layouts. 2013-04-11 13:09:33 +02:00
Paul B Mahol 11d7bbb47a fate: add coverage for background disposal in gif decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2013-04-06 11:20:27 +00:00
Clément Bœsch eb054a9693 fate/filter: use aperms to test volume filter. 2013-03-31 11:58:20 +02:00
Clément Bœsch ef4020ca7d fate/filter: move gradfun filtergraph to a dedicated script. 2013-03-28 17:44:22 +01:00
Clément Bœsch 0adc93ba2b fate/filter: move concat filtergraph to a dedicated script. 2013-03-28 17:44:22 +01:00
Clément Bœsch b1213c911c fate/filter: move some CMD below deps for consistency. 2013-03-28 17:44:22 +01:00
Clément Bœsch 7f19fc99e0 fate/filter: remove pointless indirections for gradfun and hqdn3d. 2013-03-28 17:44:22 +01:00
Clément Bœsch 4694af1088 fate/filter: rename 'ubitux' rules to 'sample'. 2013-03-28 17:44:18 +01:00
Clément Bœsch ac00755e0a fate/filter: stick delogo test with its deps (cosmetics). 2013-03-28 17:37:53 +01:00
Michael Niedermayer e14f8bd07e fate: Disable af_join test, as its output is not deterministic currently
The reason for the failure is unknown, this needs to be debuged and fixed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 15:29:21 +01:00
Michael Niedermayer 37bdf33cff Merge remote-tracking branch 'qatar/master'
* qatar/master:
  vmdav: convert to bytestream2
  FATE: add a test for the join filter
  FATE: add a test for the volume filter

Conflicts:
	libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 15:02:49 +01:00
Michael Niedermayer 7a14564b2d Merge commit '43a8333a16c796b3d855fb3aaa742103cb62731f'
* commit '43a8333a16c796b3d855fb3aaa742103cb62731f':
  FATE: add a test for the channelsplit filter
  FATE: add a test for the channelmap filter
  FATE: add a test for the negate filter
  FATE: add a test for the overlay filter

Conflicts:
	tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 14:29:01 +01:00
Michael Niedermayer 8823ec4f9e Merge commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a'
* commit 'ea290d919a52f0f8c7e30d69328bb011ed13f61a':
  FATE: add a test for the setpts filter
  FATE: add a test for the hqdn3d filter
  FATE: add a test for the transpose filter
  FATE: add a test for the unsharp filter

Conflicts:
	tests/ref/fate/filter-hqdn3d

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 14:05:22 +01:00
Michael Niedermayer 6f1a6a9f6b Merge commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497'
* commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497':
  FATE: add a test for the fade filter
  FATE: add a test for the drawbox filter
  FATE: add a test for the boxblur filter
  FATE: add a test for the gradfun filter

Conflicts:
	tests/fate/filter.mak
	tests/ref/fate/filter-gradfun

our gradfun test is renamed to gradfun-ubitux as its name conflicts and
it was requested to be kept. Feel free to rename, change, finetune ...

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 13:48:05 +01:00
Michael Niedermayer ac1a1fd708 Merge commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c'
* commit '1ae44c87c924b69a0657256fbaa8ad140df2f27c':
  lavfi/gradfun: remove rounding to match C and SSE code.
  lavfi/gradfun: fix dithering in MMX code.
  lavfi/gradfun: fix rounding in MMX code.
  lavfi/gradfun: do not increment DC pointer for odd values.
  fate: filter: Add dependencies
  avconv: add options for reading filtergraphs from a file.

Conflicts:
	Changelog
	doc/ffmpeg.texi
	doc/filters.texi
	ffmpeg.h
	ffmpeg_opt.c
	libavfilter/vf_gradfun.c
	tests/fate/filter.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-28 13:00:39 +01:00
Anton Khirnov 8a2f5f0c63 FATE: add a test for the join filter 2013-03-28 08:03:43 +01:00
Anton Khirnov 9e9cd98aed FATE: add a test for the volume filter 2013-03-28 08:03:31 +01:00
Anton Khirnov 43a8333a16 FATE: add a test for the channelsplit filter 2013-03-28 08:03:12 +01:00
Anton Khirnov 33942b7bde FATE: add a test for the channelmap filter 2013-03-28 08:02:55 +01:00
Anton Khirnov f917420378 FATE: add a test for the negate filter 2013-03-28 08:02:47 +01:00
Anton Khirnov 3d8c80b611 FATE: add a test for the overlay filter 2013-03-28 08:01:58 +01:00
Anton Khirnov ea290d919a FATE: add a test for the setpts filter 2013-03-28 08:01:46 +01:00
Anton Khirnov 71f3ede24e FATE: add a test for the hqdn3d filter 2013-03-28 08:01:41 +01:00
Anton Khirnov 0bdbd85e47 FATE: add a test for the transpose filter 2013-03-28 08:01:34 +01:00