virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '8e673efc6f5b7a095557664660305148f2788d30'

Browse Source 
* commit '8e673efc6f5b7a095557664660305148f2788d30':
  prores: update FATE test to account for alpha plane present in the test sample
  configure: Add basic valgrind-massif support

Conflicts:
	tests/fate/prores.mak
	tests/ref/fate/prores-alpha

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-19 10:53:39 +02:00
commit fa6001e728
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -2515,6 +2515,10 @@ case "$toolchain" in
add_cflags -fsanitize=thread -pie add_cflags -fsanitize=thread -pie
add_ldflags -fsanitize=thread -pie add_ldflags -fsanitize=thread -pie
;; ;;
valgrind-massif)
target_exec_default="valgrind"
target_exec_args="--alloc-fn=av_malloc --alloc-fn=av_mallocz"
;;
valgrind-memcheck) valgrind-memcheck)
target_exec_default=${valgrind:-"valgrind"} target_exec_default=${valgrind:-"valgrind"}
target_exec_args="--error-exitcode=1 --malloc-fill=0x2a --track-origins=yes --leak-check=full --gen-suppressions=all --suppressions=$source_path/tests/fate-valgrind.supp" target_exec_args="--error-exitcode=1 --malloc-fill=0x2a --track-origins=yes --leak-check=full --gen-suppressions=all --suppressions=$source_path/tests/fate-valgrind.supp"

7
doc/developer.texi
View File

@ -608,9 +608,10 @@ new test.
The configure script provides a shortcut for using valgrind to spot bugs The configure script provides a shortcut for using valgrind to spot bugs
related to memory handling. Just add the option related to memory handling. Just add the option
@code{--toolchain=valgrind-memcheck} to your configure line, and @code{--toolchain=valgrind-memcheck} or @code{--toolchain=valgrind-massif}
reasonable defaults will be set for running FATE under the supervision to your configure line, and reasonable defaults will be set for running
of the @strong{memcheck} tool of the valgrind suite. FATE under the supervision of either the @strong{memcheck} or the
@strong{massif} tool of the valgrind suite.
In case you need finer control over how valgrind is invoked, use the In case you need finer control over how valgrind is invoked, use the
@code{--target-exec='valgrind <your_custom_valgrind_options>} option in @code{--target-exec='valgrind <your_custom_valgrind_options>} option in

2
tests/fate/prores.mak
View File

@ -11,4 +11,4 @@ fate-prores-422: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequ
fate-prores-422_hq: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.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_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-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 fate-prores-alpha: CMD = framecrc -flags +bitexact -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov -pix_fmt yuva444p10le

4
tests/ref/fate/prores-alpha
View File

@ -1,3 +1,3 @@
#tb 0: 100/2997 #tb 0: 100/2997
0, 0, 0, 1, 12441600, 0x254d8f95 0, 0, 0, 1, 16588800, 0x8dcdb600
0, 1, 1, 1, 12441600, 0x254d8f95 0, 1, 1, 1, 16588800, 0x8dcdb600