diff --git a/Android.bp b/Android.bp
index 3e0eb8b..5bcdd04 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2156,6 +2156,34 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libFileMux_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libFileMux_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libOmxAacDec",
     owner: "xiaomi",
@@ -2866,6 +2894,62 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libmmrtpdecoder_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libmmrtpdecoder_proprietary.so",
+            ],
+            shared_libs: [
+                "libutils",
+                "liblog",
+                "libcutils",
+                "libmmosal_vendor",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libmmrtpencoder_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libmmrtpencoder_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libmulawdec",
     owner: "xiaomi",
@@ -3071,6 +3155,632 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libwfdcodecv4l2_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libwfdcommonutils_proprietary",
+                "libwfdmminterface_proprietary",
+                "libwfdutils_proprietary",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdcommonutils_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdcommonutils_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libion",
+                "libprocessgroup",
+                "libwfddisplayconfig_proprietary",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdconfigutils_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdconfigutils_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libbinder",
+                "libnl",
+                "libwfdmminterface_proprietary",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfddisplayconfig_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfddisplayconfig_proprietary.so",
+            ],
+            shared_libs: [
+                "libhidlbase",
+                "libutils",
+                "libcutils",
+                "liblog",
+                "vendor.display.config@2.0",
+                "libdisplayconfig.qti",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdhdcpcp",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdhdcpcp.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdhdcpservice_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdhdcpservice_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libbinder",
+                "libwfdhdcpcp",
+                "libc++",
+                "libclang_rt.ubsan_standalone",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdmminterface_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdmminterface_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdmmservice_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdmmservice_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libbinder",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdmmsrc_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdmmsrc_proprietary.so",
+            ],
+            shared_libs: [
+                "libbinder",
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libmmrtpencoder_proprietary",
+                "libFileMux_proprietary",
+                "libcutils",
+                "libtinyalsa",
+                "libwfdcommonutils_proprietary",
+                "libwfdutils_proprietary",
+                "libwfdconfigutils_proprietary",
+                "libwfdaac_vendor",
+                "libpng",
+                "libwfdmminterface_proprietary",
+                "libwfdcodecv4l2_proprietary",
+                "libwfdmmservice_proprietary",
+                "libhidlbase",
+                "android.hardware.graphics.mapper@2.0",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdmodulehdcpsession",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdmodulehdcpsession.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libwfdhdcpcp",
+                "libwfdcommonutils_proprietary",
+                "libhidlbase",
+                "libwfdutils_proprietary",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdrtsp_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdrtsp_proprietary.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libcutils",
+                "libutils",
+                "libmmosal_vendor",
+                "libwfdcommonutils_proprietary",
+                "libwfdconfigutils_proprietary",
+                "liblog",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdsessionmodule",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdsessionmodule.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libwfdsourcesession_proprietary",
+                "vendor.qti.hardware.wifidisplaysession@1.0_vendor",
+                "libwfdcommonutils_proprietary",
+                "libhidlbase",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdsourcesession_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdsourcesession_proprietary.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libbinder",
+                "libmmosal_vendor",
+                "libwfdcommonutils_proprietary",
+                "libwfdconfigutils_proprietary",
+                "libwfdmminterface_proprietary",
+                "libmedia_helper",
+                "libwfdmmsrc_proprietary",
+                "libqdMetaData",
+                "libhidlbase",
+                "libwfdsourcesm_proprietary",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdsourcesm_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdsourcesm_proprietary.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libcutils",
+                "libutils",
+                "libwfdrtsp_proprietary",
+                "libmmrtpencoder_proprietary",
+                "libmmrtpdecoder_proprietary",
+                "libwfduibcinterface_proprietary",
+                "libwfdmmsrc_proprietary",
+                "libmmosal_vendor",
+                "libwfdcommonutils_proprietary",
+                "libwfdconfigutils_proprietary",
+                "libqdMetaData",
+                "libwfdmminterface_proprietary",
+                "libwfdmodulehdcpsession",
+                "libhidlbase",
+                "libwfddisplayconfig_proprietary",
+                "liblog",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfduibcinterface_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfduibcinterface_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libwfduibcsrcinterface_proprietary",
+                "libwfduibcsinkinterface_proprietary",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfduibcsink_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfduibcsink_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "libutils",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfduibcsinkinterface_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libwfduibcsink_proprietary",
+                "libwfdcommonutils_proprietary",
+                "libwfdconfigutils_proprietary",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfduibcsrc_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfduibcsrc_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "libwfdcommonutils_proprietary",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libwfdconfigutils_proprietary",
+                "libwfddisplayconfig_proprietary",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfduibcsrcinterface_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libwfduibcsrc_proprietary",
+                "libwfdcommonutils_proprietary",
+                "libwfdconfigutils_proprietary",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdutils_proprietary",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/libwfdutils_proprietary.so",
+            ],
+            shared_libs: [
+                "libmmosal_vendor",
+                "liblog",
+                "libion",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libasphere",
     owner: "xiaomi",
@@ -3125,6 +3835,65 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.qti.hardware.wifidisplaysession@1.0_vendor",
+    stem: "vendor.qti.hardware.wifidisplaysession@1.0",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so",
+            ],
+            shared_libs: [
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so",
+            ],
+            shared_libs: [
+                "libhidlbase",
+                "libutils",
+                "libcutils",
+                "vendor.qti.hardware.wifidisplaysession@1.0_vendor",
+                "libwfdsessionmodule",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "android.hardware.camera.provider@2.4-legacy",
     owner: "xiaomi",
@@ -14357,6 +15126,716 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libmmosal",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libmmosal.so",
+            ],
+            shared_libs: [
+                "libutils",
+                "libcutils",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libmmparser_lite",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libmmparser_lite.so",
+            ],
+            shared_libs: [
+                "libutils",
+                "libcutils",
+                "liblog",
+                "libmmosal",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libmmrtpdecoder",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libmmrtpdecoder.so",
+            ],
+            shared_libs: [
+                "libutils",
+                "liblog",
+                "libcutils",
+                "libmmosal",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libmmrtpencoder",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libmmrtpencoder.so",
+            ],
+            shared_libs: [
+                "libmmosal",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdavenhancements",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfdavenhancements.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libbinder",
+                "libutils",
+                "libgui",
+                "libui",
+                "libstagefright_foundation",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdclient",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfdclient.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libbinder",
+                "libgui",
+                "libmmosal",
+                "libinput",
+                "libwfdsinksm",
+                "libwfdcommonutils",
+                "libwfdconfigutils",
+                "libwfdmminterface",
+                "libnativewindow",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdcommonutils",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfdcommonutils.so",
+            ],
+            shared_libs: [
+                "libmmosal",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libbinder",
+                "libnl",
+                "libwfdmminterface",
+                "libwfdconfigutils",
+                "libui",
+                "libgui",
+                "libwfddisplayconfig",
+                "libion",
+                "libprocessgroup",
+                "libdng_sdk",
+                "libjpeg",
+                "libpiex",
+                "libpng",
+                "libheif",
+                "libnativewindow",
+                "libEGL",
+                "libGLESv2",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdconfigutils",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfdconfigutils.so",
+            ],
+            shared_libs: [
+                "libmmosal",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libbinder",
+                "libnl",
+                "libwfdmminterface",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfddisplayconfig",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfddisplayconfig.so",
+            ],
+            shared_libs: [
+                "libhidlbase",
+                "libutils",
+                "libcutils",
+                "liblog",
+                "vendor.display.config@2.0",
+                "libdisplayconfig.system.qti",
+                "libbinder_ndk",
+                "vendor.qti.hardware.display.config-V5-ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdmminterface",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfdmminterface.so",
+            ],
+            shared_libs: [
+                "libmmosal",
+                "liblog",
+                "libutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdmmsink",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfdmmsink.so",
+            ],
+            shared_libs: [
+                "libmmosal",
+                "liblog",
+                "libutils",
+                "libmedia",
+                "libaudioclient",
+                "libgui",
+                "libbinder",
+                "libwfdcommonutils",
+                "libwfdconfigutils",
+                "libui",
+                "libmmparser_lite",
+                "libmmrtpdecoder",
+                "libcutils",
+                "libwfddisplayconfig",
+                "libhwui",
+                "libwfdmminterface",
+                "libhidlbase",
+                "libhidlmemory",
+                "android.hidl.allocator@1.0",
+                "android.hidl.memory@1.0",
+                "libandroid",
+                "libmediandk",
+                "libaaudio",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdmmsrc_system",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfdmmsrc_system.so",
+            ],
+            shared_libs: [
+                "libbinder",
+                "libmmosal",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libgui",
+                "libui",
+                "libwfdcommonutils",
+                "libwfdconfigutils",
+                "libinput",
+                "libwfdmminterface",
+                "libwfddisplayconfig",
+                "libmedia_helper",
+                "libaudioclient",
+                "libwfdavenhancements",
+                "libhidlbase",
+                "libgralloctypes",
+                "android.hardware.graphics.mapper@4.0",
+                "libvndksupport",
+                "android.hardware.graphics.allocator@4.0",
+                "android.hardware.graphics.allocator-V2-ndk",
+                "libbinder_ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdnative",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfdnative.so",
+            ],
+            shared_libs: [
+                "libandroid_runtime",
+                "libui",
+                "libinput",
+                "libbinder",
+                "libgui",
+                "libnativehelper",
+                "libutils",
+                "liblog",
+                "libwfdclient",
+                "libhidlbase",
+                "libhidlmemory",
+                "android.hidl.token@1.0-utils",
+                "android.hardware.graphics.common@1.0",
+                "android.hardware.graphics.bufferqueue@1.0",
+                "android.hardware.graphics.bufferqueue@2.0",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdrtsp",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfdrtsp.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libcutils",
+                "libutils",
+                "libmmosal",
+                "libwfdcommonutils",
+                "libwfdconfigutils",
+                "liblog",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdservice",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfdservice.so",
+            ],
+            shared_libs: [
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libbinder",
+                "libgui",
+                "libwfdsinksm",
+                "libmmosal",
+                "libwfdcommonutils",
+                "libwfdconfigutils",
+                "libinput",
+                "libwfdmminterface",
+                "libmedia_helper",
+                "libaudioclient",
+                "libaudiofoundation",
+                "audioclient-types-aidl-cpp",
+                "android.media.audio.common.types-V4-cpp",
+                "libwfdmmsrc_system",
+                "libwfdavenhancements",
+                "libhidlbase",
+                "vendor.qti.hardware.wifidisplaysession@1.0",
+                "vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk",
+                "libbinder_ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfdsinksm",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfdsinksm.so",
+            ],
+            shared_libs: [
+                "libc++",
+                "libcutils",
+                "libutils",
+                "libwfdrtsp",
+                "libwfduibcinterface",
+                "libwfdmmsink",
+                "libmmosal",
+                "libmedia",
+                "libwfdcommonutils",
+                "libwfdconfigutils",
+                "libwfdmminterface",
+                "libmmrtpencoder",
+                "libmmrtpdecoder",
+                "libhidlbase",
+                "libnativewindow",
+                "libmediandk",
+                "liblog",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfduibcinterface",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfduibcinterface.so",
+            ],
+            shared_libs: [
+                "libmmosal",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libwfduibcsrcinterface",
+                "libwfduibcsinkinterface",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfduibcsink",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfduibcsink.so",
+            ],
+            shared_libs: [
+                "libmmosal",
+                "libutils",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfduibcsinkinterface",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfduibcsinkinterface.so",
+            ],
+            shared_libs: [
+                "libmmosal",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libwfduibcsink",
+                "libwfdcommonutils",
+                "libwfdconfigutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfduibcsrc",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfduibcsrc.so",
+            ],
+            shared_libs: [
+                "libmmosal",
+                "libwfdcommonutils",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libwfdconfigutils",
+                "libwfddisplayconfig",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "libwfduibcsrcinterface",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/libwfduibcsrcinterface.so",
+            ],
+            shared_libs: [
+                "libmmosal",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libwfduibcsrc",
+                "libwfdcommonutils",
+                "libwfdconfigutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "vendor.qti.diaghal@1.0",
     owner: "xiaomi",
@@ -14413,6 +15892,60 @@ cc_prebuilt_library_shared {
     system_ext_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "vendor.qti.hardware.wifidisplaysession@1.0",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so",
+            ],
+            shared_libs: [
+                "libhidlbase",
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
+cc_prebuilt_library_shared {
+    name: "vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk",
+    owner: "xiaomi",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so",
+            ],
+            shared_libs: [
+                "libbinder_ndk",
+                "android.hardware.common-V2-ndk",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    system_ext_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "vendor.qti.imsrtpservice@3.0",
     owner: "xiaomi",
@@ -14536,6 +16069,18 @@ android_app_import {
     system_ext_specific: true,
 }
 
+android_app_import {
+    name: "WfdService",
+    owner: "xiaomi",
+    apk: "proprietary/system_ext/priv-app/WfdService/WfdService.apk",
+    certificate: "platform",
+    dex_preopt: {
+        enabled: false,
+    },
+    privileged: true,
+    system_ext_specific: true,
+}
+
 android_app_import {
     name: "dpmserviceapp",
     owner: "xiaomi",
@@ -14572,6 +16117,14 @@ android_app_import {
     system_ext_specific: true,
 }
 
+dex_import {
+    name: "WfdCommon",
+    owner: "xiaomi",
+    jars: [
+        "proprietary/system/framework/WfdCommon.jar",
+    ],
+}
+
 dex_import {
     name: "tcmclient",
     owner: "xiaomi",
@@ -15958,6 +17511,66 @@ cc_prebuilt_binary {
     soc_specific: true,
 }
 
+cc_prebuilt_binary {
+    name: "wfdvndservice",
+    owner: "xiaomi",
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/bin/wfdvndservice",
+            ],
+            shared_libs: [
+                "libutils",
+                "liblog",
+                "libbinder",
+                "libwfdhdcpservice_proprietary",
+                "libavservices_minijail",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    soc_specific: true,
+}
+
+cc_prebuilt_binary {
+    name: "wifidisplayhalservice",
+    owner: "xiaomi",
+    target: {
+        android_arm: {
+            srcs: [
+                "proprietary/vendor/bin/wifidisplayhalservice",
+            ],
+            shared_libs: [
+                "vendor.qti.hardware.wifidisplaysession@1.0_vendor",
+                "vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl",
+                "libhidlbase",
+                "libutils",
+                "liblog",
+                "libbinder",
+                "libavservices_minijail",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "32",
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_binary {
     name: "xtra-daemon",
     owner: "xiaomi",
@@ -16027,6 +17640,40 @@ cc_prebuilt_binary {
     system_ext_specific: true,
 }
 
+cc_prebuilt_binary {
+    name: "wfdservice64",
+    owner: "xiaomi",
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/system_ext/bin/wfdservice64",
+            ],
+            shared_libs: [
+                "liblog",
+                "libutils",
+                "libcutils",
+                "libbinder",
+                "libwfdservice",
+                "libmmosal",
+                "libwfdcommonutils",
+                "libwfdconfigutils",
+                "libhidlbase",
+                "libavservices_minijail",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    strip: {
+        none: true,
+    },
+    prefer: true,
+    system_ext_specific: true,
+}
+
 install_symlink {
     name: "system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so",
     system_ext_specific: true,
@@ -16041,6 +17688,13 @@ install_symlink {
     symlink_target: "/system_ext/lib64/libimsmedia_jni.so",
 }
 
+install_symlink {
+    name: "system_ext_priv-app_WfdService_lib_arm64_libwfdnative_so",
+    system_ext_specific: true,
+    installed_location: "priv-app/WfdService/lib/arm64/libwfdnative.so",
+    symlink_target: "/system_ext/lib64/libwfdnative.so",
+}
+
 install_symlink {
     name: "vendor_lib_libEGL_adreno_so",
     soc_specific: true,
diff --git a/proprietary/system/framework/WfdCommon.jar b/proprietary/system/framework/WfdCommon.jar
new file mode 100644
index 0000000..b9eac0c
Binary files /dev/null and b/proprietary/system/framework/WfdCommon.jar differ
diff --git a/proprietary/system_ext/bin/wfdservice64 b/proprietary/system_ext/bin/wfdservice64
new file mode 100755
index 0000000..1ac86c3
Binary files /dev/null and b/proprietary/system_ext/bin/wfdservice64 differ
diff --git a/proprietary/system_ext/etc/init/wfdservice.rc b/proprietary/system_ext/etc/init/wfdservice.rc
new file mode 100644
index 0000000..16d075e
--- /dev/null
+++ b/proprietary/system_ext/etc/init/wfdservice.rc
@@ -0,0 +1,28 @@
+#
+# Copyright (c) 2019-2021 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+service wfdservice /system_ext/bin/wfdservice
+    class main
+    user system
+    disabled
+    oneshot
+
+service wfdservice64 /system_ext/bin/wfdservice64
+    class main
+    user system
+    disabled
+    oneshot
+
+on property:vendor.wfdservice=enable
+    start wfdservice64
+
+on property:vendor.wfdservice64=enable
+    start wfdservice64
+
+on property:vendor.wfdservice=disable
+    stop wfdservice64
+
+on property:vendor.wfdservice64=disable
+    stop wfdservice64
diff --git a/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml b/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml
new file mode 100644
index 0000000..7c49ca9
--- /dev/null
+++ b/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!--
+  Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries.
+  All rights reserved.
+  Confidential and Proprietary - Qualcomm Technologies, Inc.
+-->
+<permissions>
+    <privapp-permissions package="com.qualcomm.wfd.service">
+        <permission name="android.permission.WRITE_MEDIA_STORAGE"/>
+        <permission name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND"/>
+        <permission name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
+    </privapp-permissions>
+</permissions>
diff --git a/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy b/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy
new file mode 100644
index 0000000..45f64ae
--- /dev/null
+++ b/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy
@@ -0,0 +1,89 @@
+# Copyright (c) 2021, 2022 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc
+#
+# Not a contribution.
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+mmap: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+munmap: 1
+futex: 1
+#prctl: arg0 == PR_SET_VMA || arg0 == PR_GET_DUMPABLE
+prctl: 1
+#ioctl: arg1 == BINDER_VERSION || arg1 == BINDER_WRITE_READ || arg1 == BINDER_SET_MAX_THREADS
+ioctl: 1
+close: 1
+openat: 1
+mremap: 1
+fstat: 1
+readlinkat: 1
+pread64: 1
+fstatfs: 1
+clock_gettime: 1
+fstatat: 1
+read: 1
+write: 1
+fcntl: 1
+ppoll: 1
+faccessat: 1
+rt_sigaction: 1
+getuid: 1
+madvise: 1
+rt_sigprocmask: 1
+writev: 1
+personality: 1
+getrandom: 1
+gettimeofday: 1
+#set_tls: 1
+statfs: 1
+ugetrlimit: 1
+getrlimit: 1
+execve: 1
+connect: 1
+socket: arg0 == AF_UNIX
+getpid: 1
+gettid: 1
+nanosleep: 1
+restart_syscall: 1
+set_tid_address: 1
+open: 1
+exit: 1
+sched_getscheduler: 1
+exit_group: 1
+sigaltstack: 1
+clone: 1
+rt_sigreturn: 1
+setpriority: 1
+getpriority: 1
+timer_create: 1
+timer_delete: 1
+timer_settime: 1
+rt_sigtimedwait: 1
+getdents64: 1
+dup: 1
+lseek: 1
+tgkill: 1
+process_vm_readv: 1
+memfd_create: 1
+eventfd2: 1
+epoll_create1: 1
+epoll_ctl: 1
+recvfrom: 1
+epoll_pwait: 1
+umask: 1
+ioprio_set: 1
+wait4: 1
\ No newline at end of file
diff --git a/proprietary/system_ext/etc/wfdconfigsink.xml b/proprietary/system_ext/etc/wfdconfigsink.xml
new file mode 100644
index 0000000..6f5a2af
--- /dev/null
+++ b/proprietary/system_ext/etc/wfdconfigsink.xml
@@ -0,0 +1,811 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+    <!--
+        Copyright (C) 2012 - 2021 Qualcomm Technologies, Inc.
+        All Rights Reserved.
+        Confidential and Proprietary - Qualcomm Technologies, Inc.
+    -->
+   <!-- This config file is to be used when local device is sink -->
+
+<WFDConfig>
+    <Capability>
+        <!--
+            Audio capabilities
+        -->
+        <AudioLPCM>
+            <Name>LPCM</Name>
+            <Valid>1</Valid>
+            <Channels>2</Channels>
+            <SamplingFreq>48000</SamplingFreq>
+            <Latency>33</Latency>
+        </AudioLPCM>
+
+        <AudioAAC>
+            <Name>AAC</Name>
+            <Valid>1</Valid>
+            <Channels>6</Channels>
+            <SamplingFreq>48000</SamplingFreq>
+            <Latency>0</Latency>
+        </AudioAAC>
+
+        <AudioAC3>
+            <Name>AC3</Name>
+            <Valid>0</Valid>
+            <Channels>0</Channels>
+            <SamplingFreq>0</SamplingFreq>
+            <Latency>0</Latency>
+        </AudioAC3>
+
+        <!--
+            Video capabilities additions for H264 codec
+        -->
+        <VideoFormats>
+
+            <VideoCodecHeader>
+                <TotalProfiles>7</TotalProfiles>
+                <PreferredDisplaySupport>0</PreferredDisplaySupport>
+            </VideoCodecHeader>
+             <!-- AVC Profile 0 - Constrained Baseline,
+                              1 - Constrained High,
+                              2 - Constrained High2,
+                              3 - BaseLine
+                              4 - Main
+                              5 - High
+                  HEVC Profile 0 - Main
+            -->
+
+            <!-- Level  0 - 3.1,
+                        1 - 3.2,
+                        2 - 4.0,
+                        3 - 4.1,
+                        4 - 4.2,
+                        5 - 5,
+                        6 - 5.1,
+                        7 - 5.2
+            -->
+            <VideoCodec1>
+                <CodecName>H.264</CodecName>
+                <Profile>0</Profile>
+                <Level>6</Level>
+                <HorizontalResolution>4096</HorizontalResolution>
+                <VerticalResolution>2160</VerticalResolution>
+                <Latency>0</Latency>
+                <MinimumSliceSize>0</MinimumSliceSize>
+                <SliceEncodingParams>0</SliceEncodingParams>
+                <FrameRateControlSupp>1</FrameRateControlSupp>
+                <VideoFps>60</VideoFps>
+                <TranscodingMode>1</TranscodingMode>
+                <NonTranscodingMode>1</NonTranscodingMode>
+            </VideoCodec1>
+
+            <VideoCodec2>
+                <CodecName>H.264</CodecName>
+                <Profile>1</Profile>
+                <Level>6</Level>
+                <HorizontalResolution>4096</HorizontalResolution>
+                <VerticalResolution>2160</VerticalResolution>
+                <Latency>0</Latency>
+                <MinimumSliceSize>0</MinimumSliceSize>
+                <SliceEncodingParams>0</SliceEncodingParams>
+                <FrameRateControlSupp>1</FrameRateControlSupp>
+                <VideoFps>60</VideoFps>
+                <TranscodingMode>1</TranscodingMode>
+                <NonTranscodingMode>1</NonTranscodingMode>
+            </VideoCodec2>
+
+            <VideoCodec3>
+                <CodecName>H.264</CodecName>
+                <Profile>2</Profile>
+                <Level>6</Level>
+                <HorizontalResolution>4096</HorizontalResolution>
+                <VerticalResolution>2160</VerticalResolution>
+                <Latency>0</Latency>
+                <MinimumSliceSize>0</MinimumSliceSize>
+                <SliceEncodingParams>0</SliceEncodingParams>
+                <FrameRateControlSupp>1</FrameRateControlSupp>
+                <VideoFps>60</VideoFps>
+                <TranscodingMode>1</TranscodingMode>
+                <NonTranscodingMode>1</NonTranscodingMode>
+            </VideoCodec3>
+
+            <VideoCodec4>
+                <CodecName>H.264</CodecName>
+                <Profile>3</Profile>
+                <Level>6</Level>
+                <HorizontalResolution>4096</HorizontalResolution>
+                <VerticalResolution>2160</VerticalResolution>
+                <Latency>0</Latency>
+                <MinimumSliceSize>0</MinimumSliceSize>
+                <SliceEncodingParams>0</SliceEncodingParams>
+                <FrameRateControlSupp>1</FrameRateControlSupp>
+                <VideoFps>60</VideoFps>
+                <TranscodingMode>1</TranscodingMode>
+                <NonTranscodingMode>1</NonTranscodingMode>
+            </VideoCodec4>
+
+            <VideoCodec5>
+                <CodecName>H.264</CodecName>
+                <Profile>4</Profile>
+                <Level>6</Level>
+                <HorizontalResolution>4096</HorizontalResolution>
+                <VerticalResolution>2160</VerticalResolution>
+                <Latency>0</Latency>
+                <MinimumSliceSize>0</MinimumSliceSize>
+                <SliceEncodingParams>0</SliceEncodingParams>
+                <FrameRateControlSupp>1</FrameRateControlSupp>
+                <VideoFps>60</VideoFps>
+                <TranscodingMode>1</TranscodingMode>
+                <NonTranscodingMode>1</NonTranscodingMode>
+            </VideoCodec5>
+
+            <VideoCodec6>
+                <CodecName>H.264</CodecName>
+                <Profile>5</Profile>
+                <Level>6</Level>
+                <HorizontalResolution>4096</HorizontalResolution>
+                <VerticalResolution>2160</VerticalResolution>
+                <Latency>0</Latency>
+                <MinimumSliceSize>0</MinimumSliceSize>
+                <SliceEncodingParams>0</SliceEncodingParams>
+                <FrameRateControlSupp>1</FrameRateControlSupp>
+                <VideoFps>60</VideoFps>
+                <TranscodingMode>1</TranscodingMode>
+                <NonTranscodingMode>1</NonTranscodingMode>
+            </VideoCodec6>
+
+            <VideoCodec7>
+                <CodecName>H.265</CodecName>
+                <Profile>0</Profile>
+                <Level>4</Level>
+                <HorizontalResolution>4096</HorizontalResolution>
+                <VerticalResolution>2160</VerticalResolution>
+                <Latency>0</Latency>
+                <MinimumSliceSize>0</MinimumSliceSize>
+                <SliceEncodingParams>0</SliceEncodingParams>
+                <FrameRateControlSupp>1</FrameRateControlSupp>
+                <VideoFps>60</VideoFps>
+                <TranscodingMode>1</TranscodingMode>
+                <NonTranscodingMode>1</NonTranscodingMode>
+            </VideoCodec7>
+        </VideoFormats>
+
+        <!--
+            Aux streaming is new addition
+            This is added for Direct streaming
+        -->
+        <AuxStreamInfo>
+            <Codec>
+                <Count>1</Count>
+                <Name1>PNG</Name1>
+            </Codec>
+        <!--
+            Limiting the number of layers to 5 in the overlay
+            Resolution is 1080P for Direct streaming
+        -->
+            <MaxOverlay>5</MaxOverlay>
+            <HRes>1280</HRes>
+            <VRes>720</VRes>
+            <Mode>CEA</Mode>
+        </AuxStreamInfo>
+
+        <!--
+            Standby Resume capability is supported
+        -->
+        <StandbyResumeCapability>
+            <Valid>1</Valid>
+        </StandbyResumeCapability>
+
+        <!--
+            Explicit AV format change
+            Not supported
+        -->
+        <AVFormatChange>
+            <Valid>0</Valid>
+            <AVInterval>0</AVInterval>
+        </AVFormatChange>
+
+        <!--
+            Frame skipping interval is in the scale of 500 msec or half second.
+            FrameInterval can be between 1 to 7,  according to the WFD spec.
+            0 means Frame skipping interval is infinite and recommended value is 0
+        -->
+        <FrameSkipping>
+            <Valid>1</Valid>
+            <FrameInterval>0</FrameInterval>
+        </FrameSkipping>
+
+        <!--  disable HDCP by default -->
+        <ContentProtection>
+            <Valid>0</Valid>
+            <!--
+                Valid values WFD_HDCP_2_0,
+                WFD_HDCP_2_1 and WFD_HDCP_2_2
+            -->
+            <Version>WFD_HDCP_2_2</Version>
+            <CPPort>6789</CPPort>
+        </ContentProtection>
+
+        <!--
+            To enable RTP dump at sink
+        -->
+        <RTPDumpEnable>
+            <!-- DEPRECATED -->
+            <!-- For enabling RTP parser dumping set
+                 persist.vendor.sys.debug.rtp.enable_dump to 1
+                 /sdcard/Download/rtpdump.ts
+                 -->
+        </RTPDumpEnable>
+
+        <!--
+            UIBC by default enabled
+        -->
+        <UIBC>
+            <UIBCValid>1</UIBCValid>            <!-- 0/1 UIBC supported or not -->
+            <InputCategory>
+                <Generic>1</Generic>            <!-- 0/1 - support generic or not -->
+                <HID>1</HID>                    <!-- 0/1 - support HID or not -->
+            </InputCategory>
+
+            <!--  Supported input events  -->
+            <InputEvents>
+                <GenericInputEvents>
+                <!-- 0/1 for all Input Event Types -->
+                    <Mouse>0</Mouse>
+                    <Keyboard>1</Keyboard>
+                    <SingleTouch>1</SingleTouch>
+                    <MultiTouch>1</MultiTouch>
+                    <JoyStick>0</JoyStick>
+                    <Camera>0</Camera>
+                    <Gesture>0</Gesture>
+                    <RemoteControl>0</RemoteControl>
+                </GenericInputEvents>
+                <!--
+                Each input path will have a byte and support
+                for the input types is indicated by setting a bit:
+                KEYBOARD              BIT0
+                MOUSE                 BIT1
+                SINGLETOUCH           BIT2
+                MULTITOUCH            BIT3
+                JOYSTICK              BIT4
+                CAMERA                BIT5
+                GESTURE               BIT6
+                REMOTECONTROL         BIT7
+                -->
+                <HIDInputPaths>
+                    <Infrared>0</Infrared>
+                    <USB>1</USB>
+                    <BT>0</BT>
+                    <Zigbee>0</Zigbee>
+                    <Wifi>0</Wifi>
+                    <NoSP>0</NoSP>
+                </HIDInputPaths>
+            </InputEvents>
+            <!--  TCP port on which UIBC connection established -->
+            <TcpPort>4321</TcpPort>
+        </UIBC>
+    </Capability>
+
+    <!--
+         Enabling Rtcp
+    -->
+    <RTCP>
+        <RtcpRREnabled>1</RtcpRREnabled>
+        <RtcpRRIntervalMs>500</RtcpRRIntervalMs>
+    </RTCP>
+
+    <!--
+        Send keep alive messages for every 50sec
+    -->
+    <SendKeepAlive>1</SendKeepAlive>
+
+    <!--
+        RTSP port on which RTSP server is running
+    -->
+    <RTSPPort>5550</RTSPPort>
+
+    <!--
+        To configure video core in SVS mode
+    -->
+    <PerformanceLevelSVSMode>1</PerformanceLevelSVSMode>
+
+    <!--
+        To configure video core in Nominal mode
+    -->
+    <PerformanceLevelNominalMode>0</PerformanceLevelNominalMode>
+
+    <!--
+        To configure video core in Turbo mode
+    -->
+    <PerformanceLevelTurboMode>0</PerformanceLevelTurboMode>
+
+    <!--
+        Bitrate settings for each mode
+    -->
+    <BitrateTable>
+        <!--
+            Bitrate table for Audio formats
+        -->
+        <AAC>
+            <BIT0>
+                <MaxBitrate>256000</MaxBitrate>
+                <MinBitrate>256000</MinBitrate>
+            </BIT0>
+            <BIT1>
+                <MaxBitrate>384000</MaxBitrate>
+                <MinBitrate>384000</MinBitrate>
+            </BIT1>
+            <BIT2>
+                <MaxBitrate>512000</MaxBitrate>
+                <MinBitrate>512000</MinBitrate>
+            </BIT2>
+        </AAC>
+
+        <!--
+            CEA Min and Max bit rates for each resolution
+            Will configure the video core with MaxBitrate
+            Based on the available link speed video bitrate
+            can go upto MinBitrate
+        -->
+        <CEA>
+          <!-- 640x480p60  -->
+            <BIT0>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT0>
+          <!-- 720x480p60 -->
+            <BIT1>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT1>
+          <!-- 720x480i60 -->
+            <BIT2>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT2>
+          <!-- 720x576p50  -->
+            <BIT3>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT3>
+          <!-- 720x576i50  -->
+            <BIT4>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT4>
+          <!-- 1280x720p30  -->
+            <BIT5>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT5>
+          <!-- 1280x720p60  -->
+            <BIT6>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT6>
+          <!-- 1920x1080p30  -->
+            <BIT7>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT7>
+          <!-- 1920x1080p60  -->
+            <BIT8>
+                <MinBitrate>7000000</MinBitrate>
+                <MaxBitrate>13000000</MaxBitrate>
+            </BIT8>
+          <!-- 1920x1080i60  -->
+            <BIT9>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>40000000</MaxBitrate>
+            </BIT9>
+          <!-- 1280x720p25  -->
+            <BIT10>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT10>
+          <!-- 1280x720p50  -->
+            <BIT11>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT11>
+          <!-- 1920x1080p25  -->
+            <BIT12>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT12>
+          <!-- 1920x1080p50  -->
+            <BIT13>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>40000000</MaxBitrate>
+            </BIT13>
+          <!-- 1920x1080i50  -->
+            <BIT14>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>40000000</MaxBitrate>
+            </BIT14>
+          <!-- 1280x720p24  -->
+            <BIT15>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT15>
+          <!-- 1920x1080p24  -->
+            <BIT16>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT16>
+          <!--  3840x2160p24  -->
+            <BIT17>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT17>
+          <!--  3840x2160 p25  -->
+            <BIT18>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT18>
+          <!--  3840x2160p30 -->
+            <BIT19>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT19>
+          <!--  3840x2160p50  -->
+            <BIT20>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT20>
+          <!--  3840x2160p60 -->
+            <BIT21>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT21>
+          <!--  4096x2160p24  -->
+            <BIT22>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT22>
+          <!--  4096x2160p25  -->
+            <BIT23>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT23>
+          <!--  4096x2160p30  -->
+            <BIT24>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT24>
+          <!--  4096x2160p50  -->
+            <BIT25>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT25>
+          <!--  4096x2160 p60 -->
+            <BIT26>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT26>
+        </CEA>
+
+        <!--
+            VESA Min and Max bit rates for each resolution
+            Will configure the video core with MaxBitrate
+            Based on the available link speed video bitrate
+            can go upto MinBitrate
+        -->
+        <VESA>
+            <!--  800x600p30 -->
+            <BIT0>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT0>
+            <!--  800x600p60 -->
+            <BIT1>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT1>
+            <!--  1024x768p30 -->
+            <BIT2>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT2>
+            <!--  1024x768p60 -->
+            <BIT3>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT3>
+            <!--  1152x864p30 -->
+            <BIT4>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT4>
+            <!--  1152x864p60 -->
+            <BIT5>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT5>
+            <!--  1280x768p30 -->
+            <BIT6>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT6>
+            <!--  1280x768p60 -->
+            <BIT7>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT7>
+            <!--  1280x800p30 -->
+            <BIT8>
+                <MinBitrate>3500000</MinBitrate>
+                <MaxBitrate>14000000</MaxBitrate>
+            </BIT8>
+            <!--  1280x800p60 -->
+            <BIT9>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT9>
+            <!--  1360x768p30 -->
+            <BIT10>
+                <MinBitrate>3500000</MinBitrate>
+                <MaxBitrate>14000000</MaxBitrate>
+            </BIT10>
+            <!--  1360x768p60 -->
+            <BIT11>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT11>
+            <!--  1366x768p30 -->
+            <BIT12>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT12>
+            <!--  1366x768p60 -->
+            <BIT13>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT13>
+            <!--  1280x1024p30 -->
+            <BIT14>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT14>
+            <!--  1280x1024p60 -->
+            <BIT15>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>40000000</MaxBitrate>
+            </BIT15>
+            <!--  1400x1050p30 -->
+            <BIT16>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT16>
+            <!--  1400x1050p60 -->
+            <BIT17>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT17>
+            <!--  1440x900p30 -->
+            <BIT18>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT18>
+            <!--  1440x900p60 -->
+            <BIT19>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>40000000</MaxBitrate>
+            </BIT19>
+            <!--  1600x900p30 -->
+            <BIT20>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT20>
+            <!--  1600x900p60 -->
+            <BIT21>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>40000000</MaxBitrate>
+            </BIT21>
+            <!--  1600x1200p30 -->
+            <BIT22>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT22>
+            <!--  1600x1200p60 -->
+            <BIT23>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>40000000</MaxBitrate>
+            </BIT23>
+            <!--  1680x1024p30 -->
+            <BIT24>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT24>
+            <!--  1680x1024p60 -->
+            <BIT25>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>40000000</MaxBitrate>
+            </BIT25>
+            <!--  1680x1050p30 -->
+            <BIT26>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT26>
+            <!--  1680x1050p60 -->
+            <BIT27>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>40000000</MaxBitrate>
+            </BIT27>
+            <!--  1920x1200p30 -->
+            <BIT28>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT28>
+            <!--  1920x1200p60 -->
+            <BIT29>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>40000000</MaxBitrate>
+            </BIT29>
+            <!--  2560x1440p30  -->
+            <BIT30>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT30>
+            <!--  2560x1440p60  -->
+            <BIT31>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT31>
+            <!--  2560x1600p30  -->
+            <BIT32>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT32>
+            <!--  2560x1600p60  -->
+            <BIT33>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT33>
+        </VESA>
+
+        <!--
+            HH Min and Max bit rates for each resolution
+            Will configure the video core with MaxBitrate
+            Based on the available link speed video bitrate
+            can go upto MinBitrate
+        -->
+        <HH>
+            <!--  800x480p30  -->
+            <BIT0>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT0>
+            <!--  800x480p60  -->
+            <BIT1>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT1>
+            <!--  854x480p30  -->
+            <BIT2>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT2>
+            <!--  854x480p60  -->
+            <BIT3>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT3>
+            <!--  864x480p30  -->
+            <BIT4>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT4>
+            <!--  864x480p60  -->
+            <BIT5>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT5>
+            <!--  640x360p30  -->
+            <BIT6>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT6>
+            <!--  640x360p60  -->
+            <BIT7>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT7>
+            <!--  960x540p30  -->
+            <BIT8>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT8>
+            <!--  960x540p60  -->
+            <BIT9>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT9>
+            <!--  848x480p30  -->
+            <BIT10>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT10>
+            <!--  848x480p60  -->
+            <BIT11>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT11>
+        </HH>
+    </BitrateTable>
+
+    <!--
+        RetryCount is Max no of times Client request to set-up Socket connect
+        This can be applicable only to sink
+    -->
+    <RetryCount>40</RetryCount>
+
+    <!--
+        To disable/enable audio stream playback
+        support during power suspend - 0 or 1
+    -->
+    <AudioStreamInSuspend>0</AudioStreamInSuspend>
+
+    <!--
+        Compensation delay for audio
+        This is maintain good AV sync in the mux TS A + V stream Recommended
+        value is 150 msec arrived at this number after fine tuning OEMs can
+        change this value in case they want
+    -->
+    <AudioAVSyncDelay>-150</AudioAVSyncDelay>
+
+    <!--
+        To disable/enable AV Sync - 1 or 0
+        By default AV sync is enabled
+        This is only for certification
+        The reason for introducing this flag is
+        there are some issues with some test bed sources
+        if we enable AV sync though our sink is properly
+        handling AV sync
+    -->
+    <DisableAVSync>0</DisableAVSync>
+
+    <!--
+        Push video frames to display in async mode, so that display can drop frames
+        if frames are pushed faster than vsync.
+    -->
+    <PushVideoFrameInASyncMode>0</PushVideoFrameInASyncMode>
+
+    <!--
+        To drop video frame in case parser detects and reports packet loss over the air
+        Three modes are supported -
+        1. 0 - Don't drop any video frame
+        2. 1 - Drop only the video frame where parser reported packet loss
+        3. 2 - Parser reported packet loss, request an IDR and drop until IDR
+    -->
+    <DropFrameOnPacketLossMode>0</DropFrameOnPacketLossMode>
+
+    <!--
+        To disable/enable Audio Track Latency - 0 or 1.
+        This adds audio track latency to renderer to improve AV sync during BT use case.
+    -->
+    <EnableAudioTrackLatency>0</EnableAudioTrackLatency>
+
+    <!--
+        Make audio AV Sync drop window configurable item.Sometimes if wlan
+        doesn't perform at required throughput,audio drops can happen due
+        to late arrival of audio frames.
+    -->
+    <AudioAVSyncDropWindow>-150000</AudioAVSyncDropWindow>
+
+    <!--
+        Make Video AV Sync drop window configurable item.Sometimes if wlan
+        doesn't perform at required throughput,Video drops can happen due
+        to late arrival of video frames.
+    -->
+    <VideoAVSyncDropWindow>-200000</VideoAVSyncDropWindow>
+
+    <!-- Direct Streaming Feature support -->
+    <StreamingSupport>1</StreamingSupport>
+
+    <Cursor>0</Cursor>
+
+    <!--
+        Video Decoder Input Custom Limit Buffer Size Mode
+    -->
+    <VideoCustomSizeMode>1</VideoCustomSizeMode>
+
+</WFDConfig>
diff --git a/proprietary/system_ext/lib64/libmmosal.so b/proprietary/system_ext/lib64/libmmosal.so
new file mode 100644
index 0000000..9cdb25c
Binary files /dev/null and b/proprietary/system_ext/lib64/libmmosal.so differ
diff --git a/proprietary/system_ext/lib64/libmmparser_lite.so b/proprietary/system_ext/lib64/libmmparser_lite.so
new file mode 100644
index 0000000..81f3b3b
Binary files /dev/null and b/proprietary/system_ext/lib64/libmmparser_lite.so differ
diff --git a/proprietary/system_ext/lib64/libmmrtpdecoder.so b/proprietary/system_ext/lib64/libmmrtpdecoder.so
new file mode 100644
index 0000000..66bf346
Binary files /dev/null and b/proprietary/system_ext/lib64/libmmrtpdecoder.so differ
diff --git a/proprietary/system_ext/lib64/libmmrtpencoder.so b/proprietary/system_ext/lib64/libmmrtpencoder.so
new file mode 100644
index 0000000..472c276
Binary files /dev/null and b/proprietary/system_ext/lib64/libmmrtpencoder.so differ
diff --git a/proprietary/system_ext/lib64/libwfdavenhancements.so b/proprietary/system_ext/lib64/libwfdavenhancements.so
new file mode 100644
index 0000000..5470444
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdavenhancements.so differ
diff --git a/proprietary/system_ext/lib64/libwfdclient.so b/proprietary/system_ext/lib64/libwfdclient.so
new file mode 100644
index 0000000..38be461
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdclient.so differ
diff --git a/proprietary/system_ext/lib64/libwfdcommonutils.so b/proprietary/system_ext/lib64/libwfdcommonutils.so
new file mode 100644
index 0000000..ec5d62b
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdcommonutils.so differ
diff --git a/proprietary/system_ext/lib64/libwfdconfigutils.so b/proprietary/system_ext/lib64/libwfdconfigutils.so
new file mode 100644
index 0000000..4edad98
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdconfigutils.so differ
diff --git a/proprietary/system_ext/lib64/libwfddisplayconfig.so b/proprietary/system_ext/lib64/libwfddisplayconfig.so
new file mode 100644
index 0000000..fd05c54
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfddisplayconfig.so differ
diff --git a/proprietary/system_ext/lib64/libwfdmminterface.so b/proprietary/system_ext/lib64/libwfdmminterface.so
new file mode 100644
index 0000000..99f4a1d
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdmminterface.so differ
diff --git a/proprietary/system_ext/lib64/libwfdmmsink.so b/proprietary/system_ext/lib64/libwfdmmsink.so
new file mode 100644
index 0000000..4e783bf
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdmmsink.so differ
diff --git a/proprietary/system_ext/lib64/libwfdmmsrc_system.so b/proprietary/system_ext/lib64/libwfdmmsrc_system.so
new file mode 100644
index 0000000..ed6bce1
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdmmsrc_system.so differ
diff --git a/proprietary/system_ext/lib64/libwfdnative.so b/proprietary/system_ext/lib64/libwfdnative.so
new file mode 100644
index 0000000..377665d
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdnative.so differ
diff --git a/proprietary/system_ext/lib64/libwfdrtsp.so b/proprietary/system_ext/lib64/libwfdrtsp.so
new file mode 100644
index 0000000..c7d5f52
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdrtsp.so differ
diff --git a/proprietary/system_ext/lib64/libwfdservice.so b/proprietary/system_ext/lib64/libwfdservice.so
new file mode 100644
index 0000000..a069111
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdservice.so differ
diff --git a/proprietary/system_ext/lib64/libwfdsinksm.so b/proprietary/system_ext/lib64/libwfdsinksm.so
new file mode 100644
index 0000000..457bc42
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfdsinksm.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcinterface.so b/proprietary/system_ext/lib64/libwfduibcinterface.so
new file mode 100644
index 0000000..b581be3
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfduibcinterface.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsink.so b/proprietary/system_ext/lib64/libwfduibcsink.so
new file mode 100644
index 0000000..a58c662
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfduibcsink.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsinkinterface.so b/proprietary/system_ext/lib64/libwfduibcsinkinterface.so
new file mode 100644
index 0000000..1f5d63a
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfduibcsinkinterface.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsrc.so b/proprietary/system_ext/lib64/libwfduibcsrc.so
new file mode 100644
index 0000000..37582df
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfduibcsrc.so differ
diff --git a/proprietary/system_ext/lib64/libwfduibcsrcinterface.so b/proprietary/system_ext/lib64/libwfduibcsrcinterface.so
new file mode 100644
index 0000000..a5515f4
Binary files /dev/null and b/proprietary/system_ext/lib64/libwfduibcsrcinterface.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so
new file mode 100644
index 0000000..2e5cbb0
Binary files /dev/null and b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so differ
diff --git a/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so
new file mode 100644
index 0000000..44ed720
Binary files /dev/null and b/proprietary/system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so differ
diff --git a/proprietary/system_ext/priv-app/WfdService/WfdService.apk b/proprietary/system_ext/priv-app/WfdService/WfdService.apk
new file mode 100644
index 0000000..9af9f99
Binary files /dev/null and b/proprietary/system_ext/priv-app/WfdService/WfdService.apk differ
diff --git a/proprietary/vendor/bin/wfdvndservice b/proprietary/vendor/bin/wfdvndservice
new file mode 100755
index 0000000..1592ab9
Binary files /dev/null and b/proprietary/vendor/bin/wfdvndservice differ
diff --git a/proprietary/vendor/bin/wifidisplayhalservice b/proprietary/vendor/bin/wifidisplayhalservice
new file mode 100755
index 0000000..b7e54a7
Binary files /dev/null and b/proprietary/vendor/bin/wifidisplayhalservice differ
diff --git a/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc b/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc
new file mode 100644
index 0000000..790837b
--- /dev/null
+++ b/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc
@@ -0,0 +1,11 @@
+#
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+service wifidisplayhalservice /vendor/bin/wifidisplayhalservice
+  class main
+  user system
+  group inet input audio media uhid
+  capabilities NET_RAW
+
diff --git a/proprietary/vendor/etc/init/wfdvndservice.rc b/proprietary/vendor/etc/init/wfdvndservice.rc
new file mode 100644
index 0000000..c28e32b
--- /dev/null
+++ b/proprietary/vendor/etc/init/wfdvndservice.rc
@@ -0,0 +1,10 @@
+#
+# Copyright (c) 2019 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc.
+#
+
+service wfdvndservice /vendor/bin/wfdvndservice
+  class main
+  user system
+  group inet
diff --git a/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy b/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy
new file mode 100644
index 0000000..5c48147
--- /dev/null
+++ b/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy
@@ -0,0 +1,68 @@
+# Copyright (c) 2020-2021 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc
+#
+# Not a contribution.
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+munmap: 1
+mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+#prctl: arg0 == PR_GET_DUMPABLE || arg0 == PR_SET_VMA
+prctl: 1
+openat: 1
+futex: 1
+close: 1
+read: 1
+write: 1
+fstat64: 1
+fstatat64: 1
+readlinkat: 1
+fstatfs64: 1
+pread64: 1
+#ioctl: arg1 == BINDER_VERSION || arg1 == BINDER_SET_MAX_THREADS || arg1 == BINDER_WRITE_READ
+ioctl: 1
+faccessat: 1
+clock_gettime: 1
+getuid32: 1
+rt_sigaction: 1
+writev: 1
+madvise: 1
+_llseek: 1
+rt_sigprocmask: 1
+fcntl64: 1
+#set_tls: 1
+personality: 1
+getrandom: 1
+open: 1
+ugetrlimit: 1
+clone: 1
+set_tid_address: 1
+execve: 1
+sched_getscheduler: 1
+exit_group: 1
+rt_sigreturn: 1
+restart_syscall: 1
+connect: 1
+socket: arg0 == AF_UNIX
+exit: 1
+readlink: 1
+getpid: 1
+sigaltstack: 1
+setpriority: 1
+getdents64: 1
+dup: 1
+mremap:1
diff --git a/proprietary/vendor/etc/seccomp_policy/wfdvndservice.policy b/proprietary/vendor/etc/seccomp_policy/wfdvndservice.policy
new file mode 100644
index 0000000..591cf41
--- /dev/null
+++ b/proprietary/vendor/etc/seccomp_policy/wfdvndservice.policy
@@ -0,0 +1,80 @@
+# Copyright (c) 2020 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc
+#
+# Not a contribution.
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+munmap: 1
+mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+#prctl: arg0 == PR_SET_VMA || arg0 == PR_GET_DUMPABLE
+prctl: 1
+futex: 1
+openat: 1
+fstatat64: 1
+read: 1
+write: 1
+close: 1
+sendto: 1
+clock_gettime: 1
+fstat64: 1
+faccessat: 1
+readlinkat: 1
+pread64: 1
+fstatfs64: 1
+getuid32: 1
+rt_sigaction: 1
+#ioctl: arg1 == BINDER_WRITE_READ || arg1 == BINDER_VERSION || arg1 == BINDER_SET_MAX_THREADS
+ioctl: 1
+writev: 1
+rt_sigprocmask: 1
+madvise: 1
+fcntl64: 1
+clone: 1
+#set_tls: 1
+open: 1
+personality: 1
+getrandom: 1
+restart_syscall: 1
+sched_getscheduler: 1
+execve: 1
+socket: arg0 == AF_UNIX
+exit_group: 1
+rt_sigreturn: 1
+connect: 1
+set_tid_address: 1
+readlink: 1
+ugetrlimit: 1
+exit: 1
+getpid: 1
+gettid: 1
+sigaltstack: 1
+setpriority: 1
+lseek: 1
+sched_yield: 1
+_llseek: 1
+nanosleep: 1
+flock: 1
+setsockopt: 1
+bind: 1
+getsockname: 1
+listen: 1
+pselect6: 1
+accept4: 1
+sendmsg: 1
+recvfrom: 1
+mremap: 1
diff --git a/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy b/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy
new file mode 100644
index 0000000..5bb6994
--- /dev/null
+++ b/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy
@@ -0,0 +1,94 @@
+# Copyright (c) 2020 Qualcomm Technologies, Inc.
+# All Rights Reserved.
+# Confidential and Proprietary - Qualcomm Technologies, Inc
+#
+# Not a contribution.
+#
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#ioctl: arg1 == BINDER_WRITE_READ || arg1 == BINDER_VERSION || arg1 == VIDIOC_QBUF || arg1 == BINDER_SET_MAX_THREADS
+ioctl: 1
+futex: 1
+mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+clock_gettime: 1
+dup: 1
+munmap: 1
+mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
+#prctl: arg0 == PR_GET_DUMPABLE || arg0 == PR_SET_VMA
+prctl: 1
+openat: 1
+close: 1
+fstat64: 1
+read: 1
+write: 1
+readlinkat: 1
+unlinkat: 1
+mremap: 1
+pread64: 1
+fstatfs64: 1
+fstatat64: 1
+getuid32: 1
+writev: 1
+faccessat: 1
+rt_sigaction: 1
+sendto: 1
+_llseek: 1
+madvise: 1
+rt_sigprocmask: 1
+fcntl64: 1
+#set_tls: 1
+personality: 1
+getrandom: 1
+ugetrlimit: 1
+rt_sigreturn: 1
+set_tid_address: 1
+open: 1
+exit: 1
+sched_getscheduler: 1
+connect: 1
+execve: 1
+getpid: 1
+exit_group: 1
+socket: arg0 == AF_UNIX
+clone: 1
+restart_syscall: 1
+sigaltstack: 1
+setpriority: 1
+setsockopt: 1
+getsockopt: 1
+bind: 1
+listen: 1
+socketpair: 1
+getpriority: 1
+pselect6: 1
+accept4: 1
+sendmsg: 1
+sendmmsg: 1
+recvmsg: 1
+recvfrom: 1
+gettimeofday: 1
+lseek: 1
+getsockname: 1
+nanosleep: 1
+ppoll: 1
+timer_create: 1
+timer_delete: 1
+timer_settime: 1
+rt_sigtimedwait: 1
+eventfd2: 1
+tgkill: 1
+gettid: 1
+sched_yield: 1
+flock: 1
diff --git a/proprietary/vendor/etc/wfdconfig.xml b/proprietary/vendor/etc/wfdconfig.xml
new file mode 100644
index 0000000..0e5256d
--- /dev/null
+++ b/proprietary/vendor/etc/wfdconfig.xml
@@ -0,0 +1,755 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+    <!--
+        Copyright (C) 2012 - 2019 Qualcomm Technologies, Inc.
+        All Rights Reserved.
+        Confidential and Proprietary - Qualcomm Technologies, Inc.
+    -->
+<WFDConfig>
+    <Capability>
+        <!--
+            Audio capabilities
+        -->
+        <AudioLPCM>
+            <Name>LPCM</Name>
+            <Valid>1</Valid>
+            <Channels>2</Channels>
+            <SamplingFreq>48000</SamplingFreq>
+            <Latency>33</Latency>
+        </AudioLPCM>
+
+        <AudioAAC>
+            <Name>AAC</Name>
+            <Valid>1</Valid>
+            <Channels>6</Channels>
+            <SamplingFreq>48000</SamplingFreq>
+            <Latency>0</Latency>
+        </AudioAAC>
+
+        <AudioAC3>
+            <Name>AC3</Name>
+            <Valid>0</Valid>
+            <Channels>0</Channels>
+            <SamplingFreq>0</SamplingFreq>
+            <Latency>0</Latency>
+        </AudioAC3>
+
+        <!--
+            Video extended capabilities for H264 codec
+        -->
+        <VideoFormats>
+
+        <VideoCodecHeader>
+        <TotalProfiles>3</TotalProfiles>
+        <PreferredDisplaySupport>0</PreferredDisplaySupport>
+        </VideoCodecHeader>
+             <!-- AVC Profile 0 - Constrained Baseline,
+                              1 - Constrained High,
+                              2 - Constrained High2,
+                              3 - BaseLine
+                              4 - Main
+                              5 - High
+                  HEVC Profile 0 - Main
+            -->
+
+            <!-- AVC Level  0 - 3.1,
+                            1 - 3.2,
+                            2 - 4.0,
+                            3 - 4.1,
+                            4 - 4.2,
+                            5 - 5,
+                            6 - 5.1,
+                            7 - 5.2
+
+                 HEVC Level 0 - 3.1,
+                            1 - 4,
+                            2 - 4.1,
+                            3 - 5,
+                            4 - 5.1
+            -->
+
+            <VideoCodec1>
+                <CodecName>H.264</CodecName>
+                <Profile>0</Profile>
+                <Level>6</Level>
+                <HorizontalResolution>3840</HorizontalResolution>
+                <VerticalResolution>2160</VerticalResolution>
+                <Latency>0</Latency>
+                <MinimumSliceSize>0</MinimumSliceSize>
+                <SliceEncodingParams>0</SliceEncodingParams>
+                <FrameRateControlSupp>1</FrameRateControlSupp>
+                <VideoFps>30</VideoFps>
+                <TranscodingMode>1</TranscodingMode>
+                <NonTranscodingMode>1</NonTranscodingMode>
+            </VideoCodec1>
+
+            <VideoCodec2>
+                <CodecName>H.264</CodecName>
+                <Profile>1</Profile>
+                <Level>6</Level>
+                <HorizontalResolution>3840</HorizontalResolution>
+                <VerticalResolution>2160</VerticalResolution>
+                <Latency>0</Latency>
+                <MinimumSliceSize>0</MinimumSliceSize>
+                <SliceEncodingParams>0</SliceEncodingParams>
+                <FrameRateControlSupp>1</FrameRateControlSupp>
+                <VideoFps>30</VideoFps>
+                <TranscodingMode>1</TranscodingMode>
+                <NonTranscodingMode>1</NonTranscodingMode>
+            </VideoCodec2>
+
+            <VideoCodec3>
+                <CodecName>H.265</CodecName>
+                <Profile>0</Profile>
+                <Level>4</Level>
+                <HorizontalResolution>3840</HorizontalResolution>
+                <VerticalResolution>2160</VerticalResolution>
+                <Latency>0</Latency>
+                <MinimumSliceSize>0</MinimumSliceSize>
+                <SliceEncodingParams>0</SliceEncodingParams>
+                <FrameRateControlSupp>1</FrameRateControlSupp>
+                <VideoFps>30</VideoFps>
+                <TranscodingMode>1</TranscodingMode>
+                <NonTranscodingMode>1</NonTranscodingMode>
+            </VideoCodec3>
+        </VideoFormats>
+
+      <!--
+          Aux streaming addition added for Direct streaming
+        -->
+        <AuxStreamInfo>
+            <Codec>
+            <Count>1</Count>
+            <Name1>PNG</Name1>
+            </Codec>
+
+            <!--
+                Limiting the number of layers to 5 in the overlay
+                Resolution is 720P
+            -->
+            <MaxOverlay>5</MaxOverlay>
+            <HRes>1280</HRes>
+            <VRes>720</VRes>
+            <Mode>CEA</Mode>
+        </AuxStreamInfo>
+
+        <!--
+            Standby Resume capability is supported
+        -->
+        <StandbyResumeCapability>
+            <Valid>1</Valid>
+        </StandbyResumeCapability>
+
+        <!--
+            Explicit AV format change
+            Not supported
+        -->
+        <AVFormatChange>
+            <Valid>0</Valid>
+            <AVInterval>0</AVInterval>
+        </AVFormatChange>
+
+        <!--
+            Frame skipping interval is in the scale of 500 msec or half second.
+            FrameInterval can be between 1 to 7,  according to the WFD spec.
+            0 means Frame skipping interval is infinite and recommended value is 0
+        -->
+        <FrameSkipping>
+            <Valid>1</Valid>
+            <FrameInterval>0</FrameInterval>
+        </FrameSkipping>
+
+        <!--  disable HDCP by default -->
+        <ContentProtection>
+            <Valid>0</Valid>
+            <!--
+                Valid values WFD_HDCP_2_0,
+                WFD_HDCP_2_1 and WFD_HDCP_2_2
+            -->
+            <Version>WFD_HDCP_2_2</Version>
+            <CPPort>6789</CPPort>
+            <!--
+                turn on/off audio encryption
+            -->
+            <EncryptAudio>0</EncryptAudio>
+        </ContentProtection>
+
+        <!--
+            To enable RTP dump at source
+        -->
+        <RTPDumpEnable>
+            <!-- DEPRECATED -->
+            <!-- For enabling RTP encoder dumping set
+                 persist.vendor.debug.rtp.enable_dump to 1
+                 /data/media/dump.ts
+            -->
+        </RTPDumpEnable>
+
+        <!--
+            UIBC settings
+        -->
+        <UIBC>
+            <UIBCValid>1</UIBCValid>                <!-- UIBC by default enabled -->
+            <M4Enable>1</M4Enable>                  <!-- 0/1 send UIBC enable in M4 or not -->
+            <M14Support>0</M14Support>              <!-- 0/1 M14 supported or not -->
+            <InputCategory>
+                <Generic>1</Generic>                <!-- 0/1 - support generic or not -->
+                <HID>1</HID>                        <!-- 0/1 - support HID or not -->
+            </InputCategory>
+
+            <!--  Supported input events  -->
+            <InputEvents>
+                <GenericInputEvents>
+                    <!-- 0/1 for all Input Event Types -->
+                    <Mouse>1</Mouse>
+                    <Keyboard>1</Keyboard>
+                    <SingleTouch>1</SingleTouch>
+                    <MultiTouch>1</MultiTouch>
+                    <JoyStick>0</JoyStick>
+                    <Camera>0</Camera>
+                    <Gesture>0</Gesture>
+                    <RemoteControl>0</RemoteControl>
+                </GenericInputEvents>
+                <!--
+                    Each input path will have a byte and support
+                    for the input types is indicated by setting a bit:
+                    KEYBOARD              BIT0
+                    MOUSE                 BIT1
+                    SINGLETOUCH           BIT2
+                    MULTITOUCH            BIT3
+                    JOYSTICK              BIT4
+                    CAMERA                BIT5
+                    GESTURE               BIT6
+                    REMOTECONTROL         BIT7
+                -->
+                <HIDInputPaths>
+                    <Infrared>0</Infrared>
+                    <USB>3</USB>
+                    <BT>0</BT>
+                    <Zigbee>0</Zigbee>
+                    <Wifi>0</Wifi>
+                    <NoSP>0</NoSP>
+                </HIDInputPaths>
+            </InputEvents>
+            <!--  TCP port on which UIBC connection established -->
+            <TcpPort>4321</TcpPort>
+        </UIBC>
+
+    </Capability>
+
+    <!--
+        Enabling Rtcp
+    -->
+    <RTCP>
+        <RtcpRRNotificationEnabled>1</RtcpRRNotificationEnabled>
+    </RTCP>
+
+    <!--
+        Dynamic bitrate adaptation is supported based on link speed
+        Based on the available link speed change video bitrate dynamically
+    -->
+    <DynamicBitrateAdaptation>1</DynamicBitrateAdaptation>
+
+    <!--
+        Send keep alive messages for every 50sec
+    -->
+    <SendKeepAlive>1</SendKeepAlive>
+
+    <!--
+        RTSP port on which RTSP server is running
+    -->
+    <RTSPPort>5550</RTSPPort>
+
+    <!--
+        To configure video core in SVS mode
+    -->
+    <PerformanceLevelSVSMode>0</PerformanceLevelSVSMode>
+    <!--
+        To configure video core in Nominal mode
+    -->
+    <PerformanceLevelNominalMode>0</PerformanceLevelNominalMode>
+    <!--
+        To configure video core in Turbo mode
+    -->
+    <PerformanceLevelTurboMode>0</PerformanceLevelTurboMode>
+
+    <!--
+        To configure minqp value
+    -->
+    <MinQPValue>22</MinQPValue>
+
+    <!--
+        To configure maxqp value
+    -->
+    <MaxQPValue>44</MaxQPValue>
+
+    <!--
+        Bitrate settings for each mode
+    -->
+    <BitrateTable>
+        <!--
+            Bitrate table for Audio formats
+        -->
+        <AAC>
+        <!--
+            Bitrate table for AAC
+        -->
+            <BIT0>
+                <MaxBitrate>256000</MaxBitrate>
+                <MinBitrate>256000</MinBitrate>
+            </BIT0>
+            <BIT1>
+                <MaxBitrate>384000</MaxBitrate>
+                <MinBitrate>384000</MinBitrate>
+            </BIT1>
+            <BIT2>
+                <MaxBitrate>512000</MaxBitrate>
+                <MinBitrate>512000</MinBitrate>
+            </BIT2>
+        </AAC>
+
+        <!--
+            CEA Min and Max bit rates for each resolution
+            Will configure the video core with MaxBitrate
+            Based on the available link speed video bitrate
+            can go upto MinBitrate
+        -->
+        <CEA>
+          <!-- 640x480p60  -->
+            <BIT0>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT0>
+          <!-- 720x480p60 -->
+            <BIT1>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT1>
+          <!-- 720x480i60 -->
+            <BIT2>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT2>
+          <!-- 720x576p50  -->
+            <BIT3>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT3>
+          <!-- 720x576i50  -->
+            <BIT4>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT4>
+          <!-- 1280x720p30  -->
+            <BIT5>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT5>
+          <!-- 1280x720p60  -->
+            <BIT6>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>15000000</MaxBitrate>
+            </BIT6>
+          <!-- 1920x1080p30  -->
+            <BIT7>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT7>
+          <!-- 1920x1080p60  -->
+            <BIT8>
+                <MinBitrate>7000000</MinBitrate>
+                <MaxBitrate>13000000</MaxBitrate>
+            </BIT8>
+          <!-- 1920x1080i60  -->
+            <BIT9>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT9>
+          <!-- 1280x720p25  -->
+            <BIT10>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT10>
+          <!-- 1280x720p50  -->
+            <BIT11>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT11>
+          <!-- 1920x1080p25  -->
+            <BIT12>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT12>
+          <!-- 1920x1080p50  -->
+            <BIT13>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT13>
+          <!-- 1920x1080i50  -->
+            <BIT14>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT14>
+          <!-- 1280x720p24  -->
+            <BIT15>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT15>
+          <!-- 1920x1080p24  -->
+            <BIT16>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT16>
+          <!--  3840x2160p24  -->
+            <BIT17>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>15000000</MaxBitrate>
+            </BIT17>
+          <!--  3840x2160 p25  -->
+            <BIT18>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>15000000</MaxBitrate>
+            </BIT18>
+          <!--  3840x2160p30 -->
+            <BIT19>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>15000000</MaxBitrate>
+            </BIT19>
+          <!--  3840x2160p50  -->
+            <BIT20>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT20>
+          <!--  3840x2160p60 -->
+            <BIT21>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT21>
+          <!--  4096x2160p24  -->
+            <BIT22>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>15000000</MaxBitrate>
+            </BIT22>
+          <!--  4096x2160p25  -->
+            <BIT23>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>15000000</MaxBitrate>
+            </BIT23>
+          <!--  4096x2160p30  -->
+            <BIT24>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>15000000</MaxBitrate>
+            </BIT24>
+          <!--  4096x2160p50  -->
+            <BIT25>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT25>
+          <!--  4096x2160 p60 -->
+            <BIT26>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT26>
+        </CEA>
+
+        <!--
+            VESA Min and Max bit rates for each resolution
+            Will configure the video core with MaxBitrate
+            Based on the available link speed video bitrate
+            can go upto MinBitrate
+        -->
+        <VESA>
+          <!--  800x600p30 -->
+            <BIT0>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT0>
+          <!--  800x600p60 -->
+            <BIT1>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>5000000</MaxBitrate>
+            </BIT1>
+          <!--  1024x768p30 -->
+            <BIT2>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT2>
+          <!--  1024x768p60 -->
+            <BIT3>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT3>
+          <!--  1152x864p30 -->
+            <BIT4>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT4>
+          <!--  1152x864p60 -->
+            <BIT5>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>15000000</MaxBitrate>
+            </BIT5>
+          <!--  1280x768p30 -->
+            <BIT6>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT6>
+          <!--  1280x768p60 -->
+            <BIT7>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT7>
+          <!--  1280x800p30 -->
+            <BIT8>
+                <MinBitrate>3500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT8>
+          <!--  1280x800p60 -->
+            <BIT9>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>15000000</MaxBitrate>
+            </BIT9>
+          <!--  1360x768p30 -->
+            <BIT10>
+                <MinBitrate>3500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT10>
+          <!--  1360x768p60 -->
+            <BIT11>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>15000000</MaxBitrate>
+            </BIT11>
+          <!--  1366x768p30 -->
+            <BIT12>
+                <MinBitrate>2500000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT12>
+          <!--  1366x768p60 -->
+            <BIT13>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT13>
+          <!--  1280x1024p30 -->
+            <BIT14>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT14>
+          <!--  1280x1024p60 -->
+            <BIT15>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT15>
+          <!--  1400x1050p30 -->
+            <BIT16>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT16>
+          <!--  1400x1050p60 -->
+            <BIT17>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT17>
+          <!--  1440x900p30 -->
+            <BIT18>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT18>
+          <!--  1440x900p60 -->
+            <BIT19>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT19>
+          <!--  1600x900p30 -->
+            <BIT20>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT20>
+          <!--  1600x900p60 -->
+            <BIT21>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT21>
+          <!--  1600x1200p30 -->
+            <BIT22>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT22>
+          <!--  1600x1200p60 -->
+            <BIT23>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT23>
+          <!--  1680x1024p30 -->
+            <BIT24>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT24>
+          <!--  1680x1024p60 -->
+            <BIT25>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT25>
+          <!--  1680x1050p30 -->
+            <BIT26>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT26>
+          <!--  1680x1050p60 -->
+            <BIT27>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT27>
+          <!--  1920x1200p30 -->
+            <BIT28>
+                <MinBitrate>5000000</MinBitrate>
+                <MaxBitrate>10000000</MaxBitrate>
+            </BIT28>
+          <!--  1920x1200p60 -->
+            <BIT29>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT29>
+          <!--  2560x1440p30  -->
+            <BIT30>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>15000000</MaxBitrate>
+            </BIT30>
+          <!--  2560x1440p60  -->
+            <BIT31>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>20000000</MaxBitrate>
+            </BIT31>
+          <!--  2560x1600p30  -->
+            <BIT32>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>15000000</MaxBitrate>
+            </BIT32>
+          <!--  2560x1600p60  -->
+            <BIT33>
+                <MinBitrate>10000000</MinBitrate>
+                <MaxBitrate>30000000</MaxBitrate>
+            </BIT33>
+        </VESA>
+
+        <!--
+            HH Min and Max bit rates for each resolution
+            Will configure the video core with MaxBitrate
+            Based on the available link speed video bitrate
+            can go upto MinBitrate
+        -->
+        <HH>
+          <!--  800x480p30  -->
+            <BIT0>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT0>
+          <!--  800x480p60  -->
+            <BIT1>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT1>
+          <!--  854x480p30  -->
+            <BIT2>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT2>
+          <!--  854x480p60  -->
+            <BIT3>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT3>
+          <!--  864x480p30  -->
+            <BIT4>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT4>
+          <!--  864x480p60  -->
+            <BIT5>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT5>
+          <!--  640x360p30  -->
+            <BIT6>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT6>
+          <!--  640x360p60  -->
+            <BIT7>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT7>
+          <!--  960x540p30  -->
+            <BIT8>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT8>
+          <!--  960x540p60  -->
+            <BIT9>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT9>
+          <!--  848x480p30  -->
+            <BIT10>
+                <MinBitrate>500000</MinBitrate>
+                <MaxBitrate>2000000</MaxBitrate>
+            </BIT10>
+          <!--  848x480p60  -->
+            <BIT11>
+                <MinBitrate>1000000</MinBitrate>
+                <MaxBitrate>4000000</MaxBitrate>
+            </BIT11>
+        </HH>
+    </BitrateTable>
+
+    <!--
+        To disable/enable audio stream playback
+        support during power suspend - 0 or 1
+    -->
+    <AudioStreamInSuspend>1</AudioStreamInSuspend>
+
+    <!--
+        Compensation delay for audio
+        This is maintain good AV sync in the mux TS A + V stream Recommended
+        value is 150 msec arrived at this number after fine tuning OEMs can
+        change this value in case they want
+    -->
+    <AudioAVSyncDelay>-150</AudioAVSyncDelay>
+
+    <!--
+        enable/disable CyclicIntraRefresh
+    -->
+    <CyclicIntraRefresh>0</CyclicIntraRefresh>
+
+    <!--
+        NumberOfMacroBlocks for V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB
+    -->
+    <CIRNumberOfMacroBlocks>50</CIRNumberOfMacroBlocks>
+
+    <!--
+        Enable/Disable NALU byte to detect end of AU
+    -->
+    <DisableFillerNalU>1</DisableFillerNalU>
+
+    <!--
+        Enable/Disable to generate blank frame during suspend/resume
+    -->
+    <GenerateBlankFrame>0</GenerateBlankFrame>
+
+    <!--
+        To disable fixed interval of IDR frames, set PeriodicIDRValid to 0.
+        Set the duration in seconds after which full refresh is required in
+        the PeriodicIDRInterval
+        Recommended value is 5 secs
+    -->
+    <PeriodicIDRSettings>
+        <PeriodicIDRValid>1</PeriodicIDRValid>
+        <PeriodicIDRInterval>5</PeriodicIDRInterval>
+    </PeriodicIDRSettings>
+
+
+    <!-- Direct Streaming Feature support -->
+    <StreamingSupport>1</StreamingSupport>
+
+    <!-- Enfore HDCP for Direct Streaming -->
+    <DSRequiresHDCP>1</DSRequiresHDCP>
+
+</WFDConfig>
diff --git a/proprietary/vendor/lib/libFileMux_proprietary.so b/proprietary/vendor/lib/libFileMux_proprietary.so
new file mode 100644
index 0000000..f6ed1b4
Binary files /dev/null and b/proprietary/vendor/lib/libFileMux_proprietary.so differ
diff --git a/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so b/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so
new file mode 100644
index 0000000..fc56cfa
Binary files /dev/null and b/proprietary/vendor/lib/libmmrtpdecoder_proprietary.so differ
diff --git a/proprietary/vendor/lib/libmmrtpencoder_proprietary.so b/proprietary/vendor/lib/libmmrtpencoder_proprietary.so
new file mode 100644
index 0000000..7af226d
Binary files /dev/null and b/proprietary/vendor/lib/libmmrtpencoder_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so b/proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so
new file mode 100644
index 0000000..bc7994b
Binary files /dev/null and b/proprietary/vendor/lib/libwfdcodecv4l2_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdcommonutils_proprietary.so b/proprietary/vendor/lib/libwfdcommonutils_proprietary.so
new file mode 100644
index 0000000..ca92fa8
Binary files /dev/null and b/proprietary/vendor/lib/libwfdcommonutils_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdconfigutils_proprietary.so b/proprietary/vendor/lib/libwfdconfigutils_proprietary.so
new file mode 100644
index 0000000..153eb63
Binary files /dev/null and b/proprietary/vendor/lib/libwfdconfigutils_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so b/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so
new file mode 100644
index 0000000..e7da707
Binary files /dev/null and b/proprietary/vendor/lib/libwfddisplayconfig_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdhdcpcp.so b/proprietary/vendor/lib/libwfdhdcpcp.so
new file mode 100644
index 0000000..e5c2669
Binary files /dev/null and b/proprietary/vendor/lib/libwfdhdcpcp.so differ
diff --git a/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so b/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so
new file mode 100644
index 0000000..5b0ede4
Binary files /dev/null and b/proprietary/vendor/lib/libwfdhdcpservice_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdmminterface_proprietary.so b/proprietary/vendor/lib/libwfdmminterface_proprietary.so
new file mode 100644
index 0000000..ae568af
Binary files /dev/null and b/proprietary/vendor/lib/libwfdmminterface_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdmmservice_proprietary.so b/proprietary/vendor/lib/libwfdmmservice_proprietary.so
new file mode 100644
index 0000000..9f07e30
Binary files /dev/null and b/proprietary/vendor/lib/libwfdmmservice_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdmmsrc_proprietary.so b/proprietary/vendor/lib/libwfdmmsrc_proprietary.so
new file mode 100644
index 0000000..474a367
Binary files /dev/null and b/proprietary/vendor/lib/libwfdmmsrc_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdmodulehdcpsession.so b/proprietary/vendor/lib/libwfdmodulehdcpsession.so
new file mode 100644
index 0000000..5624742
Binary files /dev/null and b/proprietary/vendor/lib/libwfdmodulehdcpsession.so differ
diff --git a/proprietary/vendor/lib/libwfdrtsp_proprietary.so b/proprietary/vendor/lib/libwfdrtsp_proprietary.so
new file mode 100644
index 0000000..0a2d745
Binary files /dev/null and b/proprietary/vendor/lib/libwfdrtsp_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdsessionmodule.so b/proprietary/vendor/lib/libwfdsessionmodule.so
new file mode 100644
index 0000000..fcbb24b
Binary files /dev/null and b/proprietary/vendor/lib/libwfdsessionmodule.so differ
diff --git a/proprietary/vendor/lib/libwfdsourcesession_proprietary.so b/proprietary/vendor/lib/libwfdsourcesession_proprietary.so
new file mode 100644
index 0000000..fc5c8e1
Binary files /dev/null and b/proprietary/vendor/lib/libwfdsourcesession_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdsourcesm_proprietary.so b/proprietary/vendor/lib/libwfdsourcesm_proprietary.so
new file mode 100644
index 0000000..50aefd1
Binary files /dev/null and b/proprietary/vendor/lib/libwfdsourcesm_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfduibcinterface_proprietary.so b/proprietary/vendor/lib/libwfduibcinterface_proprietary.so
new file mode 100644
index 0000000..52e77f4
Binary files /dev/null and b/proprietary/vendor/lib/libwfduibcinterface_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfduibcsink_proprietary.so b/proprietary/vendor/lib/libwfduibcsink_proprietary.so
new file mode 100644
index 0000000..f909dcd
Binary files /dev/null and b/proprietary/vendor/lib/libwfduibcsink_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so b/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so
new file mode 100644
index 0000000..a4e6353
Binary files /dev/null and b/proprietary/vendor/lib/libwfduibcsinkinterface_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfduibcsrc_proprietary.so b/proprietary/vendor/lib/libwfduibcsrc_proprietary.so
new file mode 100644
index 0000000..9ce96e0
Binary files /dev/null and b/proprietary/vendor/lib/libwfduibcsrc_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so b/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so
new file mode 100644
index 0000000..fe305ea
Binary files /dev/null and b/proprietary/vendor/lib/libwfduibcsrcinterface_proprietary.so differ
diff --git a/proprietary/vendor/lib/libwfdutils_proprietary.so b/proprietary/vendor/lib/libwfdutils_proprietary.so
new file mode 100644
index 0000000..8cd8b41
Binary files /dev/null and b/proprietary/vendor/lib/libwfdutils_proprietary.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so
new file mode 100644
index 0000000..7c1ede5
Binary files /dev/null and b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysession@1.0.so differ
diff --git a/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so
new file mode 100644
index 0000000..208fd11
Binary files /dev/null and b/proprietary/vendor/lib/vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl.so differ
diff --git a/surya-vendor.mk b/surya-vendor.mk
index 02faf42..7d4b5b7 100644
--- a/surya-vendor.mk
+++ b/surya-vendor.mk
@@ -8,12 +8,16 @@ PRODUCT_SOONG_NAMESPACES += \
 PRODUCT_COPY_FILES += \
     vendor/xiaomi/surya/proprietary/system_ext/etc/dpm/dpm.conf:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/dpm/dpm.conf \
     vendor/xiaomi/surya/proprietary/system_ext/etc/init/dpmd.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/dpmd.rc \
+    vendor/xiaomi/surya/proprietary/system_ext/etc/init/wfdservice.rc:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/init/wfdservice.rc \
     vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/audiosphere.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/audiosphere.xml \
     vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
     vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/com.qti.dpmframework.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.qti.dpmframework.xml \
     vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/dpmapi.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/dpmapi.xml \
     vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/qcrilhook.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qcrilhook.xml \
     vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/qti_permissions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/qti_permissions.xml \
+    vendor/xiaomi/surya/proprietary/system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml \
+    vendor/xiaomi/surya/proprietary/system_ext/etc/seccomp_policy/wfdservice64.policy:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/seccomp_policy/wfdservice64.policy \
+    vendor/xiaomi/surya/proprietary/system_ext/etc/wfdconfigsink.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/wfdconfigsink.xml \
     vendor/xiaomi/surya/proprietary/vendor/etc/acdbdata/IDP/IDP_Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/IDP/IDP_Bluetooth_cal.acdb \
     vendor/xiaomi/surya/proprietary/vendor/etc/acdbdata/IDP/IDP_Codec_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/IDP/IDP_Codec_cal.acdb \
     vendor/xiaomi/surya/proprietary/vendor/etc/acdbdata/IDP/IDP_General_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/IDP/IDP_General_cal.acdb \
@@ -106,6 +110,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/android.hardware.keymaster@4.1-service-qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.keymaster@4.1-service-qti.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/cnd.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cnd.rc \
+    vendor/xiaomi/surya/proprietary/vendor/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/com.qualcomm.qti.wifidisplayhal@1.0-service.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/dataadpl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataadpl.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/dataqti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dataqti.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/dpmQmiMgr.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dpmQmiMgr.rc \
@@ -132,11 +137,15 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/vendor.qti.tftp.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.tftp.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/vendor.sensors.qti.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.sensors.qti.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/init/vppservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vppservice.rc \
+    vendor/xiaomi/surya/proprietary/vendor/etc/init/wfdvndservice.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wfdvndservice.rc \
     vendor/xiaomi/surya/proprietary/vendor/etc/permissions/com.fingerprints.extension.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.fingerprints.extension.xml \
     vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/codec2.vendor.base.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.base.policy \
     vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/codec2.vendor.ext.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.ext.policy \
     vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/imsrtp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/imsrtp.policy \
     vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/vendor.qti.hardware.dsp.policy \
+    vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/wfdhdcphalservice.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/wfdhdcphalservice.policy \
+    vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/wfdvndservice.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/wfdvndservice.policy \
+    vendor/xiaomi/surya/proprietary/vendor/etc/seccomp_policy/wifidisplayhalservice.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/wifidisplayhalservice.policy \
     vendor/xiaomi/surya/proprietary/vendor/etc/sensors/config/adux1050_0.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/adux1050_0.json \
     vendor/xiaomi/surya/proprietary/vendor/etc/sensors/config/bmi160_0.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/bmi160_0.json \
     vendor/xiaomi/surya/proprietary/vendor/etc/sensors/config/lsm6ds3c_0.json:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/config/lsm6ds3c_0.json \
@@ -194,6 +203,7 @@ PRODUCT_COPY_FILES += \
     vendor/xiaomi/surya/proprietary/vendor/etc/thermal-phone.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-phone.conf \
     vendor/xiaomi/surya/proprietary/vendor/etc/thermal-tgame.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermal-tgame.conf \
     vendor/xiaomi/surya/proprietary/vendor/etc/thermald-devices.conf:$(TARGET_COPY_OUT_VENDOR)/etc/thermald-devices.conf \
+    vendor/xiaomi/surya/proprietary/vendor/etc/wfdconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/wfdconfig.xml \
     vendor/xiaomi/surya/proprietary/vendor/firmware/CAMERA_ICP.elf:$(TARGET_COPY_OUT_VENDOR)/firmware/CAMERA_ICP.elf \
     vendor/xiaomi/surya/proprietary/vendor/firmware/a615_zap.b00:$(TARGET_COPY_OUT_VENDOR)/firmware/a615_zap.b00 \
     vendor/xiaomi/surya/proprietary/vendor/firmware/a615_zap.b01:$(TARGET_COPY_OUT_VENDOR)/firmware/a615_zap.b01 \
@@ -319,6 +329,7 @@ PRODUCT_PACKAGES += \
     btaudio_offload_if \
     audio.primary.sm6150 \
     vendor.qti.hardware.bluetooth_audio@2.1-impl \
+    libFileMux_proprietary \
     libOmxAacDec \
     libOmxAlacDec \
     libOmxAmrDec \
@@ -344,6 +355,8 @@ PRODUCT_PACKAGES += \
     libdsd2pcm \
     libhdmiedid \
     libhfp \
+    libmmrtpdecoder_proprietary \
+    libmmrtpencoder_proprietary \
     libmulawdec \
     libqcodec2 \
     libqtigef \
@@ -351,8 +364,30 @@ PRODUCT_PACKAGES += \
     libsndmonitor \
     libspkrprot \
     libvppclient \
+    libwfdcodecv4l2_proprietary \
+    libwfdcommonutils_proprietary \
+    libwfdconfigutils_proprietary \
+    libwfddisplayconfig_proprietary \
+    libwfdhdcpcp \
+    libwfdhdcpservice_proprietary \
+    libwfdmminterface_proprietary \
+    libwfdmmservice_proprietary \
+    libwfdmmsrc_proprietary \
+    libwfdmodulehdcpsession \
+    libwfdrtsp_proprietary \
+    libwfdsessionmodule \
+    libwfdsourcesession_proprietary \
+    libwfdsourcesm_proprietary \
+    libwfduibcinterface_proprietary \
+    libwfduibcsink_proprietary \
+    libwfduibcsinkinterface_proprietary \
+    libwfduibcsrc_proprietary \
+    libwfduibcsrcinterface_proprietary \
+    libwfdutils_proprietary \
     libasphere \
     libshoebox \
+    vendor.qti.hardware.wifidisplaysession@1.0_vendor \
+    vendor.qti.hardware.wifidisplaysessionl@1.0-halimpl \
     android.hardware.camera.provider@2.4-legacy \
     com.qti.sensor.ofilm_hi259 \
     com.qti.sensor.ofilm_imx682 \
@@ -748,8 +783,31 @@ PRODUCT_PACKAGES += \
     libfm-hci \
     libimscamera_jni \
     libimsmedia_jni \
+    libmmosal \
+    libmmparser_lite \
+    libmmrtpdecoder \
+    libmmrtpencoder \
+    libwfdavenhancements \
+    libwfdclient \
+    libwfdcommonutils \
+    libwfdconfigutils \
+    libwfddisplayconfig \
+    libwfdmminterface \
+    libwfdmmsink \
+    libwfdmmsrc_system \
+    libwfdnative \
+    libwfdrtsp \
+    libwfdservice \
+    libwfdsinksm \
+    libwfduibcinterface \
+    libwfduibcsink \
+    libwfduibcsinkinterface \
+    libwfduibcsrc \
+    libwfduibcsrcinterface \
     vendor.qti.diaghal@1.0 \
     vendor.qti.hardware.fm@1.0 \
+    vendor.qti.hardware.wifidisplaysession@1.0 \
+    vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk \
     vendor.qti.imsrtpservice@3.0 \
     CACertService \
     CneApp \
@@ -759,9 +817,11 @@ PRODUCT_PACKAGES += \
     HotwordEnrollmentOKGoogleHEXAGON \
     HotwordEnrollmentXGoogleHEXAGON \
     QtiTelephonyService \
+    WfdService \
     dpmserviceapp \
     ims \
     qcrilmsgtunnel \
+    WfdCommon \
     tcmclient \
     com.fingerprints.extension \
     audiosphere \
@@ -813,15 +873,22 @@ PRODUCT_PACKAGES += \
     tftp_server \
     time_daemon \
     vppservice \
+    wfdvndservice \
+    wifidisplayhalservice \
     xtra-daemon \
-    dpmd
+    dpmd \
+    wfdservice64
 
 PRODUCT_PACKAGES += \
     system_ext_priv-app_ims_lib_arm64_libimscamera_jni_so \
     system_ext_priv-app_ims_lib_arm64_libimsmedia_jni_so \
+    system_ext_priv-app_WfdService_lib_arm64_libwfdnative_so \
     vendor_lib_libEGL_adreno_so \
     vendor_lib_libGLESv2_adreno_so \
     vendor_lib_libq3dtools_adreno_so \
     vendor_lib64_libEGL_adreno_so \
     vendor_lib64_libGLESv2_adreno_so \
     vendor_lib64_libq3dtools_adreno_so
+
+PRODUCT_BOOT_JARS += \
+    WfdCommon