Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
9146e872
Commit
9146e872
authored
Jan 21, 2013
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "fate: Use wmv2 IDCT for wmv2 tests"
This reverts commit
ce378f0d
.
parent
4af5310d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
9 deletions
+3
-9
wmv2enc.c
libavcodec/wmv2enc.c
+0
-4
fate-run.sh
tests/fate-run.sh
+1
-2
vcodec.mak
tests/fate/vcodec.mak
+2
-3
No files found.
libavcodec/wmv2enc.c
View file @
9146e872
...
...
@@ -55,10 +55,6 @@ static int encode_ext_header(Wmv2Context *w){
static
av_cold
int
wmv2_encode_init
(
AVCodecContext
*
avctx
){
Wmv2Context
*
const
w
=
avctx
->
priv_data
;
if
(
avctx
->
idct_algo
==
FF_IDCT_AUTO
){
avctx
->
idct_algo
=
FF_IDCT_WMV2
;
}
if
(
ff_MPV_encode_init
(
avctx
)
<
0
)
return
-
1
;
...
...
tests/fate-run.sh
View file @
9146e872
...
...
@@ -128,7 +128,6 @@ enc_dec(){
enc_opt
=
$4
dec_fmt
=
$5
dec_opt
=
$6
ddc_opt
=
$8
encfile
=
"
${
outdir
}
/
${
test
}
.
${
enc_fmt
}
"
decfile
=
"
${
outdir
}
/
${
test
}
.out.
${
dec_fmt
}
"
cleanfiles
=
"
$cleanfiles
$decfile
"
...
...
@@ -140,7 +139,7 @@ enc_dec(){
-f
$enc_fmt
-y
$tencfile
||
return
do_md5sum
$encfile
echo
$(
wc
-c
$encfile
)
avconv
$DEC_OPTS
$ddc_opt
-i
$tencfile
$ENC_OPTS
$dec_opt
$FLAGS
\
avconv
$DEC_OPTS
-i
$tencfile
$ENC_OPTS
$dec_opt
$FLAGS
\
-f
$dec_fmt
-y
$tdecfile
||
return
do_md5sum
$decfile
tests/tiny_psnr
$srcfile
$decfile
$cmp_unit
$cmp_shift
...
...
tests/fate/vcodec.mak
View file @
9146e872
...
...
@@ -2,7 +2,7 @@ fate-vsynth1-%: SRC = tests/data/vsynth1.yuv
fate-vsynth2-%: SRC = tests/data/vsynth2.yuv
fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@)))
fate-vsynth%: FMT = avi
fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p $(DECOPTS)" -keep
"$(DDCOPTS)"
fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p $(DECOPTS)" -keep
fate-vsynth%: CMP_UNIT = 1
fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)
...
...
@@ -218,8 +218,7 @@ FATE_VCODEC-$(call ENCDEC, WMV1, AVI) += wmv1
fate-vsynth%-wmv1: ENCOPTS = -qscale 10
FATE_VCODEC-$(call ENCDEC, WMV2, AVI) += wmv2
fate-vsynth%-wmv2: DDCOPTS = -idct auto
fate-vsynth%-wmv2: ENCOPTS = -qscale 10 -idct auto
fate-vsynth%-wmv2: ENCOPTS = -qscale 10
FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += yuv
fate-vsynth%-yuv: CODEC = rawvideo
...
...
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