Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Jun 2011 02:49:04 +0000 (04:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 23 Jun 2011 02:49:04 +0000 (04:49 +0200)
* qatar/master:
  configure: add --optflags option
  build: move documentation rules to doc/Makefile
  build: move test rules to tests/Makefile
  ac3enc: remove unneeded local variable in asym_quant()
  ac3enc: remove a branch in asym_quant() by doing 2 shifts
  ac3enc: avoid masking output in asym_quant() by using signed values for quantized mantissas.
  H.264: fix 4:4:4 + deblocking + 8x8dct + cavlc + MBAFF
  H.264: fix 4:4:4 + deblocking + MBAFF
  H.264: fix 4:4:4 cropping warning
  H.264: reference the correct SPS in decode_scaling_matrices
  H.264: fix bug in lossless 4:4:4 decoding

Conflicts:
Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
Makefile
configure
libavcodec/ac3enc.c
libavcodec/ac3enc.h
libavcodec/h264.c
libavcodec/h264_loopfilter.c
libavcodec/h264_ps.c

diff --cc Makefile
+++ b/Makefile
@@@ -15,11 -15,7 +15,8 @@@ PROGS-$(CONFIG_FFPROBE)  += ffprob
  PROGS-$(CONFIG_FFSERVER) += ffserver
  
  PROGS      := $(PROGS-yes:%=%$(EXESUF))
 +PROGS_G     = $(PROGS-yes:%=%_g$(EXESUF))
  OBJS        = $(PROGS-yes:%=%.o) cmdutils.o
- MANPAGES    = $(PROGS-yes:%=doc/%.1)
- PODPAGES    = $(PROGS-yes:%=doc/%.pod)
- HTMLPAGES   = $(PROGS-yes:%=doc/%.html)
  TOOLS       = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws graph2dot lavfi-showfiltfmts pktdumper probetest qt-faststart trasher))
  TESTTOOLS   = audiogen videogen rotozoom tiny_psnr base64
  HOSTPROGS  := $(TESTTOOLS:%=tests/%)
@@@ -50,14 -45,8 +47,12 @@@ FF_LDFLAGS   := $(FFLDFLAGS
  FF_EXTRALIBS := $(FFEXTRALIBS)
  FF_DEP_LIBS  := $(DEP_LIBS)
  
- all-$(CONFIG_DOC): documentation
  all: $(FF_DEP_LIBS) $(PROGS)
  
 +$(PROGS): %$(EXESUF): %_g$(EXESUF)
 +      $(CP) $< $@
 +      $(STRIP) $@
 +
  config.h: .config
  .config: $(wildcard $(FFLIBS:%=$(SRC_DIR)/lib%/all*.c))
        @-tput bold 2>/dev/null
@@@ -166,19 -127,9 +133,9 @@@ uninstall-progs
  uninstall-data:
        $(RM) -r "$(DATADIR)"
  
- uninstall-man:
-       $(RM) $(addprefix "$(MANDIR)/man1/",$(ALLMANPAGES))
- testclean:
-       $(RM) -r tests/vsynth1 tests/vsynth2 tests/data
-       $(RM) $(addprefix tests/,$(CLEANSUFFIXES))
-       $(RM) tests/seek_test$(EXESUF) tests/seek_test.o
-       $(RM) $(TESTTOOLS:%=tests/%$(HOSTEXESUF))
- clean:: testclean
+ clean::
 -      $(RM) $(ALLPROGS)
 +      $(RM) $(ALLPROGS) $(ALLPROGS_G)
        $(RM) $(CLEANSUFFIXES)
-       $(RM) doc/*.html doc/*.pod doc/*.1
        $(RM) $(TOOLS)
        $(RM) $(CLEANSUFFIXES:%=tools/%)
  
@@@ -187,121 -138,12 +144,12 @@@ distclean:
        $(RM) config.* .version version.h libavutil/avconfig.h
  
  config:
 -      $(SRC_PATH)/configure $(value LIBAV_CONFIGURATION)
 +      $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
  
- # regression tests
 -check: test checkheaders
 +check: test
  
- fulltest test: codectest lavftest lavfitest seektest
- FFSERVER_REFFILE = $(SRC_PATH)/tests/ffserver.regression.ref
- codectest: fate-codec
- lavftest:  fate-lavf
- lavfitest: fate-lavfi
- seektest:  fate-seek
- AREF = fate-acodec-aref
- VREF = fate-vsynth1-vref fate-vsynth2-vref
- REFS = $(AREF) $(VREF)
- $(VREF): ffmpeg$(EXESUF) tests/vsynth1/00.pgm tests/vsynth2/00.pgm
- $(AREF): ffmpeg$(EXESUF) tests/data/asynth1.sw
- ffservertest: ffserver$(EXESUF) tests/vsynth1/00.pgm tests/data/asynth1.sw
-       @echo
-       @echo "Unfortunately ffserver is broken and therefore its regression"
-       @echo "test fails randomly. Treat the results accordingly."
-       @echo
-       $(SRC_PATH)/tests/ffserver-regression.sh $(FFSERVER_REFFILE) $(SRC_PATH)/tests/ffserver.conf
- tests/vsynth1/00.pgm: tests/videogen$(HOSTEXESUF)
-       @mkdir -p tests/vsynth1
-       $(M)./$< 'tests/vsynth1/'
- tests/vsynth2/00.pgm: tests/rotozoom$(HOSTEXESUF)
-       @mkdir -p tests/vsynth2
-       $(M)./$< 'tests/vsynth2/' $(SRC_PATH)/tests/lena.pnm
- tests/data/asynth1.sw: tests/audiogen$(HOSTEXESUF)
-       @mkdir -p tests/data
-       $(M)./$< $@
- tests/data/asynth1.sw tests/vsynth%/00.pgm: TAG = GEN
- tests/seek_test$(EXESUF): tests/seek_test.o $(FF_DEP_LIBS)
-       $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
- tools/lavfi-showfiltfmts$(EXESUF): tools/lavfi-showfiltfmts.o $(FF_DEP_LIBS)
-       $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS)
- include $(SRC_PATH_BARE)/tests/fate.mak
- include $(SRC_PATH_BARE)/tests/fate2.mak
- include $(SRC_PATH_BARE)/tests/fate/aac.mak
- include $(SRC_PATH_BARE)/tests/fate/als.mak
- include $(SRC_PATH_BARE)/tests/fate/fft.mak
- include $(SRC_PATH_BARE)/tests/fate/h264.mak
- include $(SRC_PATH_BARE)/tests/fate/mp3.mak
- include $(SRC_PATH_BARE)/tests/fate/vorbis.mak
- include $(SRC_PATH_BARE)/tests/fate/vp8.mak
- FATE_ACODEC  = $(ACODEC_TESTS:%=fate-acodec-%)
- FATE_VSYNTH1 = $(VCODEC_TESTS:%=fate-vsynth1-%)
- FATE_VSYNTH2 = $(VCODEC_TESTS:%=fate-vsynth2-%)
- FATE_VCODEC  = $(FATE_VSYNTH1) $(FATE_VSYNTH2)
- FATE_LAVF    = $(LAVF_TESTS:%=fate-lavf-%)
- FATE_LAVFI   = $(LAVFI_TESTS:%=fate-lavfi-%)
- FATE_SEEK    = $(SEEK_TESTS:seek_%=fate-seek-%)
- FATE = $(FATE_ACODEC)                                                   \
-        $(FATE_VCODEC)                                                   \
-        $(FATE_LAVF)                                                     \
-        $(FATE_LAVFI)                                                    \
-        $(FATE_SEEK)                                                     \
- $(filter-out %-aref,$(FATE_ACODEC)): $(AREF)
- $(filter-out %-vref,$(FATE_VCODEC)): $(VREF)
- $(FATE_LAVF):   $(REFS)
- $(FATE_LAVFI):  $(REFS) tools/lavfi-showfiltfmts$(EXESUF)
- $(FATE_SEEK):   fate-codec fate-lavf tests/seek_test$(EXESUF)
- $(FATE_ACODEC):  CMD = codectest acodec
- $(FATE_VSYNTH1): CMD = codectest vsynth1
- $(FATE_VSYNTH2): CMD = codectest vsynth2
- $(FATE_LAVF):    CMD = lavftest
- $(FATE_LAVFI):   CMD = lavfitest
- $(FATE_SEEK):    CMD = seektest
- fate-codec:  fate-acodec fate-vcodec
- fate-acodec: $(FATE_ACODEC)
- fate-vcodec: $(FATE_VCODEC)
- fate-lavf:   $(FATE_LAVF)
- fate-lavfi:  $(FATE_LAVFI)
- fate-seek:   $(FATE_SEEK)
- ifdef SAMPLES
- FATE += $(FATE_TESTS)
- fate-rsync:
-       rsync -vaLW rsync://fate-suite.libav.org/fate-suite/ $(SAMPLES)
- else
- fate-rsync:
-       @echo "use 'make fate-rsync SAMPLES=/path/to/samples' to sync the fate suite"
- $(FATE_TESTS):
-       @echo "SAMPLES not specified, cannot run FATE. See doc/fate.txt for more information."
- endif
- FATE_UTILS = base64 tiny_psnr
- fate: $(FATE)
- $(FATE): ffmpeg$(EXESUF) $(FATE_UTILS:%=tests/%$(HOSTEXESUF))
-       @echo "TEST    $(@:fate-%=%)"
-       $(Q)$(SRC_PATH)/tests/fate-run.sh $@ "$(SAMPLES)" "$(TARGET_EXEC)" "$(TARGET_PATH)" '$(CMD)' '$(CMP)' '$(REF)' '$(FUZZ)' '$(THREADS)' '$(THREAD_TYPE)'
- fate-list:
-       @printf '%s\n' $(sort $(FATE))
+ include doc/Makefile
+ include tests/Makefile
  
- .PHONY: all alltools *clean check config documentation examples install*
- .PHONY: *test testprogs uninstall*
+ .PHONY: all alltools *clean check config examples install*
+ .PHONY: testprogs uninstall*
diff --cc configure
+++ b/configure
@@@ -238,8 -237,9 +238,9 @@@ Advanced options (experts only)
    --malloc-prefix=PFX      prefix malloc and related names with PFX
    --enable-sram            allow use of on-chip SRAM
    --disable-symver         disable symbol versioning
+   --optflags               override optimization-related compiler flags
  
 -Developer options (useful when working on Libav itself):
 +Developer options (useful when working on FFmpeg itself):
    --disable-debug          disable debugging symbols
    --enable-debug=LEVEL     set the debug level [$debuglevel]
    --disable-optimizations  disable compiler optimizations
@@@ -1187,9 -1182,9 +1188,10 @@@ CMDLINE_SET=
      logfile
      malloc_prefix
      nm
+     optflags
      pkg_config
      samples
 +    strip
      sysinclude
      sysroot
      target_exec
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge