[FFmpeg-cvslog] avcodec/mips: Restore the initialization sequence of MSA and MMI in ff_h264chroma_init_mips.

[Shiyou Yin]

ffmpeg | branch: master | Shiyou Yin <yinshiyou-hf at loongson.cn> | Mon Apr 12 23:37:01 2021 +0800| [56c57fe68a71cd58bf1da48aeb9417c11ea0e359] | committer: Michael Niedermayer

avcodec/mips: Restore the initialization sequence of MSA and MMI in ff_h264chroma_init_mips.

The MSA optimization has been refined in commit 93218c2 and ce0a52e.
It is better than MMI version now.
Speed of decoding H264: 4.83x ==> 4.89x (tested on 3A4000).

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56c57fe68a71cd58bf1da48aeb9417c11ea0e359
---

 libavcodec/mips/h264chroma_init_mips.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/libavcodec/mips/h264chroma_init_mips.c b/libavcodec/mips/h264chroma_init_mips.c
index 5551a7c2fe..aa52d2a3ae 100644
--- a/libavcodec/mips/h264chroma_init_mips.c
+++ b/libavcodec/mips/h264chroma_init_mips.c
@@ -29,7 +29,15 @@ av_cold void ff_h264chroma_init_mips(H264ChromaContext *c, int bit_depth)
     int cpu_flags = av_get_cpu_flags();
     int high_bit_depth = bit_depth > 8;
 
-    /* MMI apears to be faster than MSA here */
+    if (have_mmi(cpu_flags)) {
+        if (!high_bit_depth) {
+            c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_mmi;
+            c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_mmi;
+            c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_mmi;
+            c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_mmi;
+        }
+    }
+
     if (have_msa(cpu_flags)) {
         if (!high_bit_depth) {
             c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_msa;
@@ -41,13 +49,4 @@ av_cold void ff_h264chroma_init_mips(H264ChromaContext *c, int bit_depth)
             c->avg_h264_chroma_pixels_tab[2] = ff_avg_h264_chroma_mc2_msa;
         }
     }
-
-    if (have_mmi(cpu_flags)) {
-        if (!high_bit_depth) {
-            c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_mmi;
-            c->avg_h264_chroma_pixels_tab[0] = ff_avg_h264_chroma_mc8_mmi;
-            c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_mmi;
-            c->avg_h264_chroma_pixels_tab[1] = ff_avg_h264_chroma_mc4_mmi;
-        }
-    }
 }