1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-14 08:44:40 +02:00
Commit Graph

3239 Commits

Author SHA1 Message Date
Michael Niedermayer 2cf521718d Merge commit '35c6ce76b107225a19eb33aea38857d2405882af'
* commit '35c6ce76b107225a19eb33aea38857d2405882af':
  Canopus HQX decoder

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/version.h
	tests/fate/video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-23 12:19:26 +01:00
Vittorio Giovara 35c6ce76b1 Canopus HQX decoder
Based on work by Kostya Shishkov <kostya.shishkov@gmail.com>.
2015-02-22 22:42:27 +00:00
Michael Niedermayer 9b41bf5c3d Merge commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6'
* commit 'a982c5d74fbc7ff5bd2f2f73af61ae48e9b1bcc6':
  tests: drop bc dependency

Conflicts:
	tests/fate-run.sh

See: d47eeff274
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-21 12:08:31 +01:00
Clément Bœsch a982c5d74f tests: drop bc dependency
We already have a dependency on awk and bc is sometimes not found in the
base system.

Signed-off-by: Martin Storsjö <martin@martin.st>
2015-02-21 11:17:45 +02:00
Kevin Wheatley 31c7c0e156 avformat/movenc: Move avid DNxHD padding to the correct spot
Outputting DNxHD into .mov containers 'corrupts' following atoms until end of stsd

ffmpeg and qtdump could not decode pasp/colr atoms in the files made by ffmpeg,
when outputting DNxHD due to the incorrect padding placement. Now we add the
padding in the correct place

Tidy up FATE changes due to padding changes.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-20 12:17:14 +01:00
Michael Niedermayer 29d2197d88 Merge commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c'
* commit 'b727b0eeb73cd78533a7fd387ceccd505e48fa6c':
  fate: Add tests for DSS

Conflicts:
	tests/fate/audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-19 21:53:39 +01:00
Vittorio Giovara b727b0eeb7 fate: Add tests for DSS
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
2015-02-19 12:05:19 -05:00
Supraja Meedinti 4b7c26843c tests: fate: adding fate-test for twofish
Signed-off-by: Supraja Meedinti <supraja0493@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-18 17:57:43 +01:00
Clément Bœsch f9240ec01a avcodec/gif: fix off by one in column offsetting finding 2015-02-16 17:47:35 +01:00
Michael Niedermayer fe03456cdc Merge commit 'e21d85309943a51b7808f5e01dd258b262e09148'
* commit 'e21d85309943a51b7808f5e01dd258b262e09148':
  FATE: add a test for the SVQ1 header byte swapping

Conflicts:
	tests/fate/qt.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-15 20:25:31 +01:00
Anton Khirnov e21d853099 FATE: add a test for the SVQ1 header byte swapping 2015-02-15 15:30:29 +01:00
Clément Bœsch 3cab173e23 avcodec/gif: support crop and transparency with PAL8 2015-02-14 20:48:50 +01:00
Paul B Mahol 8bb489fab5 fate: add wavpack encoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-02-13 09:22:18 +00:00
Michael Niedermayer 7d24ccaf00 fate: mjpeg trellis test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-11 22:44:06 +01:00
Clément Bœsch d47eeff274 tests: drop bc dependency
We already have a dependency on awk and bc is sometimes not found in the
base system.
2015-02-10 22:34:39 +01:00
Kevin Wheatley 7fc33dca39 libavformat: DNxHD in .mov, switch unspecified color_range to mpeg
Avid prefers mpeg range [16-235] by default this change brings
ffmpeg into line with that. To obtain the old behaviour use
'-color_range jpeg' on the command line prior to the ouput
filename.

Signed-off-by: Kevin Wheatley <kevin.j.wheatley@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-10 16:46:12 +01:00
Mark Reid 9b22e460ad test/fate: added mxf_opatom regression tests
Reviewed-by: tomas.hardin@codemill.se
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-10 11:28:53 +01:00
Michael Niedermayer a40de9ac07 Merge commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6'
* commit '9295d10ea9d138462b7f67d16bf95ae9ca76aca6':
  fate: Add a test for AAC ELD480.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-07 04:54:39 +01:00
Alex Converse 9295d10ea9 fate: Add a test for AAC ELD480.
The source is er_eld_2100np_48_ep0.mp4 from the official test set.
2015-02-06 18:56:22 -08:00
Michael Niedermayer 36adfa3274 tests/utils: Remove unneeded L suffix
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-02-01 22:38:11 +01:00
Carl Eugen Hoyos 3ea97767e4 Add an ARES atom to extradata when encoding avui.
Allows playback with QuickTime and the original codec.

Tested by Olaf Matthes, olaf matthes gmx de
2015-01-29 01:07:08 +01:00
Mark Reid a181169868 tests/fate: added mxf tests for essencegroups and missing index
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-28 05:45:32 +01:00
Anton Khirnov 80a11de7dc nutenc: do not use has_b_frames
It is unreliable, especially when the stream codec context is not the
encoding context. Use the codec descriptor properties instead.
2015-01-27 09:15:07 +01:00
Michael Niedermayer aa508a9c5f fate: Fix bitexactness for vsynth3-dnxhd-1080i-colr
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-27 03:45:14 +01:00
Kevin Wheatley 7b6f419176 avformat/movenc: Add simplistic 'colr' tag writing support to mov container
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-26 17:49:50 +01:00
James Almer f4f0619327 fate: add Camellia test
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>
2015-01-26 02:16:28 -03:00
Carl Eugen Hoyos af39b8fec4 Fix creation of ffprobe-test.nut on remote targets.
This is not sufficient to run "make fate-ffprobe" on a remote system:
The ffprobe output contains the relative path to the testfile, it is
necessary to run the test from the build directory.
One solution is to use a script like the following as --target-exec:
ssh target "cd /remote/build/directory; $(printf "%q " "$@")"
2015-01-26 01:27:38 +01:00
Michael Niedermayer 146a2c4e7f avcodec/mpegvideo: also export 0,0 motion vectors
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-22 12:36:45 +01:00
Michael Niedermayer a582705d15 ffmpeg: Favor filter graph based duration over ost->frame_rate in fps code
The fate change adds a last frame with a subtitle not displayed in the previous

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-19 03:13:16 +01:00
Michael Niedermayer a46a23d30f avfilter/vf_framepack: Check and update frame_rate
The frame_rate update was missing leaving the output frame rate
wrong.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 22:02:52 +01:00
Michael Niedermayer 7b32856011 ffmpeg: Maintain higher precision pts between video filter and fps code
This is a bit ugly as it attempts to keep most of the computation
in integers before the double based fps code. The use of integers
is to reduce the chances of rounding differences between platforms

Previously the timestamp was rounded to the encoder timebase
before being converted back to double precision which could cause loss
of precision

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-16 19:53:17 +01:00
Vittorio Giovara 2df7277711 swscale: fix gbrap to gbrap alpha scaling 2015-01-16 02:47:15 +01:00
Clément Bœsch f532603993 avfilter: add showpalette filter 2015-01-15 16:36:13 +01:00
Michael Niedermayer 3cfd07a53f fate: add qp filter test
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 20:45:50 +01:00
Paul B Mahol 928061670e libswscale: GBRAP input & output and GBRAP16 input support
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2015-01-14 17:17:24 +01:00
Michael Niedermayer c8f83a4c78 avformat/voc: add seeking support
Fixes Ticket1333

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-11 00:35:01 +01:00
Michael Niedermayer 00f9e51a26 tests/regression-funcs: Remove hardcoded threads 1
The tests which use encoders which either use slices or store the encoder thread count
keep a hardcoded value of 1

This will help test more threading code like in filters

Found-by: ubitux
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-03 15:09:12 +01:00
Michael Niedermayer eee9b7a673 ffprobe: Support extracting the number of reference frames
Fixes Ticket3141

Reviewed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 17:55:20 +01:00
Clément Bœsch 0c10cf6ab1 fate: add a fate-filter-framepack rule 2014-12-30 14:28:54 +01:00
Michael Niedermayer 8d3133f468 Merge commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6'
* commit '50036c30df83b609bc5a95276f1287f8b9b8bdd6':
  fate: Use bitexact conversions in the dpxparser test

Conflicts:
	tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-30 01:44:08 +01:00
Martin Storsjö 50036c30df fate: Use bitexact conversions in the dpxparser test
This fixes fate on e.g. ppc.

Signed-off-by: Martin Storsjö <martin@martin.st>
2014-12-29 23:21:43 +02:00
Michael Niedermayer 1137ccef70 Merge commit 'effa7d2a6a260ca3ce801c180ee6131d67d665fb'
* commit 'effa7d2a6a260ca3ce801c180ee6131d67d665fb':
  fate: add test for offset theora

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 03:55:02 +01:00
Michael Niedermayer 3e889713ce Merge commit 'a381e0cec87bcb28ebc05fe840bb937a495de736'
* commit 'a381e0cec87bcb28ebc05fe840bb937a495de736':
  fate: add a DPX parser test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-19 03:33:42 +01:00
Vittorio Giovara effa7d2a6a fate: add test for offset theora 2014-12-18 23:22:59 +01:00
Vittorio Giovara a381e0cec8 fate: add a DPX parser test 2014-12-18 23:22:59 +01:00
Michael Niedermayer b7bfe17824 Merge commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747'
* commit 'd2f1d42b18787e4fcb28864d9d9f701dd64a5747':
  fate: add dolby true hd tests

Conflicts:
	tests/fate/lossless-audio.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-10 00:58:13 +01:00
Janne Grunau d2f1d42b18 fate: add dolby true hd tests
The existing meridian audio test does not test
ff_mlp_rematrix_channel_arm. This sample (first 640k of
https://samples.libav.org/A-codecs/TrueHD/TrueHD.raw) uses
ff_mlp_rematrix_channel_arm. Since this sample has 5.1 channels it also
allows testing the integrated downmixing.
2014-12-09 22:00:08 +01:00
Lukasz Marek 4acc717a05 fate: add libavcodec/options-test
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-12-08 23:14:29 +01:00
Joakim Plate 90411b333d Allow reading of growing avi files (currently being written)
This uses the RIFF header stored size to figure out the expected AVI
file size, instead of the actual file. To work fully it requires handling
failed avio_seek() instead of assuming they always succeed.

Some fate file has been cut off and contains half a frame at the end which
previously was not output during demuxing. This frame is now output to
encoder, thus the fate diff update.

Bug-Id: 261
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-12-08 13:29:33 +00:00
Zoltan Kovacs 4843a9c74f dpx: always write the image offset
According to the DPX file format description found at
http://www.fileformat.info/format/dpx/egff.htm the ImageElement part of
the GenericImageHeader also contains an an offset to the real image data
beside the same member that can be found in the GenericFileHeader.

Libav keeps this member empty (=0) while some applications expects it to
be filled properly. FATE test updated accordingly.

Bug-Id: 742
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-12-08 13:29:18 +00:00