diff --git a/sdm660-common/Android.bp b/sdm660-common/Android.bp
index 552d80b..189eba4 100644
--- a/sdm660-common/Android.bp
+++ b/sdm660-common/Android.bp
@@ -2699,30 +2699,6 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
-cc_prebuilt_library_shared {
-    name: "libqcodec2",
-    owner: "asus",
-    strip: {
-        none: true,
-    },
-    target: {
-        android_arm: {
-            srcs: [
-                "proprietary/vendor/lib/libqcodec2.so",
-            ],
-        },
-        android_arm64: {
-            srcs: [
-                "proprietary/vendor/lib64/libqcodec2.so",
-            ],
-        },
-    },
-    compile_multilib: "both",
-    check_elf_files: false,
-    prefer: true,
-    soc_specific: true,
-}
-
 cc_prebuilt_library_shared {
     name: "libqti-perfd-client",
     owner: "asus",
diff --git a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.media.c2@1.0-service b/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.media.c2@1.0-service
deleted file mode 100644
index 14cf16f..0000000
Binary files a/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.media.c2@1.0-service and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.media.c2@1.0-service.rc b/sdm660-common/proprietary/vendor/etc/init/vendor.qti.media.c2@1.0-service.rc
deleted file mode 100644
index 2f29a12..0000000
--- a/sdm660-common/proprietary/vendor/etc/init/vendor.qti.media.c2@1.0-service.rc
+++ /dev/null
@@ -1,7 +0,0 @@
-service vendor-qti-media-c2-hal-1-0 /vendor/bin/hw/vendor.qti.media.c2@1.0-service
-    class hal
-    user mediacodec
-    group mediadrm camera drmrpc system
-    ioprio rt 4
-    writepid /dev/cpuset/foreground/tasks
-
diff --git a/sdm660-common/proprietary/vendor/etc/seccomp_policy/codec2.vendor.base.policy b/sdm660-common/proprietary/vendor/etc/seccomp_policy/codec2.vendor.base.policy
deleted file mode 100644
index 9d3a478..0000000
--- a/sdm660-common/proprietary/vendor/etc/seccomp_policy/codec2.vendor.base.policy
+++ /dev/null
@@ -1,89 +0,0 @@
-###################################################################################################
-# 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.
-
-futex: 1
-# ioctl calls are filtered via the selinux policy.
-ioctl: 1
-sched_yield: 1
-close: 1
-dup: 1
-ppoll: 1
-mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE
-memfd_create: 1
-ftruncate: 1
-ftruncate64: 1
-
-mremap: arg3 == 3
-munmap: 1
-prctl: 1
-getuid32: 1
-writev: 1
-sigaltstack: 1
-clone: 1
-exit: 1
-lseek: 1
-rt_sigprocmask: 1
-openat: 1
-open: 1
-fstat64: 1
-write: 1
-nanosleep: 1
-setpriority: 1
-set_tid_address: 1
-getdents64: 1
-readlinkat: 1
-readlink: 1
-read: 1
-pread64: 1
-fstatfs64: 1
-gettimeofday: 1
-faccessat: 1
-_llseek: 1
-fstatat64: 1
-ugetrlimit: 1
-exit_group: 1
-restart_syscall: 1
-rt_sigreturn: 1
-getrandom: 1
-madvise: 1
-
-# crash dump policy additions
-sigreturn: 1
-clock_gettime: 1
-futex: 1
-getpid: 1
-gettid: 1
-pipe2: 1
-recvmsg: 1
-process_vm_readv: 1
-tgkill: 1
-rt_sigaction: 1
-rt_tgsigqueueinfo: 1
-#prctl: arg0 == PR_GET_NO_NEW_PRIVS || arg0 == 0x53564d41
-#mprotect: arg2 in 0x1|0x2
-#mmap2: arg2 in 0x1|0x2
-geteuid32: 1
-getgid32: 1
-getegid32: 1
-getgroups32: 1
diff --git a/sdm660-common/proprietary/vendor/etc/seccomp_policy/codec2.vendor.ext.policy b/sdm660-common/proprietary/vendor/etc/seccomp_policy/codec2.vendor.ext.policy
deleted file mode 100644
index 07b7bf7..0000000
--- a/sdm660-common/proprietary/vendor/etc/seccomp_policy/codec2.vendor.ext.policy
+++ /dev/null
@@ -1,9 +0,0 @@
-# device specific syscalls
-pselect6: 1
-eventfd2: 1
-sendto: 1
-recvfrom: 1
-_llseek: 1
-sysinfo: 1
-getcwd: 1
-getdents64: 1
diff --git a/sdm660-common/proprietary/vendor/lib/libAlacSwDec.so b/sdm660-common/proprietary/vendor/lib/libAlacSwDec.so
new file mode 100644
index 0000000..e62b668
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libAlacSwDec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libApeSwDec.so b/sdm660-common/proprietary/vendor/lib/libApeSwDec.so
new file mode 100644
index 0000000..c26a432
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libApeSwDec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libFlacSwDec.so b/sdm660-common/proprietary/vendor/lib/libFlacSwDec.so
new file mode 100644
index 0000000..bec887f
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libFlacSwDec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOmxAacDec.so b/sdm660-common/proprietary/vendor/lib/libOmxAacDec.so
new file mode 100644
index 0000000..53a4400
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libOmxAacDec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOmxAlacDec.so b/sdm660-common/proprietary/vendor/lib/libOmxAlacDec.so
new file mode 100644
index 0000000..cd42526
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libOmxAlacDec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOmxAlacDecSw.so b/sdm660-common/proprietary/vendor/lib/libOmxAlacDecSw.so
new file mode 100644
index 0000000..3f2ae4b
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libOmxAlacDecSw.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOmxAmrDec.so b/sdm660-common/proprietary/vendor/lib/libOmxAmrDec.so
new file mode 100644
index 0000000..91f3cb6
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libOmxAmrDec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOmxAmrwbplusDec.so b/sdm660-common/proprietary/vendor/lib/libOmxAmrwbplusDec.so
new file mode 100644
index 0000000..c3bdf07
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libOmxAmrwbplusDec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOmxApeDec.so b/sdm660-common/proprietary/vendor/lib/libOmxApeDec.so
new file mode 100644
index 0000000..90af809
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libOmxApeDec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOmxApeDecSw.so b/sdm660-common/proprietary/vendor/lib/libOmxApeDecSw.so
new file mode 100644
index 0000000..1b14785
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libOmxApeDecSw.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOmxDsdDec.so b/sdm660-common/proprietary/vendor/lib/libOmxDsdDec.so
new file mode 100644
index 0000000..e39d88b
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libOmxDsdDec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOmxEvrcDec.so b/sdm660-common/proprietary/vendor/lib/libOmxEvrcDec.so
new file mode 100644
index 0000000..5753b6f
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libOmxEvrcDec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOmxG711Dec.so b/sdm660-common/proprietary/vendor/lib/libOmxG711Dec.so
new file mode 100644
index 0000000..992bf24
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libOmxG711Dec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOmxQcelp13Dec.so b/sdm660-common/proprietary/vendor/lib/libOmxQcelp13Dec.so
new file mode 100644
index 0000000..e004ee9
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libOmxQcelp13Dec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libOmxWmaDec.so b/sdm660-common/proprietary/vendor/lib/libOmxWmaDec.so
new file mode 100644
index 0000000..873e8b8
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libOmxWmaDec.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libdsd2pcm.so b/sdm660-common/proprietary/vendor/lib/libdsd2pcm.so
new file mode 100644
index 0000000..e1b25ac
Binary files /dev/null and b/sdm660-common/proprietary/vendor/lib/libdsd2pcm.so differ
diff --git a/sdm660-common/proprietary/vendor/lib/libqcodec2.so b/sdm660-common/proprietary/vendor/lib/libqcodec2.so
deleted file mode 100644
index 29ac9fa..0000000
Binary files a/sdm660-common/proprietary/vendor/lib/libqcodec2.so and /dev/null differ
diff --git a/sdm660-common/proprietary/vendor/lib64/libqcodec2.so b/sdm660-common/proprietary/vendor/lib64/libqcodec2.so
deleted file mode 100644
index ac4eff5..0000000
Binary files a/sdm660-common/proprietary/vendor/lib64/libqcodec2.so and /dev/null differ
diff --git a/sdm660-common/sdm660-common-vendor.mk b/sdm660-common/sdm660-common-vendor.mk
index 95c518f..204304f 100644
--- a/sdm660-common/sdm660-common-vendor.mk
+++ b/sdm660-common/sdm660-common-vendor.mk
@@ -180,7 +180,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.3-service.widevine \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.gatekeeper@1.0-service-qti \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/android.hardware.keymaster@3.0-service-qti:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.keymaster@3.0-service-qti \
-    vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.media.c2@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.media.c2@1.0-service \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/qcrild:$(TARGET_COPY_OUT_VENDOR)/bin/hw/qcrild \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.alarm@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.alarm@1.0-service \
     vendor/asus/sdm660-common/proprietary/vendor/bin/hw/vendor.qti.hardware.perf@2.2-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.qti.hardware.perf@2.2-service \
@@ -260,7 +259,6 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/qcrild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/qcrild.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.adsprpc-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.adsprpc-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.alarm@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.alarm@1.0-service.rc \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.media.c2@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.media.c2@1.0-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.dsp@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.dsp@1.0-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.perf@2.2-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.perf@2.2-service.rc \
     vendor/asus/sdm660-common/proprietary/vendor/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.qti.hardware.qseecom@1.0-service.rc \
@@ -277,12 +275,26 @@ PRODUCT_COPY_FILES += \
     vendor/asus/sdm660-common/proprietary/vendor/etc/seccomp_policy/imsrtp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/imsrtp.policy \
     vendor/asus/sdm660-common/proprietary/vendor/etc/seccomp_policy/qti-systemd.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/qti-systemd.policy \
     vendor/asus/sdm660-common/proprietary/vendor/etc/seccomp_policy/vendor.qti.hardware.dsp.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/vendor.qti.hardware.dsp.policy \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/seccomp_policy/codec2.vendor.ext.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.ext.policy \
-    vendor/asus/sdm660-common/proprietary/vendor/etc/seccomp_policy/codec2.vendor.base.policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/codec2.vendor.base.policy \
     vendor/asus/sdm660-common/proprietary/vendor/etc/gpfspath_oem_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/gpfspath_oem_config.xml \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libAlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libAlacSwDec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libApeSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libApeSwDec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libFlacSwDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libFlacSwDec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxAacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAacDec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxAlacDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAlacDec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxAlacDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAlacDecSw.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxAmrDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAmrDec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxAmrwbplusDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxAmrwbplusDec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxApeDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxApeDec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxApeDecSw.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxApeDecSw.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxDsdDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxDsdDec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxEvrcDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxEvrcDec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxG711Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxG711Dec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxQcelp13Dec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxQcelp13Dec.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libOmxWmaDec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOmxWmaDec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libadm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadm.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libadpcmdec.so:$(TARGET_COPY_OUT_VENDOR)/lib/libadpcmdec.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libdrc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdrc.so \
+    vendor/asus/sdm660-common/proprietary/vendor/lib/libdsd2pcm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libdsd2pcm.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libgcs-calwrapper.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgcs-calwrapper.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libgcs-ipc.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgcs-ipc.so \
     vendor/asus/sdm660-common/proprietary/vendor/lib/libgcs-osal.so:$(TARGET_COPY_OUT_VENDOR)/lib/libgcs-osal.so \
@@ -683,7 +695,6 @@ PRODUCT_PACKAGES += \
     libqmi_encdec \
     libqmiservices \
     libqseed3 \
-    libqcodec2 \
     libqti-perfd-client \
     libqti-perfd \
     libqti-util \