Merge remote-tracking branch 'qatar/master'

* qatar/master: (26 commits)
  eac3dec: replace undefined 1<<31 with INT32_MIN in noise generation
  yadif: specify array size outside DECLARE_ALIGNED
  prores: specify array size outside DECLARE_ALIGNED brackets.
  WavPack demuxer: set packet duration
  tta: use skip_bits_long()
  mxfdec: Ignore the last entry in Avid's index table segments
  mxfdec: Sanity-check SampleRate
  mxfdec: Handle small EditUnitByteCount
  mxfdec: Consider OPAtom files that do not have exactly one EC to be OP1a
  mxfdec: Don't crash in mxf_packet_timestamps() if current_edit_unit overflows
  mxfdec: Zero nb_ptses in mxf_compute_ptses_fake_index()
  mxfdec: Sanity check PreviousPartition
  mxfdec: Never seek back in local sets and KLVs
  mxfdec: Move the current_partition check inside mxf_read_header()
  mxfdec: Fix infinite loop in mxf_packet_timestamps()
  mxfdec: Check eof_reached in mxf_read_local_tags()
  mxfdec: Check for NULL component
  mxfdec: Make sure mxf->nb_index_tables > 0 in mxf_packet_timestamps()
  mxfdec: Make sure x < index_table->nb_ptses
  build: Add missing directories to DIRS declarations.
  ...

Conflicts:
	doc/build_system.txt
	doc/fate.texi
	libavfilter/x86/yadif_template.c
	libavformat/mxfdec.c
	libavutil/Makefile
	tests/fate/audio.mak
	tests/fate/prores.mak
	tests/fate/screen.mak
	tests/fate/video.mak
	tests/ref/fate/bethsoft-vid
	tests/ref/fate/cscd
	tests/ref/fate/dfa4
	tests/ref/fate/nuv
	tests/ref/fate/vp8-sign-bias
	tests/ref/fate/wmv8-drm
	tests/ref/lavf/gxf

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc doc/fate.texi
index acb4bfe6a1610d249c52604bfde9b80ecf7d8910,b4f520fef9cf3694a389668cf081ab127ce08001..1612bdf1e0aafd5302d64c2c33843b4e92dc5b1e
--- 1/doc/fate.texi
--- 2/doc/fate.texi
+++ b/doc/fate.texi
@@@ -12,163 -11,124 +12,163 @@@
  
  @chapter Introduction
  
 -FATE provides a regression testsuite embedded within the Libav build system.
 -It can be run locally and optionally configured to send reports to a web
 -aggregator and viewer @url{http://fate.libav.org}.
 +  FATE is an extended regression suite on the client-side and a means
 +for results aggregation and presentation on the server-side.
  
 -It is advised to run FATE before submitting patches to the current codebase
 -and provide new tests when submitting patches to add additional features.
 +  The first part of this document explains how you can use FATE from
 +your FFmpeg source directory to test your ffmpeg binary. The second
 +part describes how you can run FATE to submit the results to FFmpeg's
 +FATE server.
  
 -@chapter Running FATE
 +  In any way you can have a look at the publicly viewable FATE results
 +by visiting this website:
  
 -@section Samples and References
 -In order to run, FATE needs a large amount of data (samples and references)
 -that is provided separately from the actual source distribution.
 +  @url{http://fate.ffmpeg.org/}
  
 -To inform the build system about the testsuite location, pass
 -@option{--samples=<path to the samples>} to @command{configure} or set the
 -@var{SAMPLES} Make variable or the @var{FATE_SAMPLES} environment variable
 -to a suitable value.
 +  This is especially recommended for all people contributing source
 +code to FFmpeg, as it can be seen if some test on some platform broke
 +with there recent contribution. This usually happens on the platforms
 +the developers could not test on.
  
 -The dataset is available through @command{rsync}, is possible to fetch
 -the current sample using the straight rsync command or through a specific
 -@ref{Makefile target}.
 +  The second part of this document describes how you can run FATE to
 +submit your results to FFmpeg's FATE server. If you want to submit your
 +results be sure to check that your combination of CPU, OS and compiler
 +is not already listed on the above mentioned website.
 +
 +  In the third part you can find a comprehensive listing of FATE makefile
 +targets and variables.
 +
 +
 +@chapter Using FATE from your FFmpeg source directory
 +
 +  If you want to run FATE on your machine you need to have the samples
 +in place. You can get the samples via the build target fate-rsync.
 +Use this command from the top-level source directory:
 +
 +@example
 +make fate-rsync SAMPLES=fate-suite/
 +make fate       SAMPLES=fate-suite/
 +@end example
 +
 +  The above commands set the samples location by passing a makefile
 +variable via command line. It is also possible to set the samples
 +location at source configuration time by invoking configure with
 +`--samples=<path to the samples directory>'. Afterwards you can
 +invoke the makefile targets without setting the SAMPLES makefile
 +variable. This is illustrated by the following commands:
  
  @example
 -# rsync -aL rsync://fate-suite.libav.org/fate-suite/ fate-suite
 +./configure --samples=fate-suite/
 +make fate-rsync
 +make fate
  @end example
  
 +  Yet another way to tell FATE about the location of the sample
 +directory is by making sure the environment variable FATE_SAMPLES
 +contains the path to your samples directory. This can be achieved
 +by e.g. putting that variable in your shell profile or by setting
 +it in your interactive session.
 +
  @example
 -# make fate-rsync SAMPLES=fate-suite
 +FATE_SAMPLES=fate-suite/ make fate
  @end example
  
 +@float NOTE
 +Do not put a '~' character in the samples path to indicate a home
 +directory. Because of shell nuances, this will cause FATE to fail.
 +@end float
 +
 +
 +@chapter Submitting the results to the FFmpeg result aggregation server
 +
 +  To submit your results to the server you should run fate through the
 +shell script tests/fate.sh from the FFmpeg sources. This script needs
 +to be invoked with a configuration file as its first argument.
 +
 +@example
 +tests/fate.sh /path/to/fate_config
 +@end example
 +
 +  A configuration file template with comments describing the individual
 +configuration variables can be found at @file{tests/fate_config.sh.template}.
 +
 +@ifhtml
 +  The mentioned configuration template is also available here:
 +@verbatiminclude ../tests/fate_config.sh.template
 +@end ifhtml
 +
 +  Create a configuration that suits your needs, based on the configuration
 +template. The `slot' configuration variable can be any string that is not
 +yet used, but it is suggested that you name it adhering to the following
 +pattern <arch>-<os>-<compiler>-<compiler version>. The configuration file
 +itself will be sourced in a shell script, therefore all shell features may
 +be used. This enables you to setup the environment as you need it for your
 +build.
 +
 +  For your first test runs the `fate_recv' variable should be empty or
 +commented out. This will run everything as normal except that it will omit
 +the submission of the results to the server. The following files should be
 +present in $workdir as specified in the configuration file:
 +
 +@itemize
 +    @item configure.log
 +    @item compile.log
 +    @item test.log
 +    @item report
 +    @item version
 +@end itemize
 +
 +  When you have everything working properly you can create an SSH key and
 +send its public part to the FATE server administrator.
 +
 +  Configure your SSH client to use public key authentication with that key
 +when connecting to the FATE server. Also do not forget to check the identity
 +of the server and to accept its host key. This can usually be achieved by
 +running your SSH client manually and killing it after you accepted the key.
 +The FATE server's fingerprint is:
 +
 +  b1:31:c8:79:3f:04:1d:f8:f2:23:26:5a:fd:55:fa:92
  
 -@chapter Manual Run
 -FATE regression test can be run through @command{make}.
 -Specific Makefile targets and Makefile variables are available:
 +  The only thing left is to automate the execution of the fate.sh script and
 +the synchronisation of the samples directory.
 +
 +
 +@chapter FATE makefile targets and variables
 +
 +@section Makefile targets
  
 -@anchor{Makefile target}
 -@section FATE Makefile targets
  @table @option
 -@item fate-list
 -List all fate/regression test targets.
  @item fate-rsync
 -Shortcut to download the fate test samples to the specified testsuite location.
 +    Download/synchronize sample files to the configured samples directory.
 +
 +@item fate-list
 +    Will list all fate/regression test targets.
 +
  @item fate
 -Run the FATE test suite (requires the fate-suite dataset).
 +    Run the FATE test suite (requires the fate-suite dataset).
  @end table
  
 -@section Fate Makefile variables
 +@section Makefile variables
 +
  @table @option
  @item V
 -Verbosity level, can be set to 0, 1 or 2.
 -@table @option
 -    @item 0
 -    show just the test arguments
 -    @item 1
 -    show just the command used in the test
 -    @item 2
 -    show everything
 -@end table
 +    Verbosity level, can be set to 0, 1 or 2.
 +    @itemize
 +        @item 0: show just the test arguments
 +        @item 1: show just the command used in the test
 +        @item 2: show everything
 +    @end itemize
 +
  @item SAMPLES
 -Specify or override the path to the FATE samples at make time, it has a
 -meaning only while running the regression tests.
 +    Specify or override the path to the FATE samples at make time, it has a
 +    meaning only while running the regression tests.
 +
  @item THREADS
 -Specify how many threads to use while running regression tests, it is
 -quite useful to detect thread-related regressions.
 +    Specify how many threads to use while running regression tests, it is
 +    quite useful to detect thread-related regressions.
  @end table
  
 +Example:
  @example
 -    make V=1 SAMPLES=/var/fate/samples THREADS=2 fate
 -@end example
 -
 -@chapter Automated Tests
 -In order to automatically testing specific configurations, e.g. multiple
 -compilers, @command{tests/fate.sh} is provided.
 -
 -This shell script builds Libav, runs the regression tests and prepares a
 -report that can be sent to @url{fate.libav.org} or directly examined locally.
 -
 -@section Testing Profiles
 -The configuration file passed to @command{fate.sh} is shell scripts as well.
 -
 -It must provide at least a @var{slot} identifier, the @var{repo} from
 -which fetch the sources, the @var{samples} directory, a @var{workdir} with
 -enough space to build and run all the tests.
 -Optional submit command @var{fate_recv} and a @var{comment} to describe
 -the testing profile are available.
 -
 -Additional optional parameter to tune the Libav building and reporting process
 -can be passed.
 -
 -@example
 -slot=                                   # some unique identifier
 -repo=git://git.libav.org/libav.git      # the source repository
 -samples=/path/to/fate/samples
 -workdir=                                # directory in which to do all the work
 -fate_recv="ssh -T fate@@fate.libav.org"  # command to submit report
 -comment=                                # optional description
 -
 -# the following are optional and map to configure options
 -arch=
 -cpu=
 -cross_prefix=
 -cc=
 -target_os=
 -sysroot=
 -target_exec=
 -target_path=
 -extra_cflags=
 -extra_ldflags=
 -extra_libs=
 -extra_conf=     # extra configure options not covered above
 -
 -#make=          # name of GNU make if not 'make'
 -makeopts=       # extra options passed to 'make'
 -#tar=           # command to create a tar archive from its arguments on
 -                # stdout, defaults to 'tar c'
 -@end example
 -
 -@section Submitting Reports
 -In order to send reports you need to create an @command{ssh} key and send it
 -to @email{root@@libav.org}.
 -The current server fingerprint is @var{a4:99:d7:d3:1c:92:0d:56:d6:d5:61:be:01:ae:7d:e6}
 +make V=1 SAMPLES=/var/fate/samples THREADS=2 fate
- @end example
++@end example

diff --cc doc/ffserver.conf
index 217117005c57c6af3a7f9d31edf1e058a6747c1b,e9724bbf99a2448b55eda0a7a400583ebeeef53b..d10ac5bc09f29bfedeee38122b3135ad633e0a9b
--- 1/doc/ffserver.conf
--- 2/doc/avserver.conf
+++ b/doc/ffserver.conf
@@@ -371,7 -371,5 +371,5 @@@ ACL allow 192.168.0.0 192.168.255.25
  # Redirect index.html to the appropriate site
  
  <Redirect index.html>
 -URL http://www.libav.org/
 +URL http://www.ffmpeg.org/
  </Redirect>
- 
- 

diff --cc doc/filters.texi
Simple merge

diff --cc libavcodec/Makefile
Simple merge

diff --cc libavcodec/arm/vp8.h
Simple merge

diff --cc libavcodec/bfin/dsputil_bfin.c
Simple merge

diff --cc libavcodec/bfin/fdct_bfin.S
Simple merge

diff --cc libavcodec/bfin/idct_bfin.S
Simple merge

diff --cc libavcodec/bfin/mpegvideo_bfin.c
Simple merge

diff --cc libavcodec/bfin/pixels_bfin.S
Simple merge

diff --cc libavcodec/bfin/vp3_bfin.c
Simple merge

diff --cc libavcodec/bfin/vp3_idct_bfin.S
Simple merge

diff --cc libavcodec/bytestream.h
Simple merge

diff --cc libavcodec/eac3dec.c
Simple merge

diff --cc libavcodec/ppc/idct_altivec.c
Simple merge

diff --cc libavcodec/proresdec_lgpl.c
Simple merge

diff --cc libavcodec/ps2/dsputil_mmi.c
Simple merge

diff --cc libavcodec/ps2/idct_mmi.c
Simple merge

diff --cc libavcodec/ps2/mpegvideo_mmi.c
Simple merge

diff --cc libavcodec/rawenc.c
Simple merge

diff --cc libavcodec/tta.c
index 8d49bc80d2cf4278adceea9b84e804503fe52e53,49d59538d3ef43e66c26620c896ed2ce6af911ff..ab83730dfd5602b4ae81ddb4dfb2091cc18b76df
--- 1/libavcodec/tta.c
--- 2/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@@ -413,32 -399,21 +411,32 @@@ static int tta_decode_frame(AVCodecCont
  
      if (get_bits_left(&s->gb) < 32)
          return -1;
-     skip_bits(&s->gb, 32); // frame crc
+     skip_bits_long(&s->gb, 32); // frame crc
  
 -    // convert to output buffer
 -    if (s->bps == 2) {
 -        int16_t *samples = (int16_t *)s->frame.data[0];
 -        for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++)
 -            *samples++ = *p;
 -    } else {
 -        // shift samples for 24-bit sample format
 -        int32_t *samples = (int32_t *)s->frame.data[0];
 -        for (i = 0; i < framelen * s->channels; i++)
 -            *samples++ <<= 8;
 -        // reset decode buffer
 -        s->decode_buffer = NULL;
 -    }
 +        // convert to output buffer
 +        switch(s->bps) {
 +            case 1: {
 +                uint8_t *samples = (uint8_t *)s->frame.data[0];
 +                for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++)
 +                    *samples++ = *p + 0x80;
 +                break;
 +            }
 +            case 2: {
 +                uint16_t *samples = (int16_t *)s->frame.data[0];
 +                for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++)
 +                    *samples++ = *p;
 +                break;
 +            }
 +            case 3: {
 +                // shift samples for 24-bit sample format
 +                int32_t *samples = (int32_t *)s->frame.data[0];
 +                for (p = s->decode_buffer; p < s->decode_buffer + (framelen * s->channels); p++)
 +                    *samples++ <<= 8;
 +                // reset decode buffer
 +                s->decode_buffer = NULL;
 +                break;
 +            }
 +        }
  
      *got_frame_ptr   = 1;
      *(AVFrame *)data = s->frame;

diff --cc libavcodec/x86/fdct_mmx.c
Simple merge

diff --cc libavcodec/x86/fft.c
Simple merge

diff --cc libavcodec/x86/fft_3dn2.c
Simple merge

diff --cc libavcodec/x86/fft_sse.c
Simple merge

diff --cc libavcodec/x86/idct_mmx_xvid.c
Simple merge

diff --cc libavfilter/x86/yadif_template.c
Simple merge

diff --cc libavformat/apetag.h
Simple merge

diff --cc libavformat/mxfdec.c
Simple merge

diff --cc libavformat/wv.c
index 537fdec583e5b3374c32b1be9962f83dddc7a262,49ca486a9328bddbebe9c8f7726d05dc60eb8dea..767f4f48ef52becab204f45776042c66187167c4
--- 1/libavformat/wv.c
--- 2/libavformat/wv.c
+++ b/libavformat/wv.c
@@@ -251,8 -251,9 +251,9 @@@ static int wv_read_packet(AVFormatConte
      int ret;
      int size, ver, off;
      int64_t pos;
+     uint32_t block_samples;
  
 -    if (s->pb->eof_reached)
 +    if (url_feof(s->pb))
          return AVERROR(EIO);
      if(wc->block_parsed){
          if(wv_read_block_header(s, s->pb, 0) < 0)

diff --cc libavutil/Makefile
index b918da7ed8eeaf52149ddc43c5281c2dede76951,221d9ce9bd2e9389450a13faf5a2ee101b52a1ea..6d78bd552837e3510aaf1431da84b3ec2cf58aa9
--- 1/libavutil/Makefile
--- 2/libavutil/Makefile
+++ b/libavutil/Makefile
@@@ -81,14 -76,11 +81,14 @@@ OBJS-$(ARCH_ARM) += arm/cpu.
  OBJS-$(ARCH_PPC) += ppc/cpu.o
  OBJS-$(ARCH_X86) += x86/cpu.o
  
 -TESTPROGS = adler32 aes avstring base64 cpu crc des eval fifo lfg lls \
 -            md5 opt parseutils rational sha tree
 +
 +TESTPROGS = adler32 aes avstring base64 cpu crc des eval file fifo lfg lls \
 +            md5 opt pca parseutils rational sha tree
  TESTPROGS-$(HAVE_LZO1X_999_COMPRESS) += lzo
  
- DIRS = arm bfin sh4 x86
 +TOOLS = ffeval
 +
+ DIRS = arm avr32 bfin mips ppc sh4 tomi x86
  
  ARCH_HEADERS = bswap.h intmath.h intreadwrite.h timer.h
  

diff --cc libswscale/ppc/yuv2rgb_altivec.h
Simple merge

diff --cc tests/fate/audio.mak
index bad874b62369609ad18474a434877cf3f90faad9,32bf75774bf93f711d71589d9adac9113fa500e2..f694cb9bc34f99862d010d8ec6f1c8029eb80450
--- 1/tests/fate/audio.mak
--- 2/tests/fate/audio.mak
+++ b/tests/fate/audio.mak
@@@ -28,8 -28,5 +28,8 @@@ fate-nellymoser: CMD = pcm -i $(SAMPLES
  fate-nellymoser: CMP = oneoff
  fate-nellymoser: REF = $(SAMPLES)/nellymoser/nellymoser.pcm
  
 -FATE_TESTS += fate-ws_snd
 +FATE_AUDIO += fate-ws_snd
  fate-ws_snd: CMD = md5 -i $(SAMPLES)/vqa/ws_snd.vqa -f s16le
- fate-audio: $(FATE_AUDIO)
 +
 +FATE_TESTS += $(FATE_AUDIO)
++fate-audio: $(FATE_AUDIO)

diff --cc tests/fate/prores.mak
index 1890dac6e78bbd827d0fafe137bf01061ddf294d,63682bca983576bc711706a7c028fbea04cf702d..d211d3f4ae9bf9be1862d0dbf5b247e712f56631
--- 1/tests/fate/prores.mak
--- 2/tests/fate/prores.mak
+++ b/tests/fate/prores.mak
@@@ -7,9 -7,8 +7,8 @@@ FATE_PRORES = fate-prores-42
  FATE_TESTS += $(FATE_PRORES)
  fate-prores: $(FATE_PRORES)
  
 -fate-prores-422:       CMD = framecrc -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le
 -fate-prores-422_hq:    CMD = framecrc -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov -pix_fmt yuv422p10le
 -fate-prores-422_lt:    CMD = framecrc -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le
 -fate-prores-422_proxy: CMD = framecrc -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le
 -fate-prores-alpha:     CMD = framecrc -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuv444p10le
 +fate-prores-422:       CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov -pix_fmt yuv422p10le
 +fate-prores-422_hq:    CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov -pix_fmt yuv422p10le
 +fate-prores-422_lt:    CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov -pix_fmt yuv422p10le
 +fate-prores-422_proxy: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov -pix_fmt yuv422p10le
 +fate-prores-alpha:     CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuv444p10le
- 

diff --cc tests/fate/screen.mak
index 28fb9a93b8cec73641d7adbc16fedb3c0008be7c,e6762ab6f9d56c5cba3885840c02dd5e395ce09a..1cc519dff84f0d24ac10aa5fb0775603ea91eaad
--- 1/tests/fate/screen.mak
--- 2/tests/fate/screen.mak
+++ b/tests/fate/screen.mak
@@@ -1,7 -1,8 +1,8 @@@
 -FATE_TESTS += fate-cscd
+ # FIXME dropped frames in this test because of coarse timebase
 +FATE_SCREEN += fate-cscd
  fate-cscd: CMD = framecrc -i $(SAMPLES)/CSCD/sample_video.avi -an -pix_fmt rgb24
  
 -FATE_TESTS += fate-dxtory
 +FATE_SCREEN += fate-dxtory
  fate-dxtory: CMD = framecrc -i $(SAMPLES)/dxtory/dxtory_mic.avi
  
  FATE_FRAPS += fate-fraps-v0