Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
98ce9b84
Commit
98ce9b84
authored
Jan 01, 2013
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fate: merge mapchan and options into ffmpeg.
They were two very short files that cover ffmpeg-specific features.
parent
102cf964
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
15 deletions
+12
-15
Makefile
tests/Makefile
+1
-2
ffmpeg.mak
tests/fate/ffmpeg.mak
+7
-0
options.mak
tests/fate/options.mak
+0
-9
force_key_frames
tests/ref/fate/force_key_frames
+4
-0
options-force_key_frames
tests/ref/fate/options-force_key_frames
+0
-4
No files found.
tests/Makefile
View file @
98ce9b84
...
@@ -81,6 +81,7 @@ include $(SRC_PATH)/tests/fate/demux.mak
...
@@ -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
...
@@ -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
...
...
tests/fate/
mapchan
.mak
→
tests/fate/
ffmpeg
.mak
View file @
98ce9b84
...
@@ -12,3 +12,10 @@ fate-mapchan-silent-mono: CMD = md5 -i $(TARGET_PATH)/tests/data/asynth-22050-1.
...
@@ -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"
tests/fate/options.mak
deleted
100644 → 0
View file @
102cf964
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)
tests/ref/fate/force_key_frames
0 → 100644
View file @
98ce9b84
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
tests/ref/fate/options-force_key_frames
deleted
100644 → 0
View file @
102cf964
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment