diff --git a/configure.ac b/configure.ac
index 4bb6444..6302ea9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,6 +108,7 @@
 AM_CONDITIONAL([GEF], [test x$AUDIO_FEATURE_ENABLED_GEF_SUPPORT = xtrue])
 AM_CONDITIONAL([APTX_DECODER], [test x$AUDIO_FEATURE_ENABLED_APTX_DECODER = xtrue])
 AM_CONDITIONAL([ADSP_HDLR], [test x$AUDIO_FEATURE_ADSP_HDLR_ENABLED = xtrue])
+AM_CONDITIONAL([AUDIO_IP_HDLR], [test x$AUDIO_FEATURE_IP_HDLR_ENABLED = xtrue])
 AM_CONDITIONAL([SPLIT_A2DP], [test x$AUDIO_FEATURE_ENABLED_SPLIT_A2DP = xtrue])
 
 AC_CONFIG_FILES([ \
diff --git a/hal/Android.mk b/hal/Android.mk
index 908619d..5059932 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -358,6 +358,11 @@
     LOCAL_SHARED_LIBRARIES += libaudio_log_utils
 endif
 
+ifeq ($(strip $($AUDIO_FEATURE_IP_HDLR_ENABLED)),true)
+    LOCAL_CFLAGS += -DAUDIO_EXTN_IP_HDLR_ENABLED
+    LOCAL_SRC_FILES += audio_extn/ip_hdlr_intf.c
+endif
+
 LOCAL_CFLAGS += -Wall -Werror
 
 LOCAL_COPY_HEADERS_TO   := mm-audio
diff --git a/hal/Makefile.am b/hal/Makefile.am
index 4072a7c..cb01e79 100644
--- a/hal/Makefile.am
+++ b/hal/Makefile.am
@@ -167,6 +167,11 @@
 c_sources += audio_extn/a2dp.c
 endif
 
+if AUDIO_IP_HDLR
+AM_CFLAGS += -DAUDIO_EXTN_IP_HDLR_ENABLED
+c_sources += audio_extn/ip_hdlr_intf.c
+endif
+
 h_sources = audio_extn/audio_defs.h \
             audio_extn/audio_extn.h \
             audio_hw.h \
diff --git a/hal/audio_extn/audio_defs.h b/hal/audio_extn/audio_defs.h
index c3201b4..6bedc25 100644
--- a/hal/audio_extn/audio_defs.h
+++ b/hal/audio_extn/audio_defs.h
@@ -193,7 +193,8 @@
 /* type of asynchronous write callback events. Mutually exclusive
  * event enums append those defined for stream_callback_event_t in audio.h */
 typedef enum {
-    AUDIO_EXTN_STREAM_CBK_EVENT_ADSP = 0x100    /* callback event from ADSP PP,
+    AUDIO_EXTN_STREAM_CBK_EVENT_ERROR = 0x2,  /* Remove this enum if its already in audio.h */
+    AUDIO_EXTN_STREAM_CBK_EVENT_ADSP = 0x100      /* callback event from ADSP PP,
                                                  * corresponding payload will be
                                                  * sent as is to the client
                                                  */
diff --git a/hal/audio_extn/audio_extn.h b/hal/audio_extn/audio_extn.h
index 8ed05fd..42719f4 100644
--- a/hal/audio_extn/audio_extn.h
+++ b/hal/audio_extn/audio_extn.h
@@ -40,6 +40,7 @@
 
 #include <cutils/str_parms.h>
 #include "adsp_hdlr.h"
+#include "ip_hdlr_intf.h"
 
 #ifndef AFE_PROXY_ENABLED
 #define AUDIO_DEVICE_OUT_PROXY 0x40000
diff --git a/hal/audio_extn/ip_hdlr_intf.c b/hal/audio_extn/ip_hdlr_intf.c
new file mode 100644
index 0000000..be8c57a
--- /dev/null
+++ b/hal/audio_extn/ip_hdlr_intf.c
@@ -0,0 +1,384 @@
+/*
+ * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ *     * Neither the name of The Linux Foundation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define LOG_TAG "ip_hdlr_intf"
+/*#define LOG_NDEBUG 0*/
+/*#define VERY_VERY_VERBOSE_LOGGING*/
+#ifdef VERY_VERY_VERBOSE_LOGGING
+#define ALOGVV ALOGV
+#else
+#define ALOGVV(a...) do { } while(0)
+#endif
+
+#ifdef LINUX_ENABLED
+#define LIB_PATH "/usr/lib/libaudio_ip_handler.so"
+#else
+#define LIB_PATH "/system/vendor/lib/libaudio_ip_handler.so"
+#endif
+
+#include <errno.h>
+#include <stdlib.h>
+#include <dlfcn.h>
+#include <cutils/log.h>
+#include <sound/asound.h>
+
+#include "audio_hw.h"
+#include "audio_defs.h"
+#include "platform.h"
+
+/* These values defined by ADSP */
+#define ADSP_DEC_SERVICE_ID 1
+#define ADSP_EVENT_ID_RTIC            0x00013239
+#define ADSP_EVENT_ID_RTIC_FAIL       0x0001323A
+
+struct ip_hdlr_intf {
+    void *lib_hdl;
+    int (*init)(void **handle, char *lib_path, void **lib_handle);
+    int (*deinit)(void *handle);
+    int (*open)(void *handle, bool is_dsp_decode, void *aud_sess_handle);
+    int (*shm_info)(void *handle, int *fd);
+    int (*close)(void *handle);
+    int (*event)(void *handle, void *payload);
+    int (*reg_cb)(void *handle, void *ack_cb, void *fail_cb);
+
+    int ref_cnt;
+};
+static struct ip_hdlr_intf *ip_hdlr = NULL;
+
+/* RTIC ack information */
+struct rtic_ack_info {
+    uint32_t token;
+    uint32_t status;
+};
+
+/* RTIC ack format sent to ADSP */
+struct rtic_ack_param {
+    uint32_t param_size;
+    struct rtic_ack_info rtic_ack;
+};
+
+/* each event payload format */
+struct reg_ev_pl {
+    uint32_t event_id;
+    uint32_t cfg_mask;
+};
+
+/* event registration format */
+struct reg_event {
+    uint16_t version;
+    uint16_t service_id;
+    uint32_t num_reg_events;
+    struct reg_ev_pl rtic;
+    struct reg_ev_pl rtic_fail;
+};
+
+/* event received from ADSP is in this format */
+struct rtic_event {
+    uint16_t service_id;
+    uint16_t reserved;
+    uint32_t event_id;
+    uint32_t payload_size;
+    uint8_t payload[0];
+};
+
+int audio_extn_ip_hdlr_intf_event(void *stream_handle, void *payload, void *ip_hdlr_handle)
+{
+    ALOGVV("%s:[%d] handle = %p",__func__, ip_hdlr->ref_cnt, ip_hdlr_handle);
+
+    return ip_hdlr->event(ip_hdlr_handle, payload);
+}
+
+int audio_extn_ip_hdlr_intf_rtic_ack(void *aud_sess_handle, struct rtic_ack_info *info)
+{
+    char mixer_ctl_name[MIXER_PATH_MAX_LENGTH] = {0};
+    int ret = 0;
+    int pcm_device_id = 0;
+    struct mixer_ctl *ctl = NULL;
+    struct stream_out *out = (struct stream_out *)aud_sess_handle;
+    struct rtic_ack_param param;
+
+    pcm_device_id = platform_get_pcm_device_id(out->usecase, PCM_PLAYBACK);
+
+    ALOGVV("%s:[%d] token = %d, info->status = %d, pcm_id = %d",__func__,
+          ip_hdlr->ref_cnt, info->token, info->status, pcm_device_id);
+
+    /* set mixer control to send RTIC done information */
+    ret = snprintf(mixer_ctl_name, sizeof(mixer_ctl_name),
+                   "Playback Event Ack %d", pcm_device_id);
+    if (ret < 0) {
+        ALOGE("%s:[%d] snprintf failed",__func__, ip_hdlr->ref_cnt);
+        ret = -EINVAL;
+        goto done;
+    }
+    ctl = mixer_get_ctl_by_name(out->dev->mixer, mixer_ctl_name);
+    if (!ctl) {
+        ALOGE("%s:[%d] Could not get ctl for mixer cmd - %s", __func__,
+              ip_hdlr->ref_cnt, mixer_ctl_name);
+        ret = -EINVAL;
+        goto done;
+    }
+
+    param.param_size = sizeof(struct rtic_ack_info);
+    memcpy(&param.rtic_ack, info, sizeof(struct rtic_ack_info));
+    ret = mixer_ctl_set_array(ctl, (void *)&param, sizeof(param));
+    if (ret < 0) {
+        ALOGE("%s:[%d] Could not set ctl for mixer cmd - %s, ret %d", __func__, ip_hdlr->ref_cnt,
+              mixer_ctl_name, ret);
+        goto done;
+    }
+
+done:
+    return ret;
+}
+
+/* Acquire Mutex lock on output stream */
+static void lock_output_stream(struct stream_out *out)
+{
+    pthread_mutex_lock(&out->pre_lock);
+    pthread_mutex_lock(&out->lock);
+    pthread_mutex_unlock(&out->pre_lock);
+}
+
+int audio_extn_ip_hdlr_intf_rtic_fail(void *aud_sess_handle)
+{
+    struct stream_out *out = (struct stream_out *)aud_sess_handle;
+
+    ALOGD("%s:[%d] sess_handle = %p",__func__, ip_hdlr->ref_cnt, aud_sess_handle);
+
+    /* send the error if rtic fail notifcation is received */
+    lock_output_stream(out);
+    if (out && out->client_callback)
+        out->client_callback(AUDIO_EXTN_STREAM_CBK_EVENT_ERROR, NULL, out->client_cookie);
+    pthread_mutex_unlock(&out->lock);
+
+    return 0;
+}
+
+static int audio_extn_ip_hdlr_intf_open_dsp(void *handle, void *stream_handle)
+{
+    int ret = 0, fd = 0, pcm_device_id = 0;
+    struct audio_adsp_event *param;
+    struct reg_event *reg_ev;
+    size_t shm_size;
+    void  *shm_buf;;
+    struct stream_out *out = (struct stream_out *)stream_handle;
+    struct mixer_ctl *ctl = NULL;
+    char mixer_ctl_name[MIXER_PATH_MAX_LENGTH] = {0};
+
+    param = (struct audio_adsp_event *)calloc(1, sizeof(struct audio_adsp_event));
+    if (!param)
+        return -ENOMEM;
+
+    reg_ev = (struct reg_event *)calloc(1, sizeof(struct reg_event));
+    if (!reg_ev)
+        return -ENOMEM;
+
+    reg_ev->service_id = ADSP_DEC_SERVICE_ID;
+    reg_ev->num_reg_events = 2;
+    reg_ev->rtic.event_id = ADSP_EVENT_ID_RTIC;
+    reg_ev->rtic.cfg_mask = 1; /* event enabled */
+    reg_ev->rtic_fail.event_id = ADSP_EVENT_ID_RTIC_FAIL;
+    reg_ev->rtic_fail.cfg_mask = 1; /* event enabled */
+
+    param->event_type = AUDIO_STREAM_ENCDEC_EVENT;
+    param->payload_length = sizeof(struct reg_event);
+    param->payload = reg_ev;
+
+    /* Register for event and its callback */
+    ret = audio_extn_adsp_hdlr_stream_register_event(out->adsp_hdlr_stream_handle, param,
+                                                     audio_extn_ip_hdlr_intf_event,
+                                                     handle);
+    if (ret < 0) {
+        ALOGE("%s:[%d] failed to register event",__func__, ip_hdlr->ref_cnt, ret);
+        goto done;
+    }
+
+    ip_hdlr->reg_cb(handle, &audio_extn_ip_hdlr_intf_rtic_ack, &audio_extn_ip_hdlr_intf_rtic_fail);
+    ip_hdlr->shm_info(handle, &fd);
+    ALOGV("%s: fd = %d", __func__, fd);
+
+    pcm_device_id = platform_get_pcm_device_id(out->usecase, PCM_PLAYBACK);
+    ret = snprintf(mixer_ctl_name, sizeof(mixer_ctl_name),
+                   "Playback ION FD %d", pcm_device_id);
+    if (ret < 0) {
+        ALOGE("%s:[%d] snprintf failed",__func__, ip_hdlr->ref_cnt, ret);
+        goto done;
+    }
+    ctl = mixer_get_ctl_by_name(out->dev->mixer, mixer_ctl_name);
+    if (!ctl) {
+        ALOGE("%s:[%d] Could not get ctl for mixer cmd - %s", __func__,
+              ip_hdlr->ref_cnt, mixer_ctl_name);
+        ret = -EINVAL;
+        goto done;
+    }
+    ret = mixer_ctl_set_array(ctl, &fd, sizeof(fd));
+    if (ret < 0) {
+        ALOGE("%s:[%d] Could not set ctl for mixer cmd - %s, ret %d", __func__, ip_hdlr->ref_cnt,
+              mixer_ctl_name, ret);
+        goto done;
+    }
+
+done:
+    free(param);
+    free(reg_ev);
+    return ret;
+}
+
+int audio_extn_ip_hdlr_intf_open(void *handle, bool is_dsp_decode, void *aud_sess_handle)
+{
+    int ret = 0;
+
+    if (!handle || !aud_sess_handle) {
+        ALOGE("%s:[%d] Invalid arguments, handle %p", __func__, ip_hdlr->ref_cnt, handle);
+        return -EINVAL;
+    }
+
+    ret = ip_hdlr->open(handle, is_dsp_decode, aud_sess_handle);
+    if (ret < 0) {
+        ALOGE("%s:[%d] open failed", __func__, ip_hdlr->ref_cnt);
+        return -EINVAL;
+    }
+    ALOGD("%s:[%d] handle = %p, sess_handle = %p, is_dsp_decode = %d",__func__,
+          ip_hdlr->ref_cnt, handle, aud_sess_handle, is_dsp_decode);
+    if (is_dsp_decode) {
+        ret = audio_extn_ip_hdlr_intf_open_dsp(handle, aud_sess_handle);
+        if (ret < 0)
+            ip_hdlr->close(handle);
+    }
+
+done:
+    return ret;
+}
+
+int audio_extn_ip_hdlr_intf_close(void *handle, bool is_dsp_decode, void *aud_sess_handle)
+{
+    struct audio_adsp_event param;
+    int ret = 0;
+
+    if (!handle) {
+        ALOGE("%s:[%d] handle is NULL", __func__, ip_hdlr->ref_cnt);
+        return -EINVAL;
+    }
+    ALOGD("%s:[%d] handle = %p",__func__, ip_hdlr->ref_cnt, handle);
+
+    ret = ip_hdlr->close(handle);
+    if (ret < 0)
+        ALOGE("%s:[%d] close failed", __func__, ip_hdlr->ref_cnt);
+
+    if (is_dsp_decode) {
+        struct stream_out *out = (struct stream_out *)aud_sess_handle;
+        param.event_type = AUDIO_STREAM_ENCDEC_EVENT;
+        param.payload_length = 0;
+        /* Deregister the event */
+        ret = audio_extn_adsp_hdlr_stream_deregister_event(out->adsp_hdlr_stream_handle, &param);
+        if (ret < 0)
+            ALOGE("%s:[%d] event deregister failed", __func__, ip_hdlr->ref_cnt);
+    }
+
+    return ret;
+}
+
+int audio_extn_ip_hdlr_intf_init(void **handle, char *lib_path, void **lib_handle)
+{
+    int ret = 0;
+
+    if (!ip_hdlr) {
+        ip_hdlr = (struct ip_hdlr_intf *)calloc(1, sizeof(struct ip_hdlr_intf));
+        if (!ip_hdlr)
+            return -ENOMEM;
+
+        ip_hdlr->lib_hdl = dlopen(LIB_PATH, RTLD_NOW);
+        if (ip_hdlr->lib_hdl == NULL) {
+             ALOGE("%s: DLOPEN failed, %s", __func__, dlerror());
+             ret = -EINVAL;
+             goto err;
+        }
+        ip_hdlr->init =(int (*)(void **handle, char *lib_path,
+                                void **lib_handle))dlsym(ip_hdlr->lib_hdl, "audio_ip_hdlr_init");
+        ip_hdlr->deinit = (int (*)(void *handle))dlsym(ip_hdlr->lib_hdl, "audio_ip_hdlr_deinit");
+        ip_hdlr->open = (int (*)(void *handle, bool is_dsp_decode,
+                                 void *sess_handle))dlsym(ip_hdlr->lib_hdl, "audio_ip_hdlr_open");
+        ip_hdlr->close =(int (*)(void *handle))dlsym(ip_hdlr->lib_hdl, "audio_ip_hdlr_close");
+        ip_hdlr->reg_cb =(int (*)(void *handle, void *ack_cb,
+                                  void *fail_cb))dlsym(ip_hdlr->lib_hdl, "audio_ip_hdlr_reg_cb");
+        ip_hdlr->shm_info =(int (*)(void *handle, int *fd))dlsym(ip_hdlr->lib_hdl,
+                                                                 "audio_ip_hdlr_shm_info");
+        ip_hdlr->event =(int (*)(void *handle, void *payload))dlsym(ip_hdlr->lib_hdl,
+                                                                    "audio_ip_hdlr_event");
+        if (!ip_hdlr->init || !ip_hdlr->deinit || !ip_hdlr->open ||
+            !ip_hdlr->close || !ip_hdlr->reg_cb || !ip_hdlr->shm_info ||
+            !ip_hdlr->event) {
+            ALOGE("%s: failed to get symbols", __func__);
+            ret = -EINVAL;
+            goto dlclose;
+
+        }
+    }
+
+    ret = ip_hdlr->init(handle, lib_path, lib_handle);
+    if (ret < 0) {
+        ALOGE("%s:[%d] init failed ret = %d", __func__, ip_hdlr->ref_cnt, ret);
+        ret = -EINVAL;
+        goto dlclose;
+    }
+    ip_hdlr->ref_cnt++;
+    ALOGD("%s:[%d] init done", __func__, ip_hdlr->ref_cnt);
+
+    return 0;
+
+dlclose:
+    dlclose(ip_hdlr->lib_hdl);
+err:
+    free(ip_hdlr);
+    ip_hdlr = NULL;
+    return ret;
+}
+
+int audio_extn_ip_hdlr_intf_deinit(void *handle)
+{
+    int ret = 0;
+
+    if (!handle) {
+        ALOGE("%s:[%d] handle is NULL", __func__, ip_hdlr->ref_cnt);
+        return -EINVAL;
+    }
+    ALOGD("%s:[%d] handle = %p",__func__, ip_hdlr->ref_cnt, handle);
+    ret = ip_hdlr->deinit(handle);
+    if (ret < 0)
+        ALOGE("%s:[%d] deinit failed ret = %d", __func__, ip_hdlr->ref_cnt, ret);
+
+    if (--ip_hdlr->ref_cnt == 0) {
+        if (ip_hdlr->lib_hdl)
+            dlclose(ip_hdlr->lib_hdl);
+
+        free(ip_hdlr);
+        ip_hdlr == NULL;
+    }
+    return ret;
+}
diff --git a/hal/audio_extn/ip_hdlr_intf.h b/hal/audio_extn/ip_hdlr_intf.h
new file mode 100644
index 0000000..7891a1e
--- /dev/null
+++ b/hal/audio_extn/ip_hdlr_intf.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ *       copyright notice, this list of conditions and the following
+ *       disclaimer in the documentation and/or other materials provided
+ *       with the distribution.
+ *     * Neither the name of The Linux Foundation nor the names of its
+ *       contributors may be used to endorse or promote products derived
+ *       from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef AUDIO_HW_EXTN_IP_HDLR_H
+#define AUDIO_HW_EXTN_IP_HDLR_H
+
+#ifdef AUDIO_EXTN_IP_HDLR_ENABLED
+
+int audio_extn_ip_hdlr_intf_open(void *handle, bool is_dsp_decode, void *aud_sess_handle);
+int audio_extn_ip_hdlr_intf_close(void *handle, bool is_dsp_decode, void *aud_sess_handle);
+int audio_extn_ip_hdlr_intf_init(void **handle, char *lib_path, void **lib_handle);
+int audio_extn_ip_hdlr_intf_deinit(void *handle);
+
+#else
+
+#define audio_extn_ip_hdlr_intf_open(handle, is_dsp_decode, aud_sess_handle)  (0)
+#define audio_extn_ip_hdlr_intf_close(handle, is_dsp_decode, aud_sess_handle) (0)
+#define audio_extn_ip_hdlr_intf_init(handle, lib_path, lib_handle)            (0)
+#define audio_extn_ip_hdlr_intf_deinit(handle)                                (0)
+
+#endif
+
+#endif
diff --git a/qahw_api/inc/qahw_defs.h b/qahw_api/inc/qahw_defs.h
index 8438d6e..3adddf1 100644
--- a/qahw_api/inc/qahw_defs.h
+++ b/qahw_api/inc/qahw_defs.h
@@ -181,6 +181,7 @@
 typedef enum {
     QAHW_STREAM_CBK_EVENT_WRITE_READY, /* non blocking write completed */
     QAHW_STREAM_CBK_EVENT_DRAIN_READY,  /* drain completed */
+    QAHW_STREAM_CBK_EVENT_ERROR,  /* stream hit some error */
 
     QAHW_STREAM_CBK_EVENT_ADSP = 0x100    /* callback event from ADSP PP,
                                            * corresponding payload will be
diff --git a/qahw_api/test/qahw_playback_test.c b/qahw_api/test/qahw_playback_test.c
index 2c7864a..cc0a6e2 100644
--- a/qahw_api/test/qahw_playback_test.c
+++ b/qahw_api/test/qahw_playback_test.c
@@ -428,6 +428,10 @@
                 fprintf(log_file, "param[%d] = 0x%x\n", i, payload[i]);
         }
         break;
+    case QAHW_STREAM_CBK_EVENT_ERROR:
+        fprintf(log_file, "stream %d: received event - QAHW_STREAM_CBK_EVENT_ERROR\n", params->stream_index);
+        stop_playback = true;
+        break;
     default:
         break;
     }