virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/mips: Fix MMI macro replaces in HEVC Decoder

Browse Source 
The latest commit of Loongson MMI macro replaces were incorrect.
It makes a mass of green tints on HEVC videos when playing. I've
compared it with the older MMI implementation, and found out that
several lines have been replaced by wrong macros.

Signed-off-by: Qi Tiezheng <qitiezheng@360.cn>
Reviewed-by: Shiyou Yin <yinshiyou-hf@loongson.cn>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Qi Tiezheng
2022-08-18 14:27:44 +08:00
committed by Michael Niedermayer
parent 6e91d405be
commit e4c1272711
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/mips/hevcdsp_mmi.c
View File

@@ -80,7 +80,7 @@ void ff_hevc_put_hevc_qpel_h##w##_8_mmi(int16_t *dst, const uint8_t *_src, \
"paddh %[ftmp3], %[ftmp3], %[ftmp4] \n\t" \ "paddh %[ftmp3], %[ftmp3], %[ftmp4] \n\t" \
"paddh %[ftmp5], %[ftmp5], %[ftmp6] \n\t" \ "paddh %[ftmp5], %[ftmp5], %[ftmp6] \n\t" \
"paddh %[ftmp3], %[ftmp3], %[ftmp5] \n\t" \ "paddh %[ftmp3], %[ftmp3], %[ftmp5] \n\t" \
MMI_ULDC1(%[ftmp3], %[dst], 0x00) \ MMI_USDC1(%[ftmp3], %[dst], 0x00) \
\ \
"daddi %[x], %[x], -0x01 \n\t" \ "daddi %[x], %[x], -0x01 \n\t" \
PTR_ADDIU "%[src], %[src], 0x04 \n\t" \ PTR_ADDIU "%[src], %[src], 0x04 \n\t" \
@@ -178,7 +178,7 @@ void ff_hevc_put_hevc_qpel_hv##w##_8_mmi(int16_t *dst, const uint8_t *_src,\
"paddh %[ftmp3], %[ftmp3], %[ftmp4] \n\t" \ "paddh %[ftmp3], %[ftmp3], %[ftmp4] \n\t" \
"paddh %[ftmp5], %[ftmp5], %[ftmp6] \n\t" \ "paddh %[ftmp5], %[ftmp5], %[ftmp6] \n\t" \
"paddh %[ftmp3], %[ftmp3], %[ftmp5] \n\t" \ "paddh %[ftmp3], %[ftmp3], %[ftmp5] \n\t" \
MMI_ULDC1(%[ftmp3], %[tmp], 0x00) \ MMI_USDC1(%[ftmp3], %[tmp], 0x00) \
\ \
"daddi %[x], %[x], -0x01 \n\t" \ "daddi %[x], %[x], -0x01 \n\t" \
PTR_ADDIU "%[src], %[src], 0x04 \n\t" \ PTR_ADDIU "%[src], %[src], 0x04 \n\t" \
@@ -690,10 +690,10 @@ void ff_hevc_put_hevc_epel_bi_hv##w##_8_mmi(uint8_t *_dst, \
\ \
"1: \n\t" \ "1: \n\t" \
"2: \n\t" \ "2: \n\t" \
MMI_ULDC1(%[ftmp3], %[src], 0x00) \ MMI_ULWC1(%[ftmp2], %[src], 0x00) \
MMI_ULDC1(%[ftmp4], %[src], 0x01) \ MMI_ULWC1(%[ftmp3], %[src], 0x01) \
MMI_ULDC1(%[ftmp5], %[src], 0x02) \ MMI_ULWC1(%[ftmp4], %[src], 0x02) \
MMI_ULDC1(%[ftmp6], %[src], 0x03) \ MMI_ULWC1(%[ftmp5], %[src], 0x03) \
"punpcklbh %[ftmp2], %[ftmp2], %[ftmp0] \n\t" \ "punpcklbh %[ftmp2], %[ftmp2], %[ftmp0] \n\t" \
"pmullh %[ftmp2], %[ftmp2], %[ftmp1] \n\t" \ "pmullh %[ftmp2], %[ftmp2], %[ftmp1] \n\t" \
"punpcklbh %[ftmp3], %[ftmp3], %[ftmp0] \n\t" \ "punpcklbh %[ftmp3], %[ftmp3], %[ftmp0] \n\t" \
@@ -707,7 +707,7 @@ void ff_hevc_put_hevc_epel_bi_hv##w##_8_mmi(uint8_t *_dst, \
"paddh %[ftmp2], %[ftmp2], %[ftmp3] \n\t" \ "paddh %[ftmp2], %[ftmp2], %[ftmp3] \n\t" \
"paddh %[ftmp4], %[ftmp4], %[ftmp5] \n\t" \ "paddh %[ftmp4], %[ftmp4], %[ftmp5] \n\t" \
"paddh %[ftmp2], %[ftmp2], %[ftmp4] \n\t" \ "paddh %[ftmp2], %[ftmp2], %[ftmp4] \n\t" \
MMI_ULDC1(%[ftmp2], %[tmp], 0x00) \ MMI_USDC1(%[ftmp2], %[tmp], 0x00) \
\ \
"daddi %[x], %[x], -0x01 \n\t" \ "daddi %[x], %[x], -0x01 \n\t" \
PTR_ADDIU "%[src], %[src], 0x04 \n\t" \ PTR_ADDIU "%[src], %[src], 0x04 \n\t" \
@@ -773,7 +773,7 @@ void ff_hevc_put_hevc_epel_bi_hv##w##_8_mmi(uint8_t *_dst, \
"paddw %[ftmp5], %[ftmp5], %[ftmp6] \n\t" \ "paddw %[ftmp5], %[ftmp5], %[ftmp6] \n\t" \
"psraw %[ftmp5], %[ftmp5], %[ftmp0] \n\t" \ "psraw %[ftmp5], %[ftmp5], %[ftmp0] \n\t" \
"packsswh %[ftmp3], %[ftmp3], %[ftmp5] \n\t" \ "packsswh %[ftmp3], %[ftmp3], %[ftmp5] \n\t" \
MMI_ULDC1(%[ftmp4], %[tmp], 0x02) \ MMI_ULDC1(%[ftmp4], %[src2], 0x00) \
"li %[rtmp0], 0x10 \n\t" \ "li %[rtmp0], 0x10 \n\t" \
"dmtc1 %[rtmp0], %[ftmp8] \n\t" \ "dmtc1 %[rtmp0], %[ftmp8] \n\t" \
"punpcklhw %[ftmp5], %[ftmp2], %[ftmp3] \n\t" \ "punpcklhw %[ftmp5], %[ftmp2], %[ftmp3] \n\t" \