History

Merge commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3'

* commit 'ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3': fate: Use wmv2 IDCT for wmv2 tests vorbisdsp: change block_size type from int to intptr_t. Conflicts: tests/fate-run.sh tests/fate/vcodec.mak

Michael Niedermayer committed 13 years ago

Commit cf4515e2 parents 6ea8a83 ce378f09 files · +23 −11Browse files

Unified · Split

9 files
  1. libavcodec/arm/vorbisdsp_init_arm.c +2 −1
  2. libavcodec/ppc/vorbisdsp_altivec.c +1 −1
  3. libavcodec/vorbis.h +1 −1
  4. libavcodec/vorbisdec.c +1 −1
  5. libavcodec/vorbisdsp.h +4 −1
  6. libavcodec/wmv2enc.c +4 −0
  7. libavcodec/x86/vorbisdsp_init.c +4 −2
  8. tests/fate-run.sh +2 −1
  9. tests/fate/vcodec.mak +4 −3
libavcodec/arm/vorbisdsp_init_arm.c+2−1
@@ -24,7 +24,8 @@ · 23 unmodified lines
24#include "libavutil/arm/cpu.h"24#include "libavutil/arm/cpu.h"
25#include "libavcodec/vorbisdsp.h"25#include "libavcodec/vorbisdsp.h"
26 26
27void ff_vorbis_inverse_coupling_neon(float *mag, float *ang, int blocksize);27void ff_vorbis_inverse_coupling_neon(float *mag, float *ang,
28 intptr_t blocksize);
28 29
29void ff_vorbisdsp_init_arm(VorbisDSPContext *c)30void ff_vorbisdsp_init_arm(VorbisDSPContext *c)
30{31{
libavcodec/ppc/vorbisdsp_altivec.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
27 27
28#if HAVE_ALTIVEC28#if HAVE_ALTIVEC
29static void vorbis_inverse_coupling_altivec(float *mag, float *ang,29static void vorbis_inverse_coupling_altivec(float *mag, float *ang,
30 int blocksize)30 intptr_t blocksize)
31{31{
32 int i;32 int i;
33 vector float m, a;33 vector float m, a;
libavcodec/vorbis.h+1−1
@@ -43,7 +43,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num); · 42 unmodified lines
43void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values,43void ff_vorbis_floor1_render_list(vorbis_floor1_entry * list, int values,
44 uint16_t *y_list, int *flag,44 uint16_t *y_list, int *flag,
45 int multiplier, float * out, int samples);45 int multiplier, float * out, int samples);
46void ff_vorbis_inverse_coupling(float *mag, float *ang, int blocksize);46void ff_vorbis_inverse_coupling(float *mag, float *ang, intptr_t blocksize);
47 47
48#define ilog(i) av_log2(2*(i))48#define ilog(i) av_log2(2*(i))
49 49
libavcodec/vorbisdec.c+1−1
@@ -1460,7 +1460,7 @@ static inline int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, · 1459 unmodified lines
1460 }1460 }
1461}1461}
1462 1462
1463void ff_vorbis_inverse_coupling(float *mag, float *ang, int blocksize)1463void ff_vorbis_inverse_coupling(float *mag, float *ang, intptr_t blocksize)
1464{1464{
1465 int i;1465 int i;
1466 for (i = 0; i < blocksize; i++) {1466 for (i = 0; i < blocksize; i++) {
libavcodec/vorbisdsp.h+4−1
@@ -19,9 +19,12 @@ · 18 unmodified lines
19#ifndef AVCODEC_VORBISDSP_H19#ifndef AVCODEC_VORBISDSP_H
20#define AVCODEC_VORBISDSP_H20#define AVCODEC_VORBISDSP_H
21 21
22#include <stdint.h>
23
22typedef struct VorbisDSPContext {24typedef struct VorbisDSPContext {
23 /* assume len is a multiple of 4, and arrays are 16-byte aligned */25 /* assume len is a multiple of 4, and arrays are 16-byte aligned */
24 void (*vorbis_inverse_coupling)(float *mag, float *ang, int blocksize);26 void (*vorbis_inverse_coupling)(float *mag, float *ang,
27 intptr_t blocksize);
25} VorbisDSPContext;28} VorbisDSPContext;
26 29
27void ff_vorbisdsp_init(VorbisDSPContext *dsp);30void ff_vorbisdsp_init(VorbisDSPContext *dsp);
libavcodec/wmv2enc.c+4−0
@@ -55,6 +55,10 @@ static int encode_ext_header(Wmv2Context *w){ · 54 unmodified lines
55static av_cold int wmv2_encode_init(AVCodecContext *avctx){55static av_cold int wmv2_encode_init(AVCodecContext *avctx){
56 Wmv2Context * const w= avctx->priv_data;56 Wmv2Context * const w= avctx->priv_data;
57 57
58 if(avctx->idct_algo==FF_IDCT_AUTO){
59 avctx->idct_algo=FF_IDCT_WMV2;
60 }
61
58 if(ff_MPV_encode_init(avctx) < 0)62 if(ff_MPV_encode_init(avctx) < 0)
59 return -1;63 return -1;
60 64
libavcodec/x86/vorbisdsp_init.c+4−2
@@ -25,7 +25,8 @@ · 24 unmodified lines
25 25
26#if HAVE_INLINE_ASM26#if HAVE_INLINE_ASM
27#if ARCH_X86_3227#if ARCH_X86_32
28static void vorbis_inverse_coupling_3dnow(float *mag, float *ang, int blocksize)28static void vorbis_inverse_coupling_3dnow(float *mag, float *ang,
29 intptr_t blocksize)
29{30{
30 int i;31 int i;
31 __asm__ volatile ("pxor %%mm7, %%mm7":);32 __asm__ volatile ("pxor %%mm7, %%mm7":);
@@ -54,7 +55,8 @@ static void vorbis_inverse_coupling_3dnow(float *mag, float *ang, int blocksize) · 22 unmodified lines
54}55}
55#endif56#endif
56 57
57static void vorbis_inverse_coupling_sse(float *mag, float *ang, int blocksize)58static void vorbis_inverse_coupling_sse(float *mag, float *ang,
59 intptr_t blocksize)
58{60{
59 int i;61 int i;
60 62
tests/fate-run.sh+2−1
@@ -128,6 +128,7 @@ enc_dec(){ · 127 unmodified lines
128 enc_opt=$4128 enc_opt=$4
129 dec_fmt=$5129 dec_fmt=$5
130 dec_opt=$6130 dec_opt=$6
131 ddc_opt=$8
131 encfile="${outdir}/${test}.${enc_fmt}"132 encfile="${outdir}/${test}.${enc_fmt}"
132 decfile="${outdir}/${test}.out.${dec_fmt}"133 decfile="${outdir}/${test}.out.${dec_fmt}"
133 cleanfiles="$cleanfiles $decfile"134 cleanfiles="$cleanfiles $decfile"
@@ -139,7 +140,7 @@ enc_dec(){ · 5 unmodified lines
139 -f $enc_fmt -y $tencfile || return140 -f $enc_fmt -y $tencfile || return
140 do_md5sum $encfile141 do_md5sum $encfile
141 echo $(wc -c $encfile)142 echo $(wc -c $encfile)
142 ffmpeg $8 $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \143 ffmpeg $DEC_OPTS $ddc_opt -i $tencfile $ENC_OPTS $dec_opt $FLAGS \
143 -f $dec_fmt -y $tdecfile || return144 -f $dec_fmt -y $tdecfile || return
144 do_md5sum $decfile145 do_md5sum $decfile
145 tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift146 tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift
tests/fate/vcodec.mak+4−3
@@ -2,7 +2,7 @@ fate-vsynth1-%: SRC = tests/data/vsynth1.yuv · 1 unmodified line
2fate-vsynth2-%: SRC = tests/data/vsynth2.yuv2fate-vsynth2-%: SRC = tests/data/vsynth2.yuv
3fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@)))3fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@)))
4fate-vsynth%: FMT = avi4fate-vsynth%: FMT = avi
5fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)"5fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DDCOPTS)"
6fate-vsynth%: CMP_UNIT = 16fate-vsynth%: CMP_UNIT = 1
7fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)7fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)
8 8
@@ -91,7 +91,7 @@ fate-vsynth%-jpegls: DECOPTS = -sws_flags area · 82 unmodified lines
91 91
92FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += j2k92FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += j2k
93fate-vsynth%-j2k: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb2493fate-vsynth%-j2k: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24
94fate-vsynth%-j2k: DECINOPTS = -vcodec j2k -strict experimental94fate-vsynth%-j2k: DDCOPTS = -vcodec j2k -strict experimental
95 95
96FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg96FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg
97fate-vsynth%-ljpeg: ENCOPTS = -strict -197fate-vsynth%-ljpeg: ENCOPTS = -strict -1
@@ -268,7 +268,8 @@ FATE_VCODEC-$(call ENCDEC, WMV1, AVI) += wmv1 · 170 unmodified lines
268fate-vsynth%-wmv1: ENCOPTS = -qscale 10268fate-vsynth%-wmv1: ENCOPTS = -qscale 10
269 269
270FATE_VCODEC-$(call ENCDEC, WMV2, AVI) += wmv2270FATE_VCODEC-$(call ENCDEC, WMV2, AVI) += wmv2
271fate-vsynth%-wmv2: ENCOPTS = -qscale 10271fate-vsynth%-wmv2: DDCOPTS = -idct auto
272fate-vsynth%-wmv2: ENCOPTS = -qscale 10 -idct auto
272 273
273FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += yuv274FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += yuv
274fate-vsynth%-yuv: CODEC = rawvideo275fate-vsynth%-yuv: CODEC = rawvideo

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t