Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

prores: use C idct for fate as the SSE code is not matching the SSE* code down at the bits

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/2/head
Michael Niedermayer 13 years ago
parent 530d8529d0
commit 337496980e
11 changed files with 25 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/proresdec.c
  2. 2
      libavcodec/proresdec_lgpl.c
  3. 4
      libavcodec/proresdsp.c
  4. 4
      libavcodec/proresdsp.h
  5. 5
      libavcodec/x86/proresdsp-init.c
  6. 10
      tests/fate/prores.mak
  7. 4
      tests/ref/fate/prores-422
  8. 4
      tests/ref/fate/prores-422_hq
  9. 4
      tests/ref/fate/prores-422_lt
  10. 4
      tests/ref/fate/prores-422_proxy
  11. 4
      tests/ref/fate/prores-alpha

2
libavcodec/proresdec.c
Unescape View File

@ -70,7 +70,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->bits_per_raw_sample = 10;
dsputil_init(&ctx->dsp, avctx);
ff_proresdsp_init(&ctx->prodsp);
ff_proresdsp_init(&ctx->prodsp, avctx);
avctx->coded_frame = &ctx->frame;
ctx->frame.type = FF_I_TYPE;

2
libavcodec/proresdec_lgpl.c
Unescape View File

@ -107,7 +107,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->pix_fmt = PIX_FMT_YUV422P10; // set default pixel format
avctx->bits_per_raw_sample = PRORES_BITS_PER_SAMPLE;
ff_proresdsp_init(&ctx->dsp);
ff_proresdsp_init(&ctx->dsp, avctx);
avctx->coded_frame = &ctx->picture;
avcodec_get_frame_defaults(&ctx->picture);

4
libavcodec/proresdsp.c
Unescape View File

@ -51,12 +51,12 @@ static void prores_idct_put_c(uint16_t *out, int linesize, DCTELEM *block, const
put_pixels(out, linesize >> 1, block);
}
void ff_proresdsp_init(ProresDSPContext *dsp)
void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx)
{
dsp->idct_put = prores_idct_put_c;
dsp->idct_permutation_type = FF_NO_IDCT_PERM;
if (HAVE_MMX) ff_proresdsp_x86_init(dsp);
if (HAVE_MMX) ff_proresdsp_x86_init(dsp, avctx);
ff_init_scantable_permutation(dsp->idct_permutation,
dsp->idct_permutation_type);

4
libavcodec/proresdsp.h
Unescape View File

@ -33,8 +33,8 @@ typedef struct {
void (* idct_put) (uint16_t *out, int linesize, DCTELEM *block, const int16_t *qmat);
} ProresDSPContext;
void ff_proresdsp_init(ProresDSPContext *dsp);
void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx);
void ff_proresdsp_x86_init(ProresDSPContext *dsp);
void ff_proresdsp_x86_init(ProresDSPContext *dsp, AVCodecContext *avctx);
#endif /* AVCODEC_PRORESDSP_H */

5
libavcodec/x86/proresdsp-init.c
Unescape View File

@ -29,11 +29,14 @@ void ff_prores_idct_put_10_sse4(uint16_t *dst, int linesize,
void ff_prores_idct_put_10_avx (uint16_t *dst, int linesize,
DCTELEM *block);
void ff_proresdsp_x86_init(ProresDSPContext *dsp)
void ff_proresdsp_x86_init(ProresDSPContext *dsp, AVCodecContext *avctx)
{
#if ARCH_X86_64 && HAVE_YASM
int flags = av_get_cpu_flags();
if(avctx->flags & CODEC_FLAG_BITEXACT)
return;
if (flags & AV_CPU_FLAG_SSE2) {
dsp->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM;
dsp->idct_put = ff_prores_idct_put_10_sse2;

10
tests/fate/prores.mak
Unescape View File

@ -7,9 +7,9 @@ FATE_PRORES = fate-prores-422 \
FATE_TESTS += $(FATE_PRORES)
fate-prores: $(FATE_PRORES)
fate-prores-422: CMD = framecrc -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov
fate-prores-422_hq: CMD = framecrc -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov
fate-prores-422_lt: CMD = framecrc -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov
fate-prores-422_proxy: CMD = framecrc -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov
fate-prores-alpha: CMD = framecrc -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov
fate-prores-422: CMD = framecrc -flags +bitexact -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422.mov
fate-prores-422_hq: CMD = framecrc -flags +bitexact -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_HQ.mov
fate-prores-422_lt: CMD = framecrc -flags +bitexact -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_LT.mov
fate-prores-422_proxy: CMD = framecrc -flags +bitexact -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_422_Proxy.mov
fate-prores-alpha: CMD = framecrc -flags +bitexact -vsync 0 -i $(SAMPLES)/prores/Sequence_1-Apple_ProRes_with_Alpha.mov

4
tests/ref/fate/prores-422
Unescape View File

@ -1,2 +1,2 @@
0, 0, 8294400, 0x57127dd9
0, 3003, 8294400, 0x57127dd9
0, 0, 8294400, 0xe8e9d448
0, 3003, 8294400, 0xe8e9d448

4
tests/ref/fate/prores-422_hq
Unescape View File

@ -1,2 +1,2 @@
0, 0, 8294400, 0x978851f4
0, 3003, 8294400, 0x978851f4
0, 0, 8294400, 0x817063b0
0, 3003, 8294400, 0x817063b0

4
tests/ref/fate/prores-422_lt
Unescape View File

@ -1,2 +1,2 @@
0, 0, 8294400, 0x4ca110c7
0, 3003, 8294400, 0x4ca110c7
0, 0, 8294400, 0xcd4ccde1
0, 3003, 8294400, 0xcd4ccde1

4
tests/ref/fate/prores-422_proxy
Unescape View File

@ -1,2 +1,2 @@
0, 0, 8294400, 0x007ba770
0, 3003, 8294400, 0x007ba770
0, 0, 8294400, 0x3099e361
0, 3003, 8294400, 0x3099e361

4
tests/ref/fate/prores-alpha
Unescape View File

@ -1,2 +1,2 @@
0, 0, 12441600, 0xf11685dd
0, 3003, 12441600, 0xf11685dd
0, 0, 12441600, 0x254d8f95
0, 3003, 12441600, 0x254d8f95

Write Preview
Loading…
Cancel
Save