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

1184 Commits

Author SHA1 Message Date
Mans Rullgard
eeadaa6bc0 regtest: separate flags for encoding and decoding
This separates encoding and decoding flags, and passes them together
with the related file argument instead of all at the start of the
command line.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-09 10:12:39 +01:00
Mans Rullgard
fc7314b31c regtest: remove redundant flags in jpg test
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-08 10:58:51 +01:00
Mans Rullgard
765f72f8c4 regtest: use run_ffmpeg in do_image_formats
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-08 10:58:46 +01:00
Mans Rullgard
2728fd9053 regtest: simplify encoding functions
The video encoding options were needlessly split in two parameters
which are merged.  The do_audio_encoding function did not use its
second argument, so this can be removed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-05-08 10:58:32 +01:00
Ronald S. Bultje
7d2e03afc8 vc1: make overlap filter for I-frames bit-exact. 2011-05-04 07:40:53 -04:00
Anssi Hannula
7c152a458d lavf: inspect more frames for fps when container time base is coarse
As per issue2629, most 23.976fps matroska H.264 files are incorrectly
detected as 24fps, as the matroska timestamps usually have only
millisecond precision.

Fix that by doubling the amount of timestamps inspected for frame rate
for streams that have coarse time base. This also fixes 29.970 detection
in matroska.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 78431098f9)

Tested with mplayer based on this report
http://thread.gmane.org/gmane.comp.video.mplayer.user/66043/focus=66063

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-04-29 22:46:13 +02:00
Diego Biurrun
03acaa4a43 tests: Remove disabled code. 2011-04-29 18:08:46 +02:00
Anton Khirnov
f8fec05052 mpegtsenc: make PMT PID really start on pmt_start_pid 2011-04-28 07:26:40 +02:00
Peter Ross
c90626b2ea hflip: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-28 07:25:27 +02:00
Peter Ross
a1f4d07563 crop: make the filter accept PIX_FMT_BGR48LE and PIX_FMT_BGR48BE pixel formats
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-28 07:25:27 +02:00
Peter Ross
1afbae100b libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation
Signed-off-by: Anton Khirnov <anton@khirnov.net>
2011-04-28 07:25:27 +02:00
Justin Ruggles
79ee8977c2 ac3enc: correct the flipped sign in the ac3_fixed encoder 2011-04-26 17:19:37 -04:00
Ronald S. Bultje
3283f274fd FATE: allow forcing thread-type when doing threaded fate runs.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-04-21 19:36:45 -04:00
Diego Biurrun
d11818eff4 Remove now obsolete references to _g-suffixed binaries.
Automatic stripping of binaries was removed in commit e0be794
and the _g binaries disappeared along with it.
2011-04-18 23:55:11 +02:00
Diego Biurrun
fd0c3403f6 Update regtest checksums after revision 6001dad.
The string "FFmpeg" was replaced by "Libav" in metadata that
got encoded in file headers.
2011-04-17 22:46:42 +02:00
Vitor Sessak
96573c0d76 lavf/utils.c: Order packets with identical PTS by stream index.
This allows for more reproducible results when using multi-threading.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-04-12 19:06:26 -04:00
Anton Khirnov
9181976348 matroskaenc: don't write an empty Cues element. 2011-04-07 18:11:24 +02:00
Janne Grunau
0ba832231d fate: add AAC LATM test 2011-04-06 20:55:58 +02:00
Justin Ruggles
e05a3ac713 ac3enc: select bandwidth based on bit rate, sample rate, and number of
full-bandwidth channels.

This reduces high-frequency artifacts and improves the quality of the lower
frequency audio at low bit rates.
2011-04-03 20:59:14 -04:00
Mans Rullgard
79997def65 ac3enc: use generic fixed-point mdct
This makes the AC3 encoder use the shared fixed-point MDCT rather
than its own implementation.  The checksum changes are due to
different rounding in the MDCT.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-03 19:01:53 +01:00
Mans Rullgard
5085a1a068 fate: simplify fft test rules
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-01 20:53:19 +01:00
Mans Rullgard
b41a108914 fate: add fixed-point fft/mdct tests
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-04-01 15:16:06 +01:00
Ronald S. Bultje
c56e618b4b Split fate-psx-str-v3 into a video-only and audio-only test. 2011-03-26 16:39:22 -04:00
Justin Ruggles
e6e9823488 Add apply_window_int16() to DSPContext with x86-optimized versions and use it
in the ac3_fixed encoder.
2011-03-22 21:08:30 -04:00
Luca Barbato
a96c176aed fate: simplify regression-funcs.sh
Factor ffmpeg calls using run_ffmpeg()
2011-03-23 01:17:20 +01:00
Luca Barbato
7851eb68c6 fate: add support for multithread testing
Add a THREADS variable to fate calls.
2011-03-23 01:17:20 +01:00
Mans Rullgard
2a569799a9 fate: update wmv8-drm reference
This updates the wmv8-drm reference after c47d383.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-22 11:07:46 +00:00
Ronald S. Bultje
c47d383502 vc1: make P-frame deblock filter bit-exact. 2011-03-21 21:28:17 -04:00
Mans Rullgard
5a15602a4e fate: remove stale fate-update.sh script
This script was used to import Mike's old fate database and
is no longer needed.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:35:52 +00: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
Janne Grunau
faa6f1c306 get rid of the last svn mentions 2011-03-18 21:57:38 +01:00
Mans Rullgard
487fef2dcc asf: update seek test reference
This updates the seek test reference to match de11ee9.  Before this
change, most of the seeks requested positions before the supposed
start of the file (the preroll time), resulting in the first packet
being returned.  With the preroll subtracted, some of these seeks
will land within the file and some beyond the end, thus returning
a different set of packets.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-17 19:51:28 +00:00
Justin
323e6fead0 ac3enc: do not right-shift fixed-point coefficients in the final MDCT stage.
This increases the accuracy of coefficients, leading to improved quality.
Rescaling of the coefficients to full 25-bit accuracy is done rather than
offsetting the exponent values. This requires coefficient scaling to be done
before determining the rematrixing strategy. Also, the rematrixing strategy
calculation must use 64-bit math to prevent overflow due to the higher
precision coefficients.
2011-03-14 08:45:26 -04:00
Peter Ross
e211e255aa bink: prevent overflows within binkidct by using int-sized intermediate array
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-25 15:24:35 -05:00
Justin Ruggles
1108f8998c vmdaudio: output 8-bit audio as AV_SAMPLE_FMT_U8.
There is no need to expand to 16-bits. Just use memcpy() to copy the raw data.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-23 21:52:51 -05:00
Justin Ruggles
9b73f78600 vmdaudio: output audio samples for standalone silent blocks.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
2011-02-23 21:04:51 -05:00
Justin Ruggles
5b54d4b376 ac3enc: fix bug in stereo rematrixing decision.
The rematrixing strategy reuse flags are not reset between frames, so they
need to be initialized for all blocks, not just block 0.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-16 23:39:57 +00:00
Justin Ruggles
50d7140441 ac3enc: change default floor code to 7.
This is to match the value in every (E-)AC-3 file from commercial sources.
It has a negligible effect on audio quality.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-15 21:40:42 +00:00
Baptiste Coudurier
646739a0a8 Fix qtrle regression test, actually test qtrle.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-11 23:47:09 +00:00
Justin Ruggles
c3beafa0f1 ac3enc: Change EXP_DIFF_THRESHOLD to 500.
This patch changes the exponent difference threshold in the exponent
strategy decision function of the AC-3 encoder.  I tested lowering in
increments of 100.  From 1000 down to 500 generally increased in quality
with each step, but 400 was generally much worse.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-02 20:00:43 +00:00
Mans Rullgard
79dca23dc2 Update mpegts test reference
The output was changed by a7827a17c6.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-28 17:02:54 +00:00
Georgi Chorbadzhiyski
535638b55f mpegtsenc: set reserved bits to 1 in PCR field
The reserved bits between PCR base and extension fields must be
set to 1.

Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 00:02:42 +00:00
Mans Rullgard
e63dd5fb04 fate: add h264 test for extreme cases in planar prediction
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-24 22:26:13 +00:00
Mans Rullgard
76edf2c137 fate: add lossless h264 test
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-22 03:08:21 +00:00
Mans Rullgard
f4b1e21a63 fate: make lavfi tests output only md5
Instead of saving huge raw files, use the md5: output pseudo-protocol
to calculate the checksum of the file directly.  This is especially
useful when testing on remote targets as it avoids transferring 3.6GB
over the network.
2011-01-22 00:30:12 +00:00
Justin Ruggles
a4f5af13fb Add regression test for stereo s16le in voc.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-19 12:51:42 +00:00
Mans Rullgard
3240b371f8 fate: simplify vp8 rules 2011-01-18 20:48:24 +00:00
Mans Rullgard
ee6184a8d9 regtest: add openssl to md5 alternatives 2011-01-18 20:48:24 +00:00
Janne Grunau
2c3589bfda consolidate .gitignore patters into a single file
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-18 21:32:05 +01:00
Janne Grunau
348b8218f7 convert svn:ignore properties to .gitignore files
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-17 15:50:14 +01:00
Baptiste Coudurier
90603f7c93 Update smc fate ref due to r26310
Originally committed as revision 26342 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-14 22:32:26 +00:00
Justin Ruggles
dc7e07ac1f Add stereo rematrixing support to the AC-3 encoders.
This improves the audio quality significantly for stereo source with both the
fixed-point and floating-point AC-3 encoders.
Update acodec-ac3_fixed and seek-ac3_rm test references.

Originally committed as revision 26271 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-08 23:21:17 +00:00
Vitor Sessak
87c1410d11 Add a FATE test for Playstation STR version 3
Originally committed as revision 26231 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-05 19:53:16 +00:00
Justin Ruggles
6fd96d1a85 Change the AC-3 encoder to use floating-point.
Fixed-point AC-3 encoder renamed to ac3_fixed.
Regression test acodec-ac3 renamed to acodec-ac3_fixed.
Regression test lavf-rm changed to use ac3_fixed encoder.

Originally committed as revision 26209 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-04 11:53:44 +00:00
Vitor Sessak
815495f040 Remove the "-idct simple" command line option from the fate-psx-str test,
it should not be necessary anymore.

Originally committed as revision 26198 to svn://svn.ffmpeg.org/ffmpeg/trunk
2011-01-02 12:42:49 +00:00
Justin Ruggles
ec44dd5fc2 Change the default dB-per-bit code from 2 to 3.
This gives slightly better quality in PEAQ tests.
Code 3 gives a dBpb value of 2816 = -132dB (128 psd units = -6dB), which
corresponds to 22 bits. Since the exponents have an offset applied, the
16-bit source looks like 24-bit source to the bit allocation routine.
So using dBpb code=3 is a closer match to the exponent range.

Regression test refs updated for acodec-ac3, lavf-rm, and seek-ac3_rm.

Originally committed as revision 26144 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-29 19:17:22 +00:00
Luca Barbato
8d660f7527 Make fate vp8 test cover emu_edge cases
Originally committed as revision 26134 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-29 17:48:57 +00:00
Aurelien Jacobs
2c77c90684 add SubRip decoder
Originally committed as revision 26119 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-28 23:52:53 +00:00
Stefano Sabatini
b567020943 Add copy filter, useful for testing the avfilter_draw_slice() copy
code.

Originally committed as revision 26112 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-28 01:01:09 +00:00
Justin Ruggles
295ab2af6e Change FIX15() back to clipping to -32767..32767.
This avoids a 16-bit overflow in mdct512() due to a -32768 value in costab.
References updated for acodec-ac3, lavf-rm, and seek-ac3_rm tests.
Thanks to Måns Rullgård for finding the bug.

Originally committed as revision 26071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-21 21:18:58 +00:00
Vitor Sessak
90ca26e121 Increase STDDEV tolerance for the fate-amrwb-14k25 test so it pass in
x86_64 boxes.

Originally committed as revision 26064 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-20 22:01:48 +00:00
Vitor Sessak
9c32023f5b Add AMR-WB FATE tests
Originally committed as revision 26063 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-20 21:35:18 +00:00
Reimar Döffinger
eb066a4ce9 Discard partial packet of last frame for fate-wmv8-drm to avoid test fails
due to VC-1 decoder overreads resulting in different output.

Originally committed as revision 26055 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-18 23:11:31 +00:00
Reimar Döffinger
853395b913 Add test for ASF -cryptokey that tests only demuxing, but both audio and video
to complement the existing video-only decode test.

Originally committed as revision 26054 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-18 16:06:56 +00:00
Reimar Döffinger
bf09a01981 Change ASF demuxer to return incomplete last packets.
Whether the behaviour for streams using scrambling makes sense
is unclear.

Originally committed as revision 26053 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-18 13:18:52 +00:00
Justin Ruggles
8c634b707b Update the test references for lavf-rm and seek-ac3_rm.
The references changed due to r25956.

Originally committed as revision 26004 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-14 16:14:52 +00:00
Justin Ruggles
918cd2255c Simplify fix15().
Turn it into 2 macros, and use av_clip_int16() and lrintf().
This matches the int16 to float sample conversion in audioconvert.c.
The regression test output is different due to lrintf() rounding.

Originally committed as revision 25956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-14 14:51:02 +00:00
Michael Chinen
475ae04a27 Add a FLAC parser.
Seek test reference updated because FLAC seeking now works properly.
Fixes roundup issue 1150.

Patch by Michael Chinen [mchinen at gmail]

Originally committed as revision 25914 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-07 14:50:50 +00:00
Carl Eugen Hoyos
ad556addfd Fix h264-conformance-frext-frext_mmco4_sony_b conformance test.
This includes a revert of r25840

Originally committed as revision 25842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-29 10:35:57 +00:00
Baptiste Coudurier
79561f0ed4 Update fate h264 test due to r25824, this file has 2 frames delay
Originally committed as revision 25840 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-28 23:09:30 +00:00
Baptiste Coudurier
9d9c3e1a70 Make DNxHD encoder produce files that are strictly VC-3 compatible
Originally committed as revision 25756 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-16 01:00:55 +00:00
Vitor Sessak
bad1117b8c Add AMR-NB FATE tests
Originally committed as revision 25750 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-14 09:35:51 +00:00
Vitor Sessak
4aa826e994 Add Musepack7 FATE test
Originally committed as revision 25749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-14 09:34:55 +00:00
Vitor Sessak
bbf07bf9b8 Remove now unused file (should have been part of commit r25735)
Originally committed as revision 25736 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 20:15:36 +00:00
Vitor Sessak
c51722bf97 Test 4XM decoding (and not only demuxing) in FATE tests
Originally committed as revision 25735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 20:04:41 +00:00
Reimar Döffinger
e61bb0852f Add test for cropping of interlaced H.264.
Originally committed as revision 25677 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-04 21:48:54 +00:00
Reimar Döffinger
9fc2b70826 Update 24 bpp TM1 reference for decoder fixes.
Originally committed as revision 25664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-03 18:13:09 +00:00
Michael Niedermayer
94bdb1f80c Avoid negative SCR in mpeg ps muxer.
Fixes a scr issue reported with dvdauthor ([FFmpeg-user] FFMPEG encoded MPEG-2 video causes error in DVDAuthor)

Originally committed as revision 25512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-16 21:31:31 +00:00
Alexander Strange
e4dccc0d59 Update rv30 FATE reference after last commit
The rm demuxer has timestamp bugs, so this test is sensitive to changes in
timestamp correction. The previous commit did not make output any better or worse
on this test, just different.

See https://roundup.ffmpeg.org/issue2288 for details.

Originally committed as revision 25432 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-10 02:20:02 +00:00
Baptiste Coudurier
a7ba165a0c Update gxf regression tests because of r25399
Originally committed as revision 25400 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 19:37:37 +00:00
Reuben Martin
ad4c3c6840 In gxf muxer, fix flt entry offset, patch by Reuben Martin, reuben dot m at gmail dot com
Originally committed as revision 25395 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 19:15:35 +00:00
Michael Niedermayer
9b272e3274 Init SCR in mpeg muxer based on first DTS.
This fixes issues if the first DTS is far away from 0.

Originally committed as revision 25383 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-07 00:32:22 +00:00
Reimar Döffinger
f71abdbbd7 Remove pointless -vn option, the file has no video stream.
Originally committed as revision 25314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-02 10:00:48 +00:00
Reimar Döffinger
01e4b67598 Rename fate-gsm test to the more accurate fate-gsm-ms
and add a test for regular GSM as fate-gsm.

Fixes a 8kHz sample from issue 113.

Originally committed as revision 25313 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-10-02 09:56:21 +00:00
Måns Rullgård
8c067b5dfd Update rv20 seek test reference
Originally committed as revision 25204 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 09:02:51 +00:00
Michael Niedermayer
53eb458a72 Fix rv20 encoding so the binary decoder can decode it.
Originally committed as revision 25203 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-26 01:56:48 +00:00
Stefano Sabatini
75b67a8a99 Make the crop filters accept parametric expressions.
Originally committed as revision 25185 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-25 01:18:43 +00:00
Stefano Sabatini
2bc05d3547 Change the syntax of the crop filter from x:y:w:h to w:h:x:y.
Slightly more intuitive and required by a pending changes for making
the filter parametric.

Originally committed as revision 25184 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-24 23:14:01 +00:00
Måns Rullgård
c4795e8069 fate: print commands being executed with V=1
Originally committed as revision 25161 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-23 09:55:31 +00:00
Justin Ruggles
6c834328b9 Allow audiogen to take commandline parameters for sample rate and number of
channels.

Originally committed as revision 25127 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-15 21:36:04 +00:00
Justin Ruggles
c7d89948a3 Set a constant frame size for encoding G.726 audio.
Originally committed as revision 25107 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-11 19:52:09 +00:00
Martin Storsjö
fe5f761ab6 Add a FATE test for the G.722 decoder
Originally committed as revision 25104 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-11 10:23:02 +00:00
Måns Rullgård
69a9c80bed fate: delete log files ahead of each run
Originally committed as revision 25025 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-02 15:39:44 +00:00
Vitor Sessak
82c76ceee7 QTRLE regtest
Originally committed as revision 25017 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-09-01 12:38:36 +00:00
Vitor Sessak
4b7539f1cd SHA fate test
Originally committed as revision 25013 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-31 20:07:38 +00:00
Vitor Sessak
6b85316bd2 Test decoding in fate-lavf-gif
Originally committed as revision 25012 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-31 17:55:31 +00:00
Vitor Sessak
f5d4fc43bb PNG image regression testing
Originally committed as revision 25011 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-31 17:53:48 +00:00
Vitor Sessak
d81db9c7d1 Add RealVideo 3 FATE test
Originally committed as revision 25008 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-31 11:15:04 +00:00
Vitor Sessak
61f89303c0 10l, add flags forgotten in last commit
Originally committed as revision 25007 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-31 11:14:15 +00:00
Vitor Sessak
3e41fc623c Add Apple MJPEG-B decoder FATE test
Originally committed as revision 25006 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-31 11:13:14 +00:00
Vitor Sessak
506c47a48e Add FATE test for ScummVM DXA flavor
Originally committed as revision 25005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-31 11:11:25 +00:00
Vitor Sessak
2d0cdf3cc0 Add fate test for Westwood SND1 codec
Originally committed as revision 24957 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-28 14:51:51 +00:00
Vitor Sessak
0a24503d04 Remove CCITT fax G4 tests (partial revert of r24954). This test is
corrupting memory somehow and segfaulting in the BSDs.

Originally committed as revision 24956 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-28 14:45:51 +00:00
Vitor Sessak
3b619cab31 CCITT Fax Group compression fate tests
Originally committed as revision 24954 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-28 11:46:03 +00:00
Måns Rullgård
74c847e098 fate: build with --enable-gpl
Originally committed as revision 24930 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 18:37:38 +00:00
Vitor Sessak
4574b815cc VP3 fate test
Originally committed as revision 24928 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-25 17:23:38 +00:00
Vitor Sessak
d21caa952c Renderware TeXture Dictionary FATE test
Originally committed as revision 24911 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-24 20:48:58 +00:00
Måns Rullgård
078ae66b4b fate: set LC_ALL=C to avoid locale interference
Originally committed as revision 24889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 17:34:08 +00:00
Vitor Sessak
1ee39ebde2 BinkAudio FATE tests
Originally committed as revision 24888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 16:41:25 +00:00
Vitor Sessak
c4ab519e00 Make "-fs ss" mean "make output file of size equals or less than ss"
instead of current "make output file of size less than ss".

Also use it to make MP3 tests more readable (using -fs xxx where xxx is
the requested output size, not something slightly lower).

Originally committed as revision 24884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 14:46:59 +00:00
Vitor Sessak
1c10978086 fix fate breakage, 10l to me (too much copy and pasting)
Originally committed as revision 24881 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 12:27:27 +00:00
Vitor Sessak
680aefa2fe MP3 float decoder FATE tests
Originally committed as revision 24880 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 12:17:03 +00:00
Vitor Sessak
07862680b5 Add FATE test for WMV8 DRM
Originally committed as revision 24874 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 11:46:55 +00:00
Reimar Döffinger
620918e4bf Add truemotion1 tests.
Originally committed as revision 24872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-23 04:45:36 +00:00
Måns Rullgård
b56a9c8eef fate: remove unused variable in fate.sh
Originally committed as revision 24870 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-22 15:20:07 +00:00
Måns Rullgård
715e9be267 fate: remove pointless fate/fate2 separation
Originally committed as revision 24868 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-22 14:24:58 +00:00
Måns Rullgård
8226e9779d fate: allow specifying relative path to config file in fate.sh
Originally committed as revision 24866 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-22 11:53:02 +00:00
Vitor Sessak
3d6bd1c797 Add FATE test for ANSI/ASCII animation and TTY demuxer
Originally committed as revision 24865 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-21 20:57:24 +00:00
Måns Rullgård
b42c483f07 fate-run: use 'run' function in 'ffmpeg' function
Originally committed as revision 24837 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-19 16:51:24 +00:00
Måns Rullgård
91de2c0a73 fate: add -v 0 to ffmpeg flags
Originally committed as revision 24836 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-19 16:51:21 +00:00
Måns Rullgård
32a15a2441 fate: store last version in per-slot file
This allows the same workdir to be used by multiple slots.

Originally committed as revision 24819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 20:36:22 +00:00
Stefano Sabatini
a1e171dfee Add hflip filter.
Originally committed as revision 24806 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-17 14:59:12 +00:00
Måns Rullgård
4c3fbd4f93 fate: move some groups of related tests to their own files
This moves some groups of tests for single codecs to separate files,
and adds shorthands for running all tests in a group.

Originally committed as revision 24697 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 18:47:20 +00:00
Måns Rullgård
49d63851cb fate: add fft tests
Originally committed as revision 24695 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 06:57:02 +00:00
Måns Rullgård
dff1fc51b2 fate-run: add helper to run things on target
Originally committed as revision 24694 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-04 06:56:59 +00:00
Måns Rullgård
42907c6ab5 lavfi-regression: trim \r line ends from showfiltfmts output
This is required when cross-testing on dos-like targets.

Originally committed as revision 24667 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-02 19:44:58 +00:00
Stefano Sabatini
546017fc79 Sort lavfi pixdesc tests.
Increase readability and robustness, as the test result is not going
to differ if the order of the pixfmts codes changes.

Originally committed as revision 24665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-02 11:56:51 +00:00
Måns Rullgård
9c87c03779 lavfi-regression: use different temp file names for each pixfmt test
Originally committed as revision 24658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 23:34:48 +00:00
Stefano Sabatini
213a4cbb39 Add lavfi-pixfmts LE tests.
The corresponding lavfi-pixfmts BE tests are not yet added, as there
are some bugs in the scaler (scaling rgba, argb, bgra, abgr, yuva420p)
which result in differences with the LE reference, and I cannot
visually check the generated files on BE.

Originally committed as revision 24657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 23:20:46 +00:00
Stefano Sabatini
043076975f Reindent.
Originally committed as revision 24655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 23:04:16 +00:00
Stefano Sabatini
73177b6c79 Split lavfi pixfmts test.
Introduce the function do_lavfi_pixfmts(), and use it for generating a
pixfmts test for each different filter.

Originally committed as revision 24654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 23:04:13 +00:00
Måns Rullgård
61a187b081 fate: fix non-standard use of bc
Originally committed as revision 24651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 15:28:42 +00:00
Måns Rullgård
5b60c29339 fate: fix signal name translation
Originally committed as revision 24650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 12:29:03 +00:00
Måns Rullgård
8b0816cbc3 fate: make tar command configurable
The 'tar' variable should be set to a command writing a tar archive
of the named files to stdout, typically "tar c" or "tar cf -"

Originally committed as revision 24649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 12:29:00 +00:00
Måns Rullgård
7e7fc4e9ee Simplify lavfi-pixfmts test script
Originally committed as revision 24648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 11:34:59 +00:00
Måns Rullgård
79ec38d154 Remove temporary files in lavfi-pixfmts test
Originally committed as revision 24646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 10:47:41 +00:00
Stefano Sabatini
43d2c6a511 Fix fate-lavfi-pixfmts test cross-compilation.
Add the lavfi-showfiltfmts dependency in the Makefile, and correctly
use the $target_exec and $target_path variables for invoking the
lavfi-showfiltfmts tool.

Originally committed as revision 24645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 10:27:04 +00:00
Stefano Sabatini
2b346e042e Use the ffmpeg specified in $ffmpeg in the pixfmts lavfi test,
otherwise the test will be running whatever ffmpeg is installed on the
host system.

Originally committed as revision 24644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 10:27:00 +00:00
Stefano Sabatini
0a87d541b7 Put the filter name before the pixel format name in the lavfi pixfmts
test output files, and add a prefix with the name of the test.
Make per-filter grouping of the generated output files easier, which
is more useful than per-pixel-format grouping.

Originally committed as revision 24643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 00:46:11 +00:00
Stefano Sabatini
65e17eae3c Introduce and use a variable $output in the lavfi pixfmts test code.
Consistent with the lavfi pixdesc test code, and slightly improve
readability.

Originally committed as revision 24642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 00:46:08 +00:00
Stefano Sabatini
fc25373b1b Split the lavfi pixfmts tests in _le and _be, this is required as the
test results and references depend on machine endianess.

Originally committed as revision 24641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 00:46:06 +00:00
Stefano Sabatini
42bc7c8a60 Rename the not yet enabled test lavfi_pix_fmts to pixfmts, which is
simpler and consistent with the names of the other lavfi tests.

Originally committed as revision 24640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-01 00:46:03 +00:00
Måns Rullgård
4e705a6806 fate: translate exit status to signal name
Originally committed as revision 24623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-31 16:53:09 +00:00
Måns Rullgård
51124db8ea fate: clean up also after failed runs
Originally committed as revision 24542 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 11:57:51 +00:00
Vitor Sessak
cf0194a3f5 Increase error tolerance for RA288 and one vorbis test. Should fix some
failures in PPC and ARM.

Originally committed as revision 24541 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 11:53:14 +00:00
Måns Rullgård
673fe599b3 fate: delete build and install dirs after session
Originally committed as revision 24531 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-27 01:08:44 +00:00
Måns Rullgård
a9dc611145 fate: add fate session script
Originally committed as revision 24530 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 23:44:09 +00:00
Måns Rullgård
b82be63688 fate: create report files
Originally committed as revision 24529 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 23:44:06 +00:00
Måns Rullgård
ce3a841da1 Add a simple base64 encoder for use in tests
Originally committed as revision 24526 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-26 23:43:56 +00:00
Måns Rullgård
e6e3069b54 Simplify lavfi test script a little
Originally committed as revision 24486 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-24 17:13:35 +00:00
Måns Rullgård
8fae6e7c11 Unbreak parallel lavfi testing
Originally committed as revision 24485 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-24 17:13:32 +00:00
Vitor Sessak
a58ed9a2e7 Add VP8 sign bias code regtest. Not tested by the official conformance suite.
Originally committed as revision 24457 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-23 10:09:46 +00:00
Vitor Sessak
0662bf22ec Add WMAPro regtests
Originally committed as revision 24404 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 22:33:06 +00:00
Måns Rullgård
a4e6fa86ce regtest: simplify cleanup after each test
Originally committed as revision 24396 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 20:49:41 +00:00
Måns Rullgård
157c924176 fate: delete useless artifacts after running each test
Originally committed as revision 24395 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 20:49:36 +00:00
Måns Rullgård
bcb0a1546d fate: keep stderr from failing tests
Originally committed as revision 24394 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 20:49:34 +00:00
Thierry Foucu
591db22dff gxfenc: Fix ES name in the UMF media description, by using strlen instead of sizeof
Patch by Thierry Foucu, tfoucu at gmail

Originally committed as revision 24379 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-21 07:46:02 +00:00
Vitor Sessak
91c4d85f7b WMAVoice regtests
Originally committed as revision 24374 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 20:47:47 +00:00
Rafaël Carré
e8723e242d Lego Mindstorms RSO muxer and demuxer.
Patch by Rafaël Carré, rafael d carre a gmail

Originally committed as revision 24355 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 14:13:24 +00:00
Måns Rullgård
ffe72624e7 fate: run diff even if command fails
The diff may provide useful information even if the command was
unsuccessful.  The test is still treated as failed in this case.

Originally committed as revision 24353 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 12:54:43 +00:00
Måns Rullgård
c963e961ac Remove unused seek-regression.sh script
Originally committed as revision 24349 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 10:19:35 +00:00
Måns Rullgård
9a3f31efcb fate: allow running regtests through fate frontend
Originally committed as revision 24347 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 10:19:28 +00:00
Måns Rullgård
f729c4aea8 regtest: rename seektest ref files using alphanumeric chars only
Originally committed as revision 24345 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 10:09:54 +00:00
Carl Eugen Hoyos
2d91366cc2 Make MP43 the default fourcc for msmpeg4v3:
DIV3 is not supported on default XP and Vista installations (MP43 is).

Originally committed as revision 24343 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-20 09:44:21 +00:00
Måns Rullgård
7c1bb9143e Fix lavfi pixdesc test
This test verifies the pixdesc code by comparing the output with and
without a filter which should have no effect on the image.  Since the
available pixel formats depend on the byte order of the machine, a
simple reference checksum is not possible.

The test originally tried to solve this by generating a reference file
on the fly.  The problem with this is that the test framework expects
the reference file in the source tree, and writing to the source tree
is not allowed.

To avoid complicating the test framework, we instead provide two
reference files and select which to use based on the byte order.

Originally committed as revision 24330 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-19 17:17:49 +00:00
Måns Rullgård
77cce79aa7 fate: ensure all imported rules are handled by helpers
Originally committed as revision 24318 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 20:50:03 +00:00
Måns Rullgård
cdaf4b79bb fate: simplify test runner slightly
All tests use the provided helper functions so prepending $target_exec
and using eval is no longer required.

Originally committed as revision 24317 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 20:46:44 +00:00
Måns Rullgård
f366a6de31 fate: use helper functions in test rules
Originally committed as revision 24316 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 20:46:42 +00:00
Måns Rullgård
2b18c451bd fate: add some helper functions to simplify test rules
Originally committed as revision 24314 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 20:19:30 +00:00
Måns Rullgård
f0388cf716 fate: apply TARGET_EXEC only to commands starting with absolute path
Originally committed as revision 24313 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 20:19:25 +00:00
Måns Rullgård
d2f33c8021 fate: use our variable names in test rules imported from Mike's db
Originally committed as revision 24312 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 20:19:21 +00:00
Måns Rullgård
122a9af76b fate-run: rename some variables consistently with other files
Originally committed as revision 24311 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 20:19:16 +00:00
Måns Rullgård
ed62c6b624 fate: do not delete ref files when updating tests from db
Originally committed as revision 24310 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-18 20:19:12 +00:00
Måns Rullgård
e153cfa867 fate: add stddev comparator
This allows CMP=stddev in test rules.  The test passes if the reported
stddev is <= the FUZZ value (default 1).

Originally committed as revision 24289 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-17 15:02:34 +00:00
Måns Rullgård
26e87a2261 fate: whitespace cosmetics
Originally committed as revision 24288 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-17 15:02:32 +00:00
Vitor Sessak
7c06faf894 Undo my revert at r24260.
This is the only way by now to test this codec.

Originally committed as revision 24286 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-17 10:50:25 +00:00
Måns Rullgård
6441d39d58 fate: update vc1 reference
Originally committed as revision 24263 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 12:37:09 +00:00
Vitor Sessak
1c435a0d4e Vorbis regtests
Originally committed as revision 24262 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 12:32:14 +00:00
Vitor Sessak
605014ca33 Revert r24258:
Log:
Add msmpeg4v1 regtest

Added:
   trunk/tests/ref/fate/msmpeg4v1
Modified:
   trunk/tests/fate2.mak

According to Mans, "make test" tests already msmpeg4v1.

Originally committed as revision 24260 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 10:19:21 +00:00
Vitor Sessak
58c9c95c75 Add msmpeg4v1 regtest
Originally committed as revision 24258 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 10:06:33 +00:00
Vitor Sessak
abc152d78e Add MS-GSM regtest
Originally committed as revision 24257 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 09:58:17 +00:00
Vitor Sessak
41511ae6cf ATRAC3 regtests
Originally committed as revision 24256 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 09:41:53 +00:00
Vitor Sessak
6944215a2f Add ATRAC1 regtest
Originally committed as revision 24255 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 09:35:26 +00:00
Vitor Sessak
044dadeff3 Add EAC3 regtests
Originally committed as revision 24254 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 09:24:09 +00:00
Vitor Sessak
cf39355978 Add AC3 regtests
Originally committed as revision 24253 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-16 09:09:53 +00:00
Vitor Sessak
0dc5ca2e12 Add TrueSpeech regtest
Originally committed as revision 24221 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-12 21:02:52 +00:00
Måns Rullgård
5ee08c8531 fate: add vp8 bilinear tests
Mike added these some time ago, and I forgot to update here.

Originally committed as revision 24220 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-12 20:24:23 +00:00
Vitor Sessak
e9e40c875e NellyMoser regtest
Originally committed as revision 24195 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 14:13:23 +00:00
Vitor Sessak
d4d5b66140 DTS Coherent Acoustics regtest
Originally committed as revision 24194 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 14:05:38 +00:00
Vitor Sessak
bb1e597736 Add Pictor/PC Paint PIC regtest
Originally committed as revision 24193 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 12:44:32 +00:00
Vitor Sessak
e798dbdd34 Psygnosis YOP demuxer and decoder test
Originally committed as revision 24181 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-11 00:07:31 +00:00
Vitor Sessak
e747ff1c63 Add Intel Music Coder regtest
Originally committed as revision 24180 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 23:50:17 +00:00
Vitor Sessak
369b49630d Add QDM2 test
Originally committed as revision 24178 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 23:41:26 +00:00
Vitor Sessak
827396688c Add QCELP regtest
Originally committed as revision 24176 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 23:15:45 +00:00
Vitor Sessak
1d9a8c347a Add MPEG2 field encoding fate2 regtest
Originally committed as revision 24175 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 22:57:19 +00:00
Vitor Sessak
6b7917ba3b Add RealAudio COOK fate2 test
Originally committed as revision 24168 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 18:46:10 +00:00
Vitor Sessak
65c58b168b Add fate2 test for RA288
Originally committed as revision 24167 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 18:43:01 +00:00
Måns Rullgård
06970a4ca3 fate: some AAC tests need FUZZ=2 on ARM
Originally committed as revision 24166 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 18:01:16 +00:00
Måns Rullgård
83b203dc94 fate: ensure file sizes match in oneoff tests
Originally committed as revision 24164 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 16:58:00 +00:00
Alex Converse
6a59b98445 AAC fate2 tests.
Originally committed as revision 24163 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 16:51:04 +00:00