virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

fate: merge mapchan and options into ffmpeg.

Browse Source 
They were two very short files that cover ffmpeg-specific features.
This commit is contained in:
Nicolas George 2013-01-01 18:20:55 +01:00
parent 102cf964dd
commit 98ce9b8468
5 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/Makefile
View File

@ -81,6 +81,7 @@ include $(SRC_PATH)/tests/fate/demux.mak
include $(SRC_PATH)/tests/fate/dfa.mak include $(SRC_PATH)/tests/fate/dfa.mak
include $(SRC_PATH)/tests/fate/dpcm.mak include $(SRC_PATH)/tests/fate/dpcm.mak
include $(SRC_PATH)/tests/fate/ea.mak include $(SRC_PATH)/tests/fate/ea.mak
include $(SRC_PATH)/tests/fate/ffmpeg.mak
include $(SRC_PATH)/tests/fate/ffprobe.mak include $(SRC_PATH)/tests/fate/ffprobe.mak
include $(SRC_PATH)/tests/fate/filter.mak include $(SRC_PATH)/tests/fate/filter.mak
include $(SRC_PATH)/tests/fate/flac.mak include $(SRC_PATH)/tests/fate/flac.mak
@ -91,13 +92,11 @@ include $(SRC_PATH)/tests/fate/indeo.mak
include $(SRC_PATH)/tests/fate/libavcodec.mak include $(SRC_PATH)/tests/fate/libavcodec.mak
include $(SRC_PATH)/tests/fate/libavformat.mak include $(SRC_PATH)/tests/fate/libavformat.mak
include $(SRC_PATH)/tests/fate/libavutil.mak include $(SRC_PATH)/tests/fate/libavutil.mak
include $(SRC_PATH)/tests/fate/mapchan.mak
include $(SRC_PATH)/tests/fate/lossless-audio.mak include $(SRC_PATH)/tests/fate/lossless-audio.mak
include $(SRC_PATH)/tests/fate/lossless-video.mak include $(SRC_PATH)/tests/fate/lossless-video.mak
include $(SRC_PATH)/tests/fate/microsoft.mak include $(SRC_PATH)/tests/fate/microsoft.mak
include $(SRC_PATH)/tests/fate/mp3.mak include $(SRC_PATH)/tests/fate/mp3.mak
include $(SRC_PATH)/tests/fate/mpc.mak include $(SRC_PATH)/tests/fate/mpc.mak
include $(SRC_PATH)/tests/fate/options.mak
include $(SRC_PATH)/tests/fate/pcm.mak include $(SRC_PATH)/tests/fate/pcm.mak
include $(SRC_PATH)/tests/fate/probe.mak include $(SRC_PATH)/tests/fate/probe.mak
include $(SRC_PATH)/tests/fate/prores.mak include $(SRC_PATH)/tests/fate/prores.mak

7
tests/fate/mapchan.mak → tests/fate/ffmpeg.mak
View File

@ -12,3 +12,10 @@ fate-mapchan-silent-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-1.
FATE_FFMPEG += $(FATE_MAPCHAN) FATE_FFMPEG += $(FATE_MAPCHAN)
fate-mapchan: $(FATE_MAPCHAN) fate-mapchan: $(FATE_MAPCHAN)
FATE_FFMPEG += fate-force_key_frames
fate-force_key_frames: tests/data/vsynth2.yuv
fate-force_key_frames: CMD = enc_dec \
"rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth2.yuv \
avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \
framecrc "" "" "-skip_frame nokey"

9
tests/fate/options.mak
View File

@ -1,9 +0,0 @@
FATE_OPTIONS += fate-options-force_key_frames
fate-options-force_key_frames: tests/data/vsynth2.yuv
fate-options-force_key_frames: CMD = enc_dec \
"rawvideo -s 352x288 -pix_fmt yuv420p" tests/data/vsynth2.yuv \
avi "-c mpeg4 -g 240 -qscale 10 -force_key_frames 0.5,0:00:01.5" \
framecrc "" "" "-skip_frame nokey"
FATE_FFMPEG += $(FATE_OPTIONS)
fate-options: $(FATE_OPTIONS)

4
tests/ref/fate/force_key_frames Normal file
View File

@ -0,0 +1,4 @@
5423335cd809e631a2e03f97585348e0 *tests/data/fate/force_key_frames.avi
113308 tests/data/fate/force_key_frames.avi
8f68ad2e602ecd87a3e0c097ba99d773 *tests/data/fate/force_key_frames.out.framecrc
stddev:34363.01 PSNR: 5.61 MAXDIFF:56305 bytes: 7603200/ 186

4
tests/ref/fate/options-force_key_frames
View File

@ -1,4 +0,0 @@
5423335cd809e631a2e03f97585348e0 *tests/data/fate/options-force_key_frames.avi
113308 tests/data/fate/options-force_key_frames.avi
8f68ad2e602ecd87a3e0c097ba99d773 *tests/data/fate/options-force_key_frames.out.framecrc
stddev:34363.01 PSNR: 5.61 MAXDIFF:56305 bytes: 7603200/ 186