diff --git a/Android.bp b/Android.bp
index 7975093d3..f0914dae6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -127,6 +127,7 @@ cc_test {
         "unit_test/basictypes_test.cc",
         "unit_test/color_test.cc",
         "unit_test/compare_test.cc",
+        "unit_test/convert_argb_test.cc",
         "unit_test/convert_test.cc",
         "unit_test/cpu_test.cc",
         "unit_test/cpu_thread_test.cc",
diff --git a/Android.mk b/Android.mk
index a5fb72f63..601f27601 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,6 +36,7 @@ LOCAL_SRC_FILES := \
     source/row_gcc.cc           \
     source/row_neon.cc          \
     source/row_neon64.cc        \
+    source/row_rvv.cc           \
     source/row_win.cc           \
     source/scale.cc             \
     source/scale_any.cc         \
@@ -45,6 +46,7 @@ LOCAL_SRC_FILES := \
     source/scale_neon.cc        \
     source/scale_neon64.cc      \
     source/scale_rgb.cc         \
+    source/scale_rvv.cc         \
     source/scale_uv.cc          \
     source/scale_win.cc         \
     source/video_common.cc
diff --git a/BUILD.gn b/BUILD.gn
index d3fbd33e2..9dc188345 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -118,6 +118,7 @@ static_library("libyuv_internal") {
     "include/libyuv/convert_from.h",
     "include/libyuv/convert_from_argb.h",
     "include/libyuv/cpu_id.h",
+    "include/libyuv/cpu_support.h",
     "include/libyuv/loongson_intrinsics.h",
     "include/libyuv/mjpeg_decoder.h",
     "include/libyuv/planar_functions.h",
@@ -125,6 +126,7 @@ static_library("libyuv_internal") {
     "include/libyuv/rotate_argb.h",
     "include/libyuv/rotate_row.h",
     "include/libyuv/row.h",
+    "include/libyuv/row_sve.h",
     "include/libyuv/scale.h",
     "include/libyuv/scale_argb.h",
     "include/libyuv/scale_rgb.h",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8c69a02d..37ff7a24d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,10 +25,10 @@ set ( ly_common_source_files
   ${ly_src_dir}/compare_common.cc
   ${ly_src_dir}/compare_gcc.cc
   ${ly_src_dir}/compare_win.cc
-  ${ly_src_dir}/convert_argb.cc
   ${ly_src_dir}/convert.cc
-  ${ly_src_dir}/convert_from_argb.cc
+  ${ly_src_dir}/convert_argb.cc
   ${ly_src_dir}/convert_from.cc
+  ${ly_src_dir}/convert_from_argb.cc
   ${ly_src_dir}/convert_jpeg.cc
   ${ly_src_dir}/convert_to_argb.cc
   ${ly_src_dir}/convert_to_i420.cc
@@ -36,9 +36,9 @@ set ( ly_common_source_files
   ${ly_src_dir}/mjpeg_decoder.cc
   ${ly_src_dir}/mjpeg_validate.cc
   ${ly_src_dir}/planar_functions.cc
+  ${ly_src_dir}/rotate.cc
   ${ly_src_dir}/rotate_any.cc
   ${ly_src_dir}/rotate_argb.cc
-  ${ly_src_dir}/rotate.cc
   ${ly_src_dir}/rotate_common.cc
   ${ly_src_dir}/rotate_gcc.cc
   ${ly_src_dir}/rotate_win.cc
@@ -47,9 +47,9 @@ set ( ly_common_source_files
   ${ly_src_dir}/row_gcc.cc
   ${ly_src_dir}/row_rvv.cc
   ${ly_src_dir}/row_win.cc
+  ${ly_src_dir}/scale.cc
   ${ly_src_dir}/scale_any.cc
   ${ly_src_dir}/scale_argb.cc
-  ${ly_src_dir}/scale.cc
   ${ly_src_dir}/scale_common.cc
   ${ly_src_dir}/scale_gcc.cc
   ${ly_src_dir}/scale_rgb.cc
diff --git a/libyuv.gypi b/libyuv.gypi
index 5cf173ef3..a73ba4b71 100644
--- a/libyuv.gypi
+++ b/libyuv.gypi
@@ -27,6 +27,7 @@
       'include/libyuv/rotate_argb.h',
       'include/libyuv/rotate_row.h',
       'include/libyuv/row.h',
+      'include/libyuv/row_sve.h',
       'include/libyuv/scale.h',
       'include/libyuv/scale_argb.h',
       'include/libyuv/scale_rgb.h',