1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Commit Graph

48 Commits

Author SHA1 Message Date
Derek Buitenhuis
ea1f47757b Merge commit '7a00653be6b13131ce1b2cdeca696429f57caaf8'
* commit '7a00653be6b13131ce1b2cdeca696429f57caaf8':
  tiny_psnr: Support large files

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-02-16 18:11:05 +00:00
Thomas Lee
7a00653be6 tiny_psnr: Support large files
If an input file is bigger than 2GB (assume sizeof(int) == 4)),
size0/size1 will overflow, making stddev and PSNR invalid.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2016-02-09 20:03:34 +01:00
Hendrik Leppkes
fc97b1f091 Merge commit '26e8fa3b508eb047e85f4e923fc8e82a1aa656ba'
* commit '26e8fa3b508eb047e85f4e923fc8e82a1aa656ba':
  tiny_psnr: Use the correct abs() version

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
2015-09-29 15:44:28 +02:00
Vittorio Giovara
26e8fa3b50 tiny_psnr: Use the correct abs() version 2015-09-29 14:33:01 +02:00
Michael Niedermayer
06747f8484 tests/tiny_psnr: do not ignore errors from run_psnr
failure to calculate psnr should not result in tiny_psnr returning success

Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-23 15:39:36 +02:00
Michael Niedermayer
3acadc89f4 tests/tiny_psnr: Make the search range extend both sides from the specified shift value
This is what one would expect from the help text

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-17 21:22:27 +02:00
Michael Niedermayer
dae7e4e63d tests/tiny_psnr: remove redundant initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 17:54:20 +01:00
Michael Niedermayer
e03c3ac539 tests/tiny_psnr: Print information about the supported sample types in the help and error texts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 04:02:51 +01:00
Michael Niedermayer
6659eb7116 Merge commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf'
* commit 'dd33637c18629c3e554ebb146bbeb45c9745a5cf':
  tiny_psnr: switch f32 handling to floating point

Conflicts:
	tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-16 12:07:02 +02:00
Anton Khirnov
dd33637c18 tiny_psnr: switch f32 handling to floating point
Also add support for f64.
2013-10-15 19:10:33 +02:00
Michael Niedermayer
ca857c86bd tests/tiny_psnr: remove unneeded include assert.h
This is the only such occurance on tests/

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-19 18:55:49 +02:00
Michael Niedermayer
83962004f7 Merge commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b'
* commit '3dc06b6972cf389269e9c36ff0a4373f80f7149b':
  tiny_psnr: check for specified sample size less than 1
  fate: improve md5sum utility selection
  rangecoder-test: Drop timer output that clutters stderr

Conflicts:
	tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-16 14:04:14 +02:00
Mans Rullgard
3dc06b6972 tiny_psnr: check for specified sample size less than 1
A zero or negative sample size is impossible and should be
reported as an error.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-15 21:40:18 +01:00
Michael Niedermayer
c99d3e2e6c tiny_psnr: fix undefined shift
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-01 20:00:01 +02:00
Michael Niedermayer
b5da7d4c1a Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avformat: Drop pointless "format" from container long names
  swscale: bury one more piece of inline asm under HAVE_INLINE_ASM.
  wv: K&R formatting cosmetics
  configure: Add missing descriptions to help output
  h264_ps: declare array of colorspace strings on its own line.
  fate: amix: specify f32 sample format for comparison
  tiny_psnr: support 32-bit float samples
  eamad/eatgq/eatqi: call special EA IDCT directly
  eamad: remove use of MpegEncContext
  mpegvideo: remove unnecessary inclusions of faandct.h
  af_asyncts: avoid overflow in out_size with large delta values
  af_asyncts: add first_pts option

Conflicts:
	configure
	libavcodec/eamad.c
	libavcodec/h264_ps.c
	libavformat/crcenc.c
	libavformat/ffmdec.c
	libavformat/ffmenc.c
	libavformat/framecrcenc.c
	libavformat/md5enc.c
	libavformat/nutdec.c
	libavformat/rawenc.c
	libavformat/yuv4mpeg.c
	tests/tiny_psnr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-30 23:28:31 +02:00
Mans Rullgard
9f1280def4 tiny_psnr: support 32-bit float samples
Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-07-29 22:05:09 +01:00
Nicolas George
34123ab979 tiny_psnr: reindent after last commit. 2012-04-15 15:46:46 +02:00
Nicolas George
e6f7e22d18 tiny_psnr: support unseekable raw files.
If either one of the files if not seekable,
do not try to read headers.

It allows to use it with pipes on whole rawvideo data.
2012-04-15 15:28:52 +02:00
Reimar Döffinger
cbb7183498 tiny_psnr: allow searching for optimal shift value.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
2012-04-06 20:13:50 +02:00
Michael Niedermayer
c130428ab5 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  avprobe, cmdutils: K&R formatting cosmetics
  tests: K&R formatting cosmetics for test programs
  lavf: free packets for muxers implementing interleave_packet().
  lavf: fix and extend av_interleaved_write_frame() doxy.
  mov: Remove dead stores for spherical coordinates for channel position.
  error_resilience: K&R formatting cosmetics
  RELEASE_NOTES: mention hiding private symbols in shared builds.
  RELEASE_NOTES: mention some notable API changes in 0.8

Conflicts:
	cmdutils.h
	doc/RELEASE_NOTES
	ffprobe.c
	libavcodec/error_resilience.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-19 01:19:38 +01:00
Gaurav Narula
b481bbc32a tests: K&R formatting cosmetics for test programs 2012-01-18 21:07:17 +01:00
Diego Biurrun
03acaa4a43 tests: Remove disabled code. 2011-04-29 18:08:46 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Måns Rullgård
3ec8d24ac9 tiny_psnr: change error exit code from -1 to 1
Originally committed as revision 24149 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 23:26:39 +00:00
Måns Rullgård
cd3cb048d9 tiny_psnr: check fread() return values
Originally committed as revision 24148 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 23:26:36 +00:00
Måns Rullgård
f6dddd3374 tiny_psnr: use abs()
Originally committed as revision 24146 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 19:27:07 +00:00
Måns Rullgård
c43d77c163 tiny_psnr: skip wav headers on input files
The byte count printed excludes the header, and offsets are applied
after the the headers are skipped.

Reference files updated to reflect new output.  Some stddev/psnr values
have changed slightly due to headers no longer being compared.

Originally committed as revision 24143 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 16:06:05 +00:00
Vitor Sessak
cb0067ec25 tiny_psnr: print max absolute difference between files
Regression test reference updates are due to the extra output
from tiny_psnr.

Patch by Vitor Sessak

Originally committed as revision 24132 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 00:40:37 +00:00
Justin Ruggles
b00803e0ae fix a rounding error in the PSNR calculation and update the many regression
test references that this change affects.

Originally committed as revision 20492 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-09 23:09:47 +00:00
Michael Niedermayer
1e90317b65 Fix tiny_psnr so it compares all bytes (it did skip the last block).
Also display both file sizes and slightly change the output formatting.
[not split in 3 patches to avoid the huge checksum files from being changed
 and having to be reviewed 3 times, if people want it split i can revert and
 split it]

Originally committed as revision 14374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 17:24:36 +00:00
Diego Biurrun
cc8de8e8a5 cosmetics: typo/grammar fixes
Originally committed as revision 14371 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 17:04:14 +00:00
Michael Niedermayer
e740c796d8 Fix segfault with non existing input files.
Originally committed as revision 14369 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 15:47:28 +00:00
Diego Biurrun
e9b67fe42e Disable unused function, fixes the warning:
tests/tiny_psnr.c:55: warning: ‘exp16’ defined but not used

Originally committed as revision 10968 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-09 04:57:28 +00:00
Diego Biurrun
2d2fe55737 10l: Revert accidental removal of unused code.
Originally committed as revision 9142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-27 15:52:57 +00:00
Diego Biurrun
dd4ca89143 Fix seek_test compilation for out-of-tree builds.
Originally committed as revision 9135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-27 13:36:02 +00:00
Diego Biurrun
244e1e644c Use proper license header.
Originally committed as revision 9122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-24 23:14:54 +00:00
Benjamin Larsson
b8889ea51f Possibility to skip bytes in the beginning of a file.
Originally committed as revision 5783 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-07-18 21:41:49 +00:00
Benjamin Larsson
ddbddce547 Fix samples to bytes relation.
Originally committed as revision 5314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-04-24 13:04:12 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Michael Niedermayer
ba96e97fdd support comparing files with some posiion offset relative to each other
Originally committed as revision 3921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-01 20:32:47 +00:00
Michael Niedermayer
0c90161f0f signed 16bit support
Originally committed as revision 3913 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-02-01 01:21:32 +00:00
Michael Niedermayer
0d6d0cf953 fopen "r" -> "rb"
Originally committed as revision 3772 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-23 20:13:59 +00:00
Michael Niedermayer
eeaa742c3e 1/0 fix for files with size=0
Originally committed as revision 3484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-09-20 15:40:50 +00:00
Michael Niedermayer
8176bd1a46 overflow fix
Originally committed as revision 3250 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-06-25 18:39:57 +00:00
Michael Niedermayer
9e2a16e1a7 fixpoint log() for tiny_psnr so it can output actual PSNR
Originally committed as revision 2640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-12-31 02:32:54 +00:00
Michael Niedermayer
67cbe68129 check quality too, not only md5 (but dont take the scores too serious, the different codecs use different quality/bitrates and its just based on a artificially generated testvideo)
small changes to some test to check a broader area of features

Originally committed as revision 1751 to svn://svn.ffmpeg.org/ffmpeg/trunk
2003-04-10 21:29:31 +00:00
Mans Rullgard
bf868c4a9b tiny_psnr: fix range calculation for sample size of 32 bits
For a sample size of 32 bits, the shift would overflow producing
undefined results.  Incidentally, in the only test currently using
32-bit samples, the output matches the reference exactly on most
systems meaning the bad 'max' value is never used.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2012-10-15 21:41:25 +01:00