diff options
Diffstat (limited to 'exynos/multimedia/codecs/audio/exynos4/srp')
4 files changed, 77 insertions, 77 deletions
diff --git a/exynos/multimedia/codecs/audio/exynos4/srp/alp/src/srp_api.c b/exynos/multimedia/codecs/audio/exynos4/srp/alp/src/srp_api.c index 56125fb..73c8c04 100644 --- a/exynos/multimedia/codecs/audio/exynos4/srp/alp/src/srp_api.c +++ b/exynos/multimedia/codecs/audio/exynos4/srp/alp/src/srp_api.c @@ -12,8 +12,8 @@ #include "srp_api.h" -#define LOG_NDEBUG 1 -#define LOG_TAG "libsrpapi" +#define ALOG_NDEBUG 1 +#define ALOG_TAG "libsrpapi" #include <utils/Log.h> static struct srp_buf_info ibuf_info; @@ -35,7 +35,7 @@ int SRP_Create(int block_mode) return SRP_ERROR_OPEN_FAIL; } - LOGE("%s: Device is already opened", __func__); + ALOGE("%s: Device is already opened", __func__); return SRP_ERROR_ALREADY_OPEN; } @@ -52,20 +52,20 @@ int SRP_Init() /* mmap for OBUF */ ret = ioctl(srp_dev, SRP_GET_MMAP_SIZE, &mmapped_size); if (ret < 0) { - LOGE("%s: SRP_GET_MMAP_SIZE is failed", __func__); + ALOGE("%s: SRP_GET_MMAP_SIZE is failed", __func__); return SRP_ERROR_OBUF_MMAP; } obuf_info.mmapped_addr = mmap(0, mmapped_size, PROT_READ | PROT_WRITE, MAP_SHARED, srp_dev, 0); if (!obuf_info.mmapped_addr) { - LOGE("%s: mmap is failed", __func__); + ALOGE("%s: mmap is failed", __func__); return SRP_ERROR_OBUF_MMAP; } obuf_info.mmapped_size = mmapped_size; ret = SRP_RETURN_OK; } else { - LOGE("%s: Device is not ready", __func__); + ALOGE("%s: Device is not ready", __func__); ret = SRP_ERROR_NOT_READY; /* device is not created */ } @@ -78,12 +78,12 @@ int SRP_Decode(void *buff, int size_byte) if (srp_dev != -1) { if (size_byte > 0) { - LOGV("%s: Send data to RP (%d bytes)", __func__, size_byte); + ALOGV("%s: Send data to RP (%d bytes)", __func__, size_byte); ret = write(srp_dev, buff, size_byte); /* Write Buffer to RP Driver */ if (ret < 0) { if (ret != SRP_ERROR_IBUF_OVERFLOW) - LOGE("SRP_Decode returned error code: %d", ret); + ALOGE("SRP_Decode returned error code: %d", ret); } return ret; /* Write Success */ } else { @@ -91,7 +91,7 @@ int SRP_Decode(void *buff, int size_byte) } } - LOGE("%s: Device is not ready", __func__); + ALOGE("%s: Device is not ready", __func__); return SRP_ERROR_NOT_READY; } @@ -135,7 +135,7 @@ int SRP_Get_PCM(void **addr, unsigned int *size) ret = read(srp_dev, &pcm_info, 0); if (ret == -1) { *size = 0; - LOGE("%s: PCM read fail", __func__); + ALOGE("%s: PCM read fail", __func__); return SRP_ERROR_OBUF_READ; } @@ -155,11 +155,11 @@ int SRP_Get_Dec_Info(struct srp_dec_info *dec_info) if (srp_dev != -1) { ret = ioctl(srp_dev, SRP_GET_DEC_INFO, dec_info); if (ret < 0) { - LOGE("%s: Failed to get dec info", __func__); + ALOGE("%s: Failed to get dec info", __func__); return SRP_ERROR_GETINFO_FAIL; } - LOGV("numChannels(%d), samplingRate(%d)", dec_info->channels, dec_info->sample_rate); + ALOGV("numChannels(%d), samplingRate(%d)", dec_info->channels, dec_info->sample_rate); ret = SRP_RETURN_OK; } else { @@ -176,7 +176,7 @@ int SRP_Get_Ibuf_Info(void **addr, unsigned int *size, unsigned int *num) if (srp_dev != -1) { ret = ioctl(srp_dev, SRP_GET_IBUF_INFO, &ibuf_info); if (ret == -1) { - LOGE("%s: Failed to get Ibuf info", __func__); + ALOGE("%s: Failed to get Ibuf info", __func__); return SRP_ERROR_IBUF_INFO; } @@ -185,7 +185,7 @@ int SRP_Get_Ibuf_Info(void **addr, unsigned int *size, unsigned int *num) *num = ibuf_info.num; if (*num == 0) { - LOGE("%s: IBUF num is 0", __func__); + ALOGE("%s: IBUF num is 0", __func__); return SRP_ERROR_INVALID_SETTING; } @@ -205,7 +205,7 @@ int SRP_Get_Obuf_Info(void **addr, unsigned int *size, unsigned int *num) if (obuf_info.addr == NULL) { ret = ioctl(srp_dev, SRP_GET_OBUF_INFO, &obuf_info); if (ret < 0) { - LOGE("%s: SRP_GET_OBUF_INFO is failed", __func__); + ALOGE("%s: SRP_GET_OBUF_INFO is failed", __func__); return SRP_ERROR_OBUF_INFO; } } @@ -215,7 +215,7 @@ int SRP_Get_Obuf_Info(void **addr, unsigned int *size, unsigned int *num) *num = obuf_info.num; if (*num == 0) { - LOGE("%s: OBUF num is 0", __func__); + ALOGE("%s: OBUF num is 0", __func__); return SRP_ERROR_INVALID_SETTING; } @@ -256,10 +256,10 @@ int SRP_Terminate(void) int SRP_IsOpen(void) { if (srp_dev == -1) { - LOGV("%s: Device is not opened", __func__); + ALOGV("%s: Device is not opened", __func__); return 0; } - LOGV("%s: Device is opened", __func__); + ALOGV("%s: Device is opened", __func__); return 1; } diff --git a/exynos/multimedia/codecs/audio/exynos4/srp/libsa_jni/SACtrl.c b/exynos/multimedia/codecs/audio/exynos4/srp/libsa_jni/SACtrl.c index 6b99dc3..9e696f4 100644 --- a/exynos/multimedia/codecs/audio/exynos4/srp/libsa_jni/SACtrl.c +++ b/exynos/multimedia/codecs/audio/exynos4/srp/libsa_jni/SACtrl.c @@ -7,7 +7,7 @@ #include "srp_api_ctrl.h" -#define LOG_TAG "libsa_jni" +#define ALOG_TAG "libsa_jni" #include <cutils/log.h> void Java_com_android_music_SetSACtrlJNI_set(JNIEnv * env, jobject obj, int effect_num) @@ -15,17 +15,17 @@ void Java_com_android_music_SetSACtrlJNI_set(JNIEnv * env, jobject obj, int effe unsigned long effect_enable = effect_num ? 1 : 0; unsigned int ret; - LOGD("Sound effect[%d]", effect_num); + ALOGD("Sound effect[%d]", effect_num); ret = SRP_Ctrl_Enable_Effect(effect_enable); if (ret < 0) { - LOGE("%s: Couldn't enabled effect\n", __func__); + ALOGE("%s: Couldn't enabled effect\n", __func__); return; } SRP_Ctrl_Set_Effect_Def(effect_num << 5); if (ret < 0) { - LOGE("%s: Couldn't defined effect\n", __func__); + ALOGE("%s: Couldn't defined effect\n", __func__); return; } diff --git a/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api.c b/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api.c index b0c0e5e..2848346 100644 --- a/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api.c +++ b/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api.c @@ -12,14 +12,14 @@ #include "srp_api.h" -#define LOG_TAG "libsrpapi" +#define ALOG_TAG "libsrpapi" #include <cutils/log.h> -/* Disable LOGD message */ -#ifdef LOGD -#undef LOGD +/* Disable ALOGD message */ +#ifdef ALOGD +#undef ALOGD #endif -#define LOGD(...) +#define ALOGD(...) //#define _USE_WBUF_ /* Buffering before writing srp-rp device */ //#define _DUMP_TO_FILE_ @@ -48,11 +48,11 @@ static int WriteBuff_Init(void) wbuf_size = srp_ibuf_size * WBUF_LEN_MUL; wbuf_pos = 0; wbuf = (unsigned char *)malloc(wbuf_size); - LOGD("%s: WriteBuffer %dbytes allocated", __func__, wbuf_size); + ALOGD("%s: WriteBuffer %dbytes allocated", __func__, wbuf_size); return 0; } - LOGE("%s: WriteBuffer already allocated", __func__); + ALOGE("%s: WriteBuffer already allocated", __func__); return -1; } @@ -64,7 +64,7 @@ static int WriteBuff_Deinit(void) return 0; } - LOGE("%s: WriteBuffer is not ready", __func__); + ALOGE("%s: WriteBuffer is not ready", __func__); return -1; } @@ -76,7 +76,7 @@ static int WriteBuff_Write(unsigned char *buff, int size_byte) memcpy(&wbuf[wbuf_pos], buff, size_byte); wbuf_pos += size_byte; } else { - LOGE("%s: WriteBuffer is filled [%d], ignoring write [%d]", __func__, wbuf_pos, size_byte); + ALOGE("%s: WriteBuffer is filled [%d], ignoring write [%d]", __func__, wbuf_pos, size_byte); return -1; /* Insufficient buffer */ } @@ -109,7 +109,7 @@ int SRP_Create(int block_mode) return srp_dev; } - LOGE("%s: Device is not ready", __func__); + ALOGE("%s: Device is not ready", __func__); return -1; /* device alreay opened */ } @@ -134,11 +134,11 @@ int SRP_Init(unsigned int ibuf_size) } } - LOGD("%s: Dump MP3 to %s", __func__, outname); + ALOGD("%s: Dump MP3 to %s", __func__, outname); if (fp_dump = fopen(outname, "wb")) - LOGD("%s: Success to open %s", __func__, outname); + ALOGD("%s: Success to open %s", __func__, outname); else - LOGD("%s: Fail to open %s", __func__, outname); + ALOGD("%s: Fail to open %s", __func__, outname); #endif #ifdef _USE_WBUF_ @@ -149,7 +149,7 @@ int SRP_Init(unsigned int ibuf_size) #endif } - LOGE("%s: Device is not ready", __func__); + ALOGE("%s: Device is not ready", __func__); return -1; /* device is not created */ } @@ -163,17 +163,17 @@ int SRP_Decode(void *buff, int size_byte) if (srp_dev != -1) { /* Check wbuf before writing buff */ while (wbuf_pos >= srp_ibuf_size) { /* Write_Buffer filled? (IBUF Size)*/ - LOGD("%s: Write Buffer is full, Send data to RP", __func__); + ALOGD("%s: Write Buffer is full, Send data to RP", __func__); ret = write(srp_dev, wbuf, srp_ibuf_size); /* Write Buffer to RP Driver */ if (ret == -1) { /* Fail? */ ioctl(srp_dev, SRP_ERROR_STATE, &val); if (!val) { /* Write error? */ - LOGE("%s: IBUF write fail", __func__); + ALOGE("%s: IBUF write fail", __func__); return -1; } else { /* Write OK, but RP decode error? */ err_code = val; - LOGE("%s: RP decode error [0x%05X]", __func__, err_code); + ALOGE("%s: RP decode error [0x%05X]", __func__, err_code); } } #ifdef _DUMP_TO_FILE_ @@ -187,11 +187,11 @@ int SRP_Decode(void *buff, int size_byte) if (ret == -1) return -1; /* Buffering error */ - LOGD("%s: Write Buffer remain [%d]", __func__, wbuf_pos); + ALOGD("%s: Write Buffer remain [%d]", __func__, wbuf_pos); return err_code; /* Write Success */ } - LOGE("%s: Device is not ready", __func__); + ALOGE("%s: Device is not ready", __func__); return -1; /* device is not created */ } @@ -212,10 +212,10 @@ int SRP_Send_EOS(void) if (ret == -1) { /* Fail? */ ret = ioctl(srp_dev, SRP_ERROR_STATE, &val); if (!val) { /* Write error? */ - LOGE("%s: IBUF write fail", __func__); + ALOGE("%s: IBUF write fail", __func__); return -1; } else { /* RP decoe error? */ - LOGE("%s: RP decode error [0x%05X]", __func__, val); + ALOGE("%s: RP decode error [0x%05X]", __func__, val); return -1; } } else { /* Success? */ @@ -244,17 +244,17 @@ int SRP_Decode(void *buff, int size_byte) int err_code = 0; if (srp_dev != -1) { - LOGD("%s: Send data to RP (%d bytes)", __func__, size_byte); + ALOGD("%s: Send data to RP (%d bytes)", __func__, size_byte); ret = write(srp_dev, buff, size_byte); /* Write Buffer to RP Driver */ if (ret == -1) { /* Fail? */ ioctl(srp_dev, SRP_ERROR_STATE, &val); if (!val) { /* Write error? */ - LOGE("%s: IBUF write fail", __func__); + ALOGE("%s: IBUF write fail", __func__); return -1; } else { /* Write OK, but RP decode error? */ err_code = val; - LOGE("%s: RP decode error [0x%05X]", __func__, err_code); + ALOGE("%s: RP decode error [0x%05X]", __func__, err_code); } } #ifdef _DUMP_TO_FILE_ @@ -265,7 +265,7 @@ int SRP_Decode(void *buff, int size_byte) return err_code; /* Write Success */ } - LOGE("%s: Device is not ready", __func__); + ALOGE("%s: Device is not ready", __func__); return -1; /* device is not created */ } @@ -348,7 +348,7 @@ int SRP_Deinit(void) return ioctl(srp_dev, SRP_DEINIT); /* Deinialize */ } - LOGE("%s: Device is not ready", __func__); + ALOGE("%s: Device is not ready", __func__); return -1; /* device is not created */ } @@ -365,17 +365,17 @@ int SRP_Terminate(void) } } - LOGE("%s: Device is not ready", __func__); + ALOGE("%s: Device is not ready", __func__); return -1; /* device is not created or close error*/ } int SRP_IsOpen(void) { if (srp_dev == -1) { - LOGD("%s: Device is not opened", __func__); + ALOGD("%s: Device is not opened", __func__); return 0; } - LOGD("%s: Device is opened", __func__); + ALOGD("%s: Device is opened", __func__); return 1; } diff --git a/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api_ctrl.c b/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api_ctrl.c index bdc2310..ed32089 100644 --- a/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api_ctrl.c +++ b/exynos/multimedia/codecs/audio/exynos4/srp/ulp/src/srp_api_ctrl.c @@ -13,14 +13,14 @@ #include "srp_api_ctrl.h" #include "srp_ioctl.h" -#define LOG_TAG "libsrpapi" +#define ALOG_TAG "libsrpapi" #include <cutils/log.h> -/* Disable LOGD message */ -#ifdef LOGD -#undef LOGD +/* Disable ALOGD message */ +#ifdef ALOGD +#undef ALOGD #endif -#define LOGD(...) +#define ALOGD(...) static int srp_ctrl = -1; static int srp_ctrl_cnt = 0; @@ -42,11 +42,11 @@ static int SRP_Ctrl_Open(void) if (srp_ctrl_cnt == 0) { srp_ctrl = open(SRP_CTRL_DEV_NAME, O_RDWR | O_NDELAY); if (srp_ctrl < 0) { - LOGE("%s: Failed open device file %d", __func__, srp_ctrl); + ALOGE("%s: Failed open device file %d", __func__, srp_ctrl); return -1; } srp_ctrl_cnt++; - LOGV("%s: Device is opened[%d]: cnt %d", __func__, srp_ctrl, srp_ctrl_cnt); + ALOGV("%s: Device is opened[%d]: cnt %d", __func__, srp_ctrl, srp_ctrl_cnt); } return srp_ctrl; @@ -59,11 +59,11 @@ static int SRP_Ctrl_Close(void) if (srp_ctrl_cnt == 1) { ret = close(srp_ctrl); if (ret < 0) { - LOGE("%s: Failed closen device file %d", __func__, srp_ctrl); + ALOGE("%s: Failed closen device file %d", __func__, srp_ctrl); return -1; } srp_ctrl_cnt--; - LOGV("%s: Device is closed[%d]: cnt %d", __func__, srp_ctrl, srp_ctrl_cnt); + ALOGV("%s: Device is closed[%d]: cnt %d", __func__, srp_ctrl, srp_ctrl_cnt); srp_ctrl = -1; } @@ -86,13 +86,13 @@ static int SRP_Check_AltFirmware(void) ioctl(srp_ctrl, SRP_CTRL_ALTFW_STATE, &alt_fw_loaded); if (!alt_fw_loaded) { /* Not loaded yet? */ - LOGE("Try to download alternate RP firmware"); + ALOGE("Try to download alternate RP firmware"); temp_buff = (unsigned long *)malloc(256*1024); /* temp buffer */ for (alt_fw_set = 0; alt_fw_set < 6; alt_fw_set++) { sprintf(alt_fw_name, "%s_text.bin", srp_alt_fw_name_pre[alt_fw_set]); if (fp = fopen(alt_fw_name, "rb")) { - LOGE("RP Alt-Firmware Loading: %s", alt_fw_name); + ALOGE("RP Alt-Firmware Loading: %s", alt_fw_name); fread(temp_buff, 64*1024, 1, fp); close(fp); alt_fw_text_ok = 1; @@ -102,7 +102,7 @@ static int SRP_Check_AltFirmware(void) sprintf(alt_fw_name, "%s_data.bin", srp_alt_fw_name_pre[alt_fw_set]); if (fp = fopen(alt_fw_name, "rb")) { - LOGE("RP Alt-Firmware Loading: %s", alt_fw_name); + ALOGE("RP Alt-Firmware Loading: %s", alt_fw_name); fread(&temp_buff[64*1024/4], 96*1024, 1, fp); close(fp); alt_fw_data_ok = 1; @@ -131,7 +131,7 @@ int SRP_Ctrl_Set_Effect(int effect) ret = SRP_Ctrl_Open(); if (ret < 0) { - LOGE("%s: SRP_Ctrl_Open error", __func__); + ALOGE("%s: SRP_Ctrl_Open error", __func__); return -1; } @@ -149,7 +149,7 @@ int SRP_Ctrl_Enable_Effect(int on) ret = SRP_Ctrl_Open(); if (ret < 0) { - LOGE("%s: SRP_Ctrl_Open error", __func__); + ALOGE("%s: SRP_Ctrl_Open error", __func__); return -1; } @@ -166,7 +166,7 @@ int SRP_Ctrl_Set_Effect_Def(unsigned long effect_def) ret = SRP_Ctrl_Open(); if (ret < 0) { - LOGE("%s: SRP_Ctrl_Open error", __func__); + ALOGE("%s: SRP_Ctrl_Open error", __func__); return -1; } @@ -183,7 +183,7 @@ int SRP_Ctrl_Set_Effect_EQ_User(unsigned long eq_user) ret = SRP_Ctrl_Open(); if (ret < 0) { - LOGE("%s: SRP_Ctrl_Open error", __func__); + ALOGE("%s: SRP_Ctrl_Open error", __func__); return -1; } @@ -200,13 +200,13 @@ int SRP_Ctrl_Set_Pcm_Dump(int on) ret = SRP_Ctrl_Open(); if (ret < 0) { - LOGE("%s: SRP_Ctrl_Open error", __func__); + ALOGE("%s: SRP_Ctrl_Open error", __func__); return -1; } ioctl(srp_ctrl, SRP_CTRL_PCM_DUMP_OP, on); - LOGV("dump_op: %d", on); + ALOGV("dump_op: %d", on); SRP_Ctrl_Close(); @@ -220,13 +220,13 @@ int SRP_Ctrl_Get_Pcm_Dump_State(void) ret = SRP_Ctrl_Open(); if (ret < 0) { - LOGE("%s: SRP_Ctrl_Open error", __func__); + ALOGE("%s: SRP_Ctrl_Open error", __func__); return -1; } ioctl(srp_ctrl, SRP_CTRL_IS_PCM_DUMP, &srp_dump_stat); - LOGV("srp_dump_stat: %d", srp_dump_stat); + ALOGV("srp_dump_stat: %d", srp_dump_stat); SRP_Ctrl_Close(); @@ -240,7 +240,7 @@ int SRP_Ctrl_Set_Gain(float value) ret = SRP_Ctrl_Open(); if (ret < 0) { - LOGE("%s: SRP_Ctrl_Open error", __func__); + ALOGE("%s: SRP_Ctrl_Open error", __func__); return -1; } @@ -259,13 +259,13 @@ int SRP_Ctrl_Get_Running_Stat(void) ret = SRP_Ctrl_Open(); if (ret < 0) { - LOGE("%s: SRP_Ctrl_Open error", __func__); + ALOGE("%s: SRP_Ctrl_Open error", __func__); return -1; } ioctl(srp_ctrl, SRP_CTRL_IS_RUNNING, &srp_running_stat); - LOGV("srp_running_stat: %d", srp_running_stat); + ALOGV("srp_running_stat: %d", srp_running_stat); SRP_Ctrl_Close(); @@ -279,13 +279,13 @@ int SRP_Ctrl_Get_Open_Stat(void) ret = SRP_Ctrl_Open(); if (ret < 0) { - LOGE("%s: SRP_Ctrl_Open error", __func__); + ALOGE("%s: SRP_Ctrl_Open error", __func__); return -1; } ioctl(srp_ctrl, SRP_CTRL_IS_OPENED, &srp_open_stat); - LOGV("srp_open_stat: %d", srp_open_stat); + ALOGV("srp_open_stat: %d", srp_open_stat); SRP_Ctrl_Close(); @@ -301,7 +301,7 @@ short *SRP_Ctrl_Get_Pcm(void) ret = SRP_Ctrl_Open(); if (ret < 0) { - LOGE("%s: SRP_Ctrl_Open error", __func__); + ALOGE("%s: SRP_Ctrl_Open error", __func__); return NULL; } |