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
60fd7d36
Commit
60fd7d36
authored
Apr 09, 2014
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fate: correctly set sample rate for mp2 tests
parent
e6e8be54
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
acodec.mak
tests/fate/acodec.mak
+1
-1
lavf-regression.sh
tests/lavf-regression.sh
+7
-7
No files found.
tests/fate/acodec.mak
View file @
60fd7d36
fate-acodec-%: CODEC = $(@:fate-acodec-%=%)
fate-acodec-%: CODEC = $(@:fate-acodec-%=%)
fate-acodec-%: SRC = tests/data/asynth-44100-2.wav
fate-acodec-%: SRC = tests/data/asynth-44100-2.wav
fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -c $(CODEC)" wav "-c pcm_s16le" -keep
fate-acodec-%: CMD = enc_dec wav $(SRC) $(FMT) "-b 128k -
ar 44100 -
c $(CODEC)" wav "-c pcm_s16le" -keep
fate-acodec-%: CMP_UNIT = 2
fate-acodec-%: CMP_UNIT = 2
fate-acodec-%: REF = $(SRC_PATH)/tests/ref/acodec/$(@:fate-acodec-%=%)
fate-acodec-%: REF = $(SRC_PATH)/tests/ref/acodec/$(@:fate-acodec-%=%)
...
...
tests/lavf-regression.sh
View file @
60fd7d36
...
@@ -44,11 +44,11 @@ do_audio_only()
...
@@ -44,11 +44,11 @@ do_audio_only()
}
}
if
[
-n
"
$do_avi
"
]
;
then
if
[
-n
"
$do_avi
"
]
;
then
do_lavf avi
""
"-acodec mp2"
do_lavf avi
""
"-acodec mp2
-ar 44100
"
fi
fi
if
[
-n
"
$do_asf
"
]
;
then
if
[
-n
"
$do_asf
"
]
;
then
do_lavf asf
""
"-acodec mp2"
"-r 25"
do_lavf asf
""
"-acodec mp2
-ar 44100
"
"-r 25"
fi
fi
if
[
-n
"
$do_rm
"
]
;
then
if
[
-n
"
$do_rm
"
]
;
then
...
@@ -59,7 +59,7 @@ do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 441
...
@@ -59,7 +59,7 @@ do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $DEC_OPTS -ar 441
fi
fi
if
[
-n
"
$do_mpg
"
]
;
then
if
[
-n
"
$do_mpg
"
]
;
then
do_lavf mpg
do_lavf mpg
""
"-ar 44100"
fi
fi
if
[
-n
"
$do_mxf
"
]
;
then
if
[
-n
"
$do_mxf
"
]
;
then
...
@@ -71,7 +71,7 @@ do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -vco
...
@@ -71,7 +71,7 @@ do_lavf mxf_d10 "-ar 48000 -ac 2" "-r 25 -vf scale=720:576,pad=720:608:0:32 -vco
fi
fi
if
[
-n
"
$do_ts
"
]
;
then
if
[
-n
"
$do_ts
"
]
;
then
do_lavf ts
""
"-mpegts_transport_stream_id 42"
do_lavf ts
""
"-mpegts_transport_stream_id 42
-ar 44100
"
fi
fi
if
[
-n
"
$do_swf
"
]
;
then
if
[
-n
"
$do_swf
"
]
;
then
...
@@ -79,7 +79,7 @@ do_lavf swf "" "-an"
...
@@ -79,7 +79,7 @@ do_lavf swf "" "-an"
fi
fi
if
[
-n
"
$do_ffm
"
]
;
then
if
[
-n
"
$do_ffm
"
]
;
then
do_lavf ffm
do_lavf ffm
""
"-ar 44100"
fi
fi
if
[
-n
"
$do_flv_fmt
"
]
;
then
if
[
-n
"
$do_flv_fmt
"
]
;
then
...
@@ -99,11 +99,11 @@ do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1"
...
@@ -99,11 +99,11 @@ do_lavf gxf "-ar 48000" "-r 25 -s pal -ac 1"
fi
fi
if
[
-n
"
$do_nut
"
]
;
then
if
[
-n
"
$do_nut
"
]
;
then
do_lavf nut
""
"-acodec mp2"
do_lavf nut
""
"-acodec mp2
-ar 44100
"
fi
fi
if
[
-n
"
$do_mkv
"
]
;
then
if
[
-n
"
$do_mkv
"
]
;
then
do_lavf mkv
""
"-c:a mp2 -c:v mpeg4"
do_lavf mkv
""
"-c:a mp2 -c:v mpeg4
-ar 44100
"
fi
fi
...
...
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