exynos hal: jellybean compat
diff --git a/exynos4/hal/libhdmi/SecHdmi/Android.mk b/exynos4/hal/libhdmi/SecHdmi/Android.mk
index e728309..a6921fc 100644
--- a/exynos4/hal/libhdmi/SecHdmi/Android.mk
+++ b/exynos4/hal/libhdmi/SecHdmi/Android.mk
@@ -79,7 +79,7 @@
ifeq ($(BOARD_USE_V4L2_ION),true)
LOCAL_CFLAGS += -DBOARD_USE_V4L2_ION
-LOCAL_SHARED_LIBRARIES += libion
+LOCAL_SHARED_LIBRARIES += libsamsungion
endif
LOCAL_MODULE := libhdmi
diff --git a/exynos4/hal/libhdmi/SecHdmi/SecHdmi.cpp b/exynos4/hal/libhdmi/SecHdmi/SecHdmi.cpp
index 21c84ad..e6be6e7 100644
--- a/exynos4/hal/libhdmi/SecHdmi/SecHdmi.cpp
+++ b/exynos4/hal/libhdmi/SecHdmi/SecHdmi.cpp
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-//#define LOG_NDEBUG 0
-//#define LOG_TAG "libhdmi"
+//#define ALOG_NDEBUG 0
+//#define ALOG_TAG "libhdmi"
#include <cutils/log.h>
#if defined(BOARD_USE_V4L2_ION)
@@ -55,7 +55,7 @@
SecHdmi::CECThread::~CECThread()
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
mFlagRunning = false;
}
@@ -87,18 +87,18 @@
opcode = buffer[1];
if (CECIgnoreMessage(opcode, lsrc)) {
- LOGE("### ignore message coming from address 15 (unregistered)\n");
+ ALOGE("### ignore message coming from address 15 (unregistered)\n");
return true;
}
if (!CECCheckMessageSize(opcode, size)) {
- LOGE("### invalid message size: %d(opcode: 0x%x) ###\n", size, opcode);
+ ALOGE("### invalid message size: %d(opcode: 0x%x) ###\n", size, opcode);
return true;
}
/* check if message broadcasted/directly addressed */
if (!CECCheckMessageMode(opcode, (buffer[0] & 0x0F) == CEC_MSG_BROADCAST ? 1 : 0)) {
- LOGE("### invalid message mode (directly addressed/broadcast) ###\n");
+ ALOGE("### invalid message mode (directly addressed/broadcast) ###\n");
return true;
}
@@ -119,14 +119,14 @@
break;
case CEC_OPCODE_REQUEST_ACTIVE_SOURCE:
- LOGD("[CEC_OPCODE_REQUEST_ACTIVE_SOURCE]\n");
+ ALOGD("[CEC_OPCODE_REQUEST_ACTIVE_SOURCE]\n");
/* responce with "Active Source" */
buffer[0] = (mLaddr << 4) | CEC_MSG_BROADCAST;
buffer[1] = CEC_OPCODE_ACTIVE_SOURCE;
buffer[2] = (mPaddr >> 8) & 0xFF;
buffer[3] = mPaddr & 0xFF;
size = 4;
- LOGD("Tx : [CEC_OPCODE_ACTIVE_SOURCE]\n");
+ ALOGD("Tx : [CEC_OPCODE_ACTIVE_SOURCE]\n");
break;
case CEC_OPCODE_ABORT:
@@ -142,7 +142,7 @@
}
if (CECSendMessage(buffer, size) != size)
- LOGE("CECSendMessage() failed!!!\n");
+ ALOGE("CECSendMessage() failed!!!\n");
}
return true;
@@ -151,33 +151,33 @@
bool SecHdmi::CECThread::start()
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
Mutex::Autolock lock(mThreadControlLock);
if (exitPending()) {
if (requestExitAndWait() == WOULD_BLOCK) {
- LOGE("mCECThread.requestExitAndWait() == WOULD_BLOCK");
+ ALOGE("mCECThread.requestExitAndWait() == WOULD_BLOCK");
return false;
}
}
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("EDIDGetCECPhysicalAddress");
+ ALOGD("EDIDGetCECPhysicalAddress");
#endif
/* set to not valid physical address */
mPaddr = CEC_NOT_VALID_PHYSICAL_ADDRESS;
if (!EDIDGetCECPhysicalAddress(&mPaddr)) {
- LOGE("Error: EDIDGetCECPhysicalAddress() failed.\n");
+ ALOGE("Error: EDIDGetCECPhysicalAddress() failed.\n");
return false;
}
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("CECOpen");
+ ALOGD("CECOpen");
#endif
if (!CECOpen()) {
- LOGE("CECOpen() failed!!!\n");
+ ALOGE("CECOpen() failed!!!\n");
return false;
}
@@ -191,24 +191,24 @@
*/
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("CECAllocLogicalAddress");
+ ALOGD("CECAllocLogicalAddress");
#endif
mLaddr = CECAllocLogicalAddress(mPaddr, mDevtype);
if (!mLaddr) {
- LOGE("CECAllocLogicalAddress() failed!!!\n");
+ ALOGE("CECAllocLogicalAddress() failed!!!\n");
if (!CECClose())
- LOGE("CECClose() failed!\n");
+ ALOGE("CECClose() failed!\n");
return false;
}
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("request to run CECThread");
+ ALOGD("request to run CECThread");
#endif
status_t ret = run("SecHdmi::CECThread", PRIORITY_DISPLAY);
if (ret != NO_ERROR) {
- LOGE("%s fail to run thread", __func__);
+ ALOGE("%s fail to run thread", __func__);
return false;
}
return true;
@@ -217,16 +217,16 @@
bool SecHdmi::CECThread::stop()
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s request Exit", __func__);
+ ALOGD("%s request Exit", __func__);
#endif
Mutex::Autolock lock(mThreadControlLock);
if (requestExitAndWait() == WOULD_BLOCK) {
- LOGE("mCECThread.requestExitAndWait() == WOULD_BLOCK");
+ ALOGE("mCECThread.requestExitAndWait() == WOULD_BLOCK");
return false;
}
if (!CECClose())
- LOGE("CECClose() failed!\n");
+ ALOGE("CECClose() failed!\n");
mFlagRunning = false;
return true;
@@ -266,7 +266,7 @@
mDisplayHeight(DEFALULT_DISPLAY_HEIGHT)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
for (int i = 0; i < HDMI_LAYER_MAX; i++) {
mFlagLayerEnable[i] = false;
@@ -328,10 +328,10 @@
SecHdmi::~SecHdmi()
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
if (mFlagCreate == true)
- LOGE("%s::this is not Destroyed fail", __func__);
+ ALOGE("%s::this is not Destroyed fail", __func__);
else
disconnect();
}
@@ -371,17 +371,17 @@
#endif
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
if (mFlagCreate == true) {
- LOGE("%s::Already Created fail", __func__);
+ ALOGE("%s::Already Created fail", __func__);
goto CREATE_FAIL;
}
if (mDefaultFBFd <= 0) {
if ((mDefaultFBFd = fb_open(DEFAULT_FB)) < 0) {
- LOGE("%s:Failed to open default FB", __func__);
+ ALOGE("%s:Failed to open default FB", __func__);
return false;
}
}
@@ -393,25 +393,25 @@
#endif
if (mSecFimc.create(SecFimc::DEV_3, SecFimc::MODE_SINGLE_BUF, BufNum) == false) {
- LOGE("%s::SecFimc create() fail", __func__);
+ ALOGE("%s::SecFimc create() fail", __func__);
goto CREATE_FAIL;
}
#if defined(BOARD_USE_V4L2_ION)
IonClient = ion_client_create();
if (IonClient < 0) {
- LOGE("%s::ion_client_create() failed", __func__);
+ ALOGE("%s::ion_client_create() failed", __func__);
goto CREATE_FAIL;
}
#if defined(BOARD_USES_FIMGAPI)
IonFd = ion_alloc(IonClient, g2d_reserved_memory_size * HDMI_G2D_OUTPUT_BUF_NUM, 0, ION_HEAP_EXYNOS_MASK);
if (IonFd < 0) {
- LOGE("%s::ION memory allocation failed", __func__);
+ ALOGE("%s::ION memory allocation failed", __func__);
} else {
ion_base_addr = ion_map(IonFd, ALIGN(g2d_reserved_memory_size * HDMI_G2D_OUTPUT_BUF_NUM, PAGE_SIZE), 0);
if (ion_base_addr == MAP_FAILED)
- LOGE("%s::ION mmap failed", __func__);
+ ALOGE("%s::ION mmap failed", __func__);
}
for (int i = 0; i < HDMI_G2D_OUTPUT_BUF_NUM; i++)
@@ -437,16 +437,16 @@
v4l2_std_id std_id;
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s::mHdmiOutputMode(%d) \n", __func__, mHdmiOutputMode);
+ ALOGD("%s::mHdmiOutputMode(%d) \n", __func__, mHdmiOutputMode);
#endif
if (mHdmiOutputMode == COMPOSITE_OUTPUT_MODE) {
std_id = composite_std_2_v4l2_std_id(mCompositeStd);
if ((int)std_id < 0) {
- LOGE("%s::composite_std_2_v4l2_std_id(%d) fail\n", __func__, mCompositeStd);
+ ALOGE("%s::composite_std_2_v4l2_std_id(%d) fail\n", __func__, mCompositeStd);
goto CREATE_FAIL;
}
if (m_setCompositeResolution(mCompositeStd) == false) {
- LOGE("%s::m_setCompositeResolution(%d) fail\n", __func__, mCompositeStd);
+ ALOGE("%s::m_setCompositeResolution(%d) fail\n", __func__, mCompositeStd);
goto CREATE_FAIL;
}
} else if (mHdmiOutputMode >= HDMI_OUTPUT_MODE_YCBCR &&
@@ -455,12 +455,12 @@
unsigned int preset_id;
if (hdmi_resolution_2_preset_id(mHdmiResolutionValue, &mHdmiDstWidth, &mHdmiDstHeight, &preset_id) < 0) {
- LOGE("%s::hdmi_resolution_2_preset_id(%d) fail\n", __func__, mHdmiResolutionValue);
+ ALOGE("%s::hdmi_resolution_2_preset_id(%d) fail\n", __func__, mHdmiResolutionValue);
goto CREATE_FAIL;
}
#else
if (hdmi_resolution_2_std_id(mHdmiResolutionValue, &mHdmiDstWidth, &mHdmiDstHeight, &std_id) < 0) {
- LOGE("%s::hdmi_resolution_2_std_id(%d) fail\n", __func__, mHdmiResolutionValue);
+ ALOGE("%s::hdmi_resolution_2_std_id(%d) fail\n", __func__, mHdmiResolutionValue);
goto CREATE_FAIL;
}
#endif
@@ -474,7 +474,7 @@
if (mSecFimc.flagCreate() == true &&
mSecFimc.destroy() == false)
- LOGE("%s::fimc destory fail", __func__);
+ ALOGE("%s::fimc destory fail", __func__);
return false;
}
@@ -482,24 +482,24 @@
bool SecHdmi::destroy(void)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
Mutex::Autolock lock(mLock);
if (mFlagCreate == false) {
- LOGE("%s::Already Destroyed fail \n", __func__);
+ ALOGE("%s::Already Destroyed fail \n", __func__);
goto DESTROY_FAIL;
}
for (int layer = HDMI_LAYER_BASE + 1; layer <= HDMI_LAYER_GRAPHIC_0; layer++) {
if (mFlagHdmiStart[layer] == true && m_stopHdmi(layer) == false) {
- LOGE("%s::m_stopHdmi: layer[%d] fail \n", __func__, layer);
+ ALOGE("%s::m_stopHdmi: layer[%d] fail \n", __func__, layer);
goto DESTROY_FAIL;
}
if (hdmi_deinit_layer(layer) < 0) {
- LOGE("%s::hdmi_deinit_layer(%d) fail \n", __func__, layer);
+ ALOGE("%s::hdmi_deinit_layer(%d) fail \n", __func__, layer);
goto DESTROY_FAIL;
}
}
@@ -509,7 +509,7 @@
#endif
if (mSecFimc.flagCreate() == true && mSecFimc.destroy() == false) {
- LOGE("%s::fimc destory fail \n", __func__);
+ ALOGE("%s::fimc destory fail \n", __func__);
goto DESTROY_FAIL;
}
@@ -550,37 +550,37 @@
bool SecHdmi::connect(void)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
{
Mutex::Autolock lock(mLock);
if (mFlagCreate == false) {
- LOGE("%s::Not Yet Created \n", __func__);
+ ALOGE("%s::Not Yet Created \n", __func__);
return false;
}
if (mFlagConnected == true) {
- LOGD("%s::Already Connected.. \n", __func__);
+ ALOGD("%s::Already Connected.. \n", __func__);
return true;
}
if (mHdmiOutputMode >= HDMI_OUTPUT_MODE_YCBCR &&
mHdmiOutputMode <= HDMI_OUTPUT_MODE_DVI) {
if (m_flagHWConnected() == false) {
- LOGD("%s::m_flagHWConnected() fail \n", __func__);
+ ALOGD("%s::m_flagHWConnected() fail \n", __func__);
return false;
}
#if defined(BOARD_USES_EDID)
if (!EDIDOpen())
- LOGE("EDIDInit() failed!\n");
+ ALOGE("EDIDInit() failed!\n");
if (!EDIDRead()) {
- LOGE("EDIDRead() failed!\n");
+ ALOGE("EDIDRead() failed!\n");
if (!EDIDClose())
- LOGE("EDIDClose() failed!\n");
+ ALOGE("EDIDClose() failed!\n");
}
#endif
@@ -592,15 +592,15 @@
}
if (this->setHdmiOutputMode(mHdmiOutputMode, true) == false)
- LOGE("%s::setHdmiOutputMode(%d) fail \n", __func__, mHdmiOutputMode);
+ ALOGE("%s::setHdmiOutputMode(%d) fail \n", __func__, mHdmiOutputMode);
if (mHdmiOutputMode >= HDMI_OUTPUT_MODE_YCBCR &&
mHdmiOutputMode <= HDMI_OUTPUT_MODE_DVI) {
if (this->setHdmiResolution(mHdmiResolutionValue, true) == false)
- LOGE("%s::setHdmiResolution(%d) fail \n", __func__, mHdmiResolutionValue);
+ ALOGE("%s::setHdmiResolution(%d) fail \n", __func__, mHdmiResolutionValue);
if (this->setHdcpMode(mHdcpMode, false) == false)
- LOGE("%s::setHdcpMode(%d) fail \n", __func__, mHdcpMode);
+ ALOGE("%s::setHdcpMode(%d) fail \n", __func__, mHdcpMode);
mHdmiInfoChange = true;
mFlagConnected = true;
@@ -617,18 +617,18 @@
bool SecHdmi::disconnect(void)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
Mutex::Autolock lock(mLock);
if (mFlagCreate == false) {
- LOGE("%s::Not Yet Created \n", __func__);
+ ALOGE("%s::Not Yet Created \n", __func__);
return false;
}
if (mFlagConnected == false) {
- LOGE("%s::Already Disconnected.. \n", __func__);
+ ALOGE("%s::Already Disconnected.. \n", __func__);
return true;
}
@@ -641,7 +641,7 @@
#if defined(BOARD_USES_EDID)
if (!EDIDClose()) {
- LOGE("EDIDClose() failed!\n");
+ ALOGE("EDIDClose() failed!\n");
return false;
}
#endif
@@ -649,7 +649,7 @@
for (int layer = SecHdmi::HDMI_LAYER_BASE + 1; layer <= SecHdmi::HDMI_LAYER_GRAPHIC_0; layer++) {
if (mFlagHdmiStart[layer] == true && m_stopHdmi(layer) == false) {
- LOGE("%s::hdmiLayer(%d) layer fail \n", __func__, layer);
+ ALOGE("%s::hdmiLayer(%d) layer fail \n", __func__, layer);
return false;
}
}
@@ -657,7 +657,7 @@
#if defined(BOARD_USE_V4L2)
for (int layer = HDMI_LAYER_BASE + 1; layer < HDMI_LAYER_MAX; layer++) {
if (hdmi_deinit_layer(layer) < 0)
- LOGE("%s::hdmi_deinit_layer(%d) fail", __func__, layer);
+ ALOGE("%s::hdmi_deinit_layer(%d) fail", __func__, layer);
}
#else
tvout_deinit();
@@ -685,13 +685,13 @@
bool SecHdmi::flagConnected(void)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
Mutex::Autolock lock(mLock);
if (mFlagCreate == false) {
- LOGE("%s::Not Yet Created \n", __func__);
+ ALOGE("%s::Not Yet Created \n", __func__);
return false;
}
@@ -705,14 +705,14 @@
int num_of_hwc_layer)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s [srcW=%d, srcH=%d, srcColorFormat=0x%x, srcYAddr=0x%x, srcCbAddr=0x%x, srcCrAddr=0x%x, dstX=%d, dstY=%d, hdmiLayer=%d]",
+ ALOGD("%s [srcW=%d, srcH=%d, srcColorFormat=0x%x, srcYAddr=0x%x, srcCbAddr=0x%x, srcCrAddr=0x%x, dstX=%d, dstY=%d, hdmiLayer=%d]",
__func__, srcW, srcH, srcColorFormat, srcYAddr, srcCbAddr, srcCrAddr, dstX, dstY, hdmiLayer);
#endif
Mutex::Autolock lock(mLock);
if (mFlagCreate == false) {
- LOGE("%s::Not Yet Created \n", __func__);
+ ALOGE("%s::Not Yet Created \n", __func__);
return false;
}
@@ -744,7 +744,7 @@
}
}
#ifdef DEBUG_MSG_ENABLE
- LOGE("m_reset param(%d, %d, %d, %d)",
+ ALOGE("m_reset param(%d, %d, %d, %d)",
mDstWidth[hdmiLayer], mDstHeight[hdmiLayer], \
mPrevDstWidth[hdmiLayer], mPrevDstHeight[hdmiLayer]);
#endif
@@ -761,7 +761,7 @@
#endif
mHdmiInfoChange == true) {
#ifdef DEBUG_MSG_ENABLE
- LOGD("m_reset param(%d, %d, %d, %d, %d, %d, %d)",
+ ALOGD("m_reset param(%d, %d, %d, %d, %d, %d, %d)",
srcW, mSrcWidth[hdmiLayer], \
srcH, mSrcHeight[hdmiLayer], \
srcColorFormat,mSrcColorFormat[hdmiLayer], \
@@ -769,7 +769,7 @@
#endif
if (m_reset(srcW, srcH, srcColorFormat, hdmiLayer, num_of_hwc_layer) == false) {
- LOGE("%s::m_reset(%d, %d, %d, %d, %d) fail", __func__, srcW, srcH, srcColorFormat, hdmiLayer, num_of_hwc_layer);
+ ALOGE("%s::m_reset(%d, %d, %d, %d, %d) fail", __func__, srcW, srcH, srcColorFormat, hdmiLayer, num_of_hwc_layer);
return false;
}
}
@@ -787,13 +787,13 @@
// get framebuffer virtual address for LCD
if (ioctl(mDefaultFBFd, S3CFB_GET_ION_USER_HANDLE, &ion_handle) < 0) {
- LOGE("%s:ioctl(S3CFB_GET_ION_USER_HANDLE) fail", __func__);
+ ALOGE("%s:ioctl(S3CFB_GET_ION_USER_HANDLE) fail", __func__);
return false;
}
virFBAddr = ion_map(ion_handle.fd, ALIGN(FB_size * 2, PAGE_SIZE), 0);
if (virFBAddr == MAP_FAILED) {
- LOGE("%s::ion_map fail", __func__);
+ ALOGE("%s::ion_map fail", __func__);
ion_free(ion_handle.fd);
mFBaddr = NULL;
return false;
@@ -815,7 +815,7 @@
// get physical framebuffer address for LCD
if (ioctl(mDefaultFBFd, S3CFB_GET_FB_PHY_ADDR, &phyFBAddr) == -1) {
- LOGE("%s:ioctl(S3CFB_GET_FB_PHY__ADDR) fail", __func__);
+ ALOGE("%s:ioctl(S3CFB_GET_FB_PHY__ADDR) fail", __func__);
return false;
}
@@ -825,7 +825,7 @@
* so JUST RETURN.
*/
if (phyFBAddr == 0) {
- LOGE("%s::S3CFB_GET_FB_PHY_ADDR fail", __func__);
+ ALOGE("%s::S3CFB_GET_FB_PHY_ADDR fail", __func__);
return true;
}
srcYAddr = phyFBAddr;
@@ -868,7 +868,7 @@
#endif
} else {
if (mSecFimc.setSrcAddr(srcYAddr, srcCbAddr, srcCrAddr, srcColorFormat) == false) {
- LOGE("%s::setSrcAddr(%d, %d, %d) fail",
+ ALOGE("%s::setSrcAddr(%d, %d, %d) fail",
__func__, srcYAddr, srcCbAddr, srcCrAddr);
return false;
}
@@ -886,13 +886,13 @@
mHdmiSrcCbCrAddr = mFimcReservedMem[mFimcCurrentOutBufIndex].phys.extP[0] + y_size;
#endif
if (mSecFimc.setDstAddr(mHdmiSrcYAddr, mHdmiSrcCbCrAddr, 0, mFimcCurrentOutBufIndex) == false) {
- LOGE("%s::mSecFimc.setDstAddr(%d, %d) fail \n",
+ ALOGE("%s::mSecFimc.setDstAddr(%d, %d) fail \n",
__func__, mHdmiSrcYAddr, mHdmiSrcCbCrAddr);
return false;
}
if (mSecFimc.draw(0, mFimcCurrentOutBufIndex) == false) {
- LOGE("%s::mSecFimc.draw() fail \n", __func__);
+ ALOGE("%s::mSecFimc.draw() fail \n", __func__);
return false;
}
#if defined(BOARD_USE_V4L2)
@@ -920,13 +920,13 @@
srcColorFormat != HAL_PIXEL_FORMAT_RGBA_8888 &&
srcColorFormat != HAL_PIXEL_FORMAT_RGB_565) {
if (mSecFimc.setSrcAddr(srcYAddr, srcCbAddr, srcCrAddr, srcColorFormat) == false) {
- LOGE("%s::setSrcAddr(%d, %d, %d) fail",
+ ALOGE("%s::setSrcAddr(%d, %d, %d) fail",
__func__, srcYAddr, srcCbAddr, srcCrAddr);
return false;
}
if (mSecFimc.draw(0, mFimcCurrentOutBufIndex) == false) {
- LOGE("%s::mSecFimc.draw() failed", __func__);
+ ALOGE("%s::mSecFimc.draw() failed", __func__);
return false;
}
#if defined(BOARD_USE_V4L2)
@@ -1008,7 +1008,7 @@
}
#if CHECK_GRAPHIC_LAYER_TIME
end = systemTime();
- LOGD("[UI] hdmi_gl_set_param[end-start] = %ld ms", long(ns2ms(end)) - long(ns2ms(start)));
+ ALOGD("[UI] hdmi_gl_set_param[end-start] = %ld ms", long(ns2ms(end)) - long(ns2ms(start)));
#endif
}
}
@@ -1018,17 +1018,17 @@
unsigned int num_of_plane;
if (hdmi_get_src_plane(srcColorFormat, &num_of_plane) < 0) {
- LOGE("%s::hdmi_get_src_plane(%d) fail", __func__, srcColorFormat);
+ ALOGE("%s::hdmi_get_src_plane(%d) fail", __func__, srcColorFormat);
return false;
}
if (mFlagHdmiStart[hdmiLayer] == false && m_startHdmi(hdmiLayer, num_of_plane) == false) {
- LOGE("%s::hdmiLayer(%d) fail", __func__, hdmiLayer);
+ ALOGE("%s::hdmiLayer(%d) fail", __func__, hdmiLayer);
return false;
}
#else
if (mFlagHdmiStart[hdmiLayer] == false && m_startHdmi(hdmiLayer) == false) {
- LOGE("%s::hdmiLayer(%d) fail", __func__, hdmiLayer);
+ ALOGE("%s::hdmiLayer(%d) fail", __func__, hdmiLayer);
return false;
}
#endif
@@ -1040,17 +1040,17 @@
bool SecHdmi::clear(int hdmiLayer)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s || hdmiLayer = %d", __func__, hdmiLayer);
+ ALOGD("%s || hdmiLayer = %d", __func__, hdmiLayer);
#endif
Mutex::Autolock lock(mLock);
if (mFlagCreate == false) {
- LOGE("%s::Not Yet Created \n", __func__);
+ ALOGE("%s::Not Yet Created \n", __func__);
return false;
}
if (mFlagHdmiStart[hdmiLayer] == true && m_stopHdmi(hdmiLayer) == false) {
- LOGE("%s::m_stopHdmi: layer[%d] fail \n", __func__, hdmiLayer);
+ ALOGE("%s::m_stopHdmi: layer[%d] fail \n", __func__, hdmiLayer);
return false;
}
return true;
@@ -1059,19 +1059,19 @@
bool SecHdmi::setHdmiOutputMode(int hdmiOutputMode, bool forceRun)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s::hdmiOutputMode = %d, forceRun = %d", __func__, hdmiOutputMode, forceRun);
+ ALOGD("%s::hdmiOutputMode = %d, forceRun = %d", __func__, hdmiOutputMode, forceRun);
#endif
Mutex::Autolock lock(mLock);
if (mFlagCreate == false) {
- LOGE("%s::Not Yet Created \n", __func__);
+ ALOGE("%s::Not Yet Created \n", __func__);
return false;
}
if (forceRun == false && mHdmiOutputMode == hdmiOutputMode) {
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s::same hdmiOutputMode(%d) \n", __func__, hdmiOutputMode);
+ ALOGD("%s::same hdmiOutputMode(%d) \n", __func__, hdmiOutputMode);
#endif
return true;
}
@@ -1080,7 +1080,7 @@
int v4l2OutputType = hdmi_outputmode_2_v4l2_output_type(hdmiOutputMode);
if (v4l2OutputType < 0) {
- LOGD("%s::hdmi_outputmode_2_v4l2_output_type(%d) fail\n", __func__, hdmiOutputMode);
+ ALOGD("%s::hdmi_outputmode_2_v4l2_output_type(%d) fail\n", __func__, hdmiOutputMode);
return false;
}
@@ -1089,11 +1089,11 @@
if (newV4l2OutputType != v4l2OutputType) {
newHdmiOutputMode = hdmi_v4l2_output_type_2_outputmode(newV4l2OutputType);
if (newHdmiOutputMode < 0) {
- LOGD("%s::hdmi_v4l2_output_type_2_outputmode(%d) fail\n", __func__, newV4l2OutputType);
+ ALOGD("%s::hdmi_v4l2_output_type_2_outputmode(%d) fail\n", __func__, newV4l2OutputType);
return false;
}
- LOGD("%s::calibration mode(%d -> %d)... \n", __func__, hdmiOutputMode, newHdmiOutputMode);
+ ALOGD("%s::calibration mode(%d -> %d)... \n", __func__, hdmiOutputMode, newHdmiOutputMode);
mHdmiInfoChange = true;
}
#endif
@@ -1109,19 +1109,19 @@
bool SecHdmi::setHdmiResolution(unsigned int hdmiResolutionValue, bool forceRun)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s:: hdmiResolutionValue = %d, forceRun = %d", __func__, hdmiResolutionValue, forceRun);
+ ALOGD("%s:: hdmiResolutionValue = %d, forceRun = %d", __func__, hdmiResolutionValue, forceRun);
#endif
Mutex::Autolock lock(mLock);
if (mFlagCreate == false) {
- LOGE("%s::Not Yet Created \n", __func__);
+ ALOGE("%s::Not Yet Created \n", __func__);
return false;
}
if (forceRun == false && mHdmiResolutionValue == hdmiResolutionValue) {
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s::same hdmiResolutionValue(%d) \n", __func__, hdmiResolutionValue);
+ ALOGD("%s::same hdmiResolutionValue(%d) \n", __func__, hdmiResolutionValue);
#endif
return true;
}
@@ -1149,11 +1149,11 @@
}
if (flagFoundIndex == false) {
- LOGE("%s::hdmi cannot control this resolution(%d) fail \n", __func__, hdmiResolutionValue);
+ ALOGE("%s::hdmi cannot control this resolution(%d) fail \n", __func__, hdmiResolutionValue);
// Set resolution to 480P
newHdmiResolutionValue = mHdmiResolutionValueList[mHdmiSizeOfResolutionValueList-2];
} else {
- LOGD("%s::HDMI resolutions size is calibrated(%d -> %d)..\n", __func__, hdmiResolutionValue, newHdmiResolutionValue);
+ ALOGD("%s::HDMI resolutions size is calibrated(%d -> %d)..\n", __func__, hdmiResolutionValue, newHdmiResolutionValue);
}
}
#else
@@ -1173,17 +1173,17 @@
}
if (flagFoundIndex == false) {
- LOGE("%s::hdmi cannot control this resolution(%d) fail \n", __func__, hdmiResolutionValue);
+ ALOGE("%s::hdmi cannot control this resolution(%d) fail \n", __func__, hdmiResolutionValue);
// Set resolution to 480P
newHdmiResolutionValue = mHdmiResolutionValueList[mHdmiSizeOfResolutionValueList-2];
} else {
- LOGD("%s::HDMI resolutions size is calibrated(%d -> %d)..\n", __func__, hdmiResolutionValue, newHdmiResolutionValue);
+ ALOGD("%s::HDMI resolutions size is calibrated(%d -> %d)..\n", __func__, hdmiResolutionValue, newHdmiResolutionValue);
}
}
#endif
else {
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s::find resolutions(%d) at once\n", __func__, hdmiResolutionValue);
+ ALOGD("%s::find resolutions(%d) at once\n", __func__, hdmiResolutionValue);
#endif
}
#endif
@@ -1199,19 +1199,19 @@
bool SecHdmi::setHdcpMode(bool hdcpMode, bool forceRun)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
Mutex::Autolock lock(mLock);
if (mFlagCreate == false) {
- LOGE("%s::Not Yet Created \n", __func__);
+ ALOGE("%s::Not Yet Created \n", __func__);
return false;
}
if (forceRun == false && mHdcpMode == hdcpMode) {
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s::same hdcpMode(%d) \n", __func__, hdcpMode);
+ ALOGD("%s::same hdcpMode(%d) \n", __func__, hdcpMode);
#endif
return true;
}
@@ -1225,18 +1225,18 @@
bool SecHdmi::setUIRotation(unsigned int rotVal, unsigned int hwcLayer)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
Mutex::Autolock lock(mLock);
if (mFlagCreate == false) {
- LOGE("%s::Not Yet Created \n", __func__);
+ ALOGE("%s::Not Yet Created \n", __func__);
return false;
}
if (rotVal % 90 != 0) {
- LOGE("%s::Invalid rotation value(%d)", __func__, rotVal);
+ ALOGE("%s::Invalid rotation value(%d)", __func__, rotVal);
return false;
}
@@ -1276,11 +1276,11 @@
bool SecHdmi::m_reset(int w, int h, int colorFormat, int hdmiLayer, int hwcLayer)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s called", __func__);
+ ALOGD("### %s called", __func__);
#endif
v4l2_std_id std_id = 0;
mFimcCurrentOutBufIndex = 0;
@@ -1290,14 +1290,14 @@
#if defined(BOARD_USE_V4L2)
if (mFlagHdmiStart[hdmiLayer] == true && m_stopHdmi(hdmiLayer) == false) {
- LOGE("%s::m_stopHdmi: layer[%d] fail", __func__, hdmiLayer);
+ ALOGE("%s::m_stopHdmi: layer[%d] fail", __func__, hdmiLayer);
return false;
}
#else
// stop all..
for (int layer = HDMI_LAYER_BASE + 1; layer < HDMI_LAYER_MAX; layer++) {
if (mFlagHdmiStart[layer] == true && m_stopHdmi(layer) == false) {
- LOGE("%s::m_stopHdmi: layer[%d] fail", __func__, layer);
+ ALOGE("%s::m_stopHdmi: layer[%d] fail", __func__, layer);
return false;
}
}
@@ -1305,14 +1305,14 @@
#if defined(BOARD_USE_V4L2)
if (hdmi_deinit_layer(hdmiLayer) < 0)
- LOGE("%s::hdmi_deinit_layer(%d) fail", __func__, hdmiLayer);
+ ALOGE("%s::hdmi_deinit_layer(%d) fail", __func__, hdmiLayer);
mHdmiFd[hdmiLayer] = hdmi_init_layer(hdmiLayer);
if (mHdmiFd[hdmiLayer] < 0)
- LOGE("%s::hdmi_init_layer(%d) fail", __func__, hdmiLayer);
+ ALOGE("%s::hdmi_init_layer(%d) fail", __func__, hdmiLayer);
if (tvout_std_v4l2_init(mHdmiFd[hdmiLayer], mHdmiPresetId) < 0)
- LOGE("%s::tvout_std_v4l2_init fail", __func__);
+ ALOGE("%s::tvout_std_v4l2_init fail", __func__);
#endif
if (w != mSrcWidth [hdmiLayer] ||
@@ -1332,7 +1332,7 @@
preVideoSrcColorFormat != HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP &&
preVideoSrcColorFormat != HAL_PIXEL_FORMAT_CUSTOM_YCrCb_420_SP &&
preVideoSrcColorFormat != HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP_TILED) {
- LOGI("%s: Unsupported preVideoSrcColorFormat = 0x%x\n", __func__, preVideoSrcColorFormat);
+ ALOGI("%s: Unsupported preVideoSrcColorFormat = 0x%x\n", __func__, preVideoSrcColorFormat);
preVideoSrcColorFormat = HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP_TILED;
}
@@ -1343,14 +1343,14 @@
colorFormat != HAL_PIXEL_FORMAT_CUSTOM_YCrCb_420_SP &&
colorFormat != HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP_TILED) {
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s call mSecFimc.setSrcParams\n", __func__);
+ ALOGD("### %s call mSecFimc.setSrcParams\n", __func__);
#endif
unsigned int full_wdith = ALIGN(w, 16);
unsigned int full_height = ALIGN(h, 2);
if (mSecFimc.setSrcParams(full_wdith, full_height, 0, 0,
(unsigned int*)&w, (unsigned int*)&h, colorFormat, true) == false) {
- LOGE("%s::mSecFimc.setSrcParams(%d, %d, %d) fail \n",
+ ALOGE("%s::mSecFimc.setSrcParams(%d, %d, %d) fail \n",
__func__, w, h, colorFormat);
return false;
}
@@ -1358,12 +1358,12 @@
mFimcDstColorFormat = HAL_PIXEL_FORMAT_CUSTOM_YCbCr_420_SP_TILED;
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s call mSecFimc.setDstParams\n", __func__);
+ ALOGD("### %s call mSecFimc.setDstParams\n", __func__);
#endif
if (mUIRotVal == 0 || mUIRotVal == 180) {
if (mSecFimc.setDstParams((unsigned int)w, (unsigned int)h, 0, 0,
(unsigned int*)&w, (unsigned int*)&h, mFimcDstColorFormat, true) == false) {
- LOGE("%s::mSecFimc.setDstParams(%d, %d, %d) fail \n",
+ ALOGE("%s::mSecFimc.setDstParams(%d, %d, %d) fail \n",
__func__, w, h, mFimcDstColorFormat);
return false;
}
@@ -1376,7 +1376,7 @@
} else {
if (mSecFimc.setDstParams((unsigned int)h, (unsigned int)w, 0, 0,
(unsigned int*)&h, (unsigned int*)&w, mFimcDstColorFormat, true) == false) {
- LOGE("%s::mSecFimc.setDstParams(%d, %d, %d) fail \n",
+ ALOGE("%s::mSecFimc.setDstParams(%d, %d, %d) fail \n",
__func__, w, h, mFimcDstColorFormat);
return false;
}
@@ -1445,7 +1445,7 @@
mHdmiResolutionHeight[hdmiLayer] = mHdmiDstHeight;
#ifdef DEBUG_MSG_ENABLE
- LOGD("m_reset saved param(%d, %d, %d, %d, %d, %d, %d) \n",
+ ALOGD("m_reset saved param(%d, %d, %d, %d, %d, %d, %d) \n",
srcW, mSrcWidth[hdmiLayer], \
srcH, mSrcHeight[hdmiLayer], \
colorFormat,mSrcColorFormat[hdmiLayer], \
@@ -1455,7 +1455,7 @@
if (mHdmiInfoChange == true) {
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("mHdmiInfoChange: %d\n", mHdmiInfoChange);
+ ALOGD("mHdmiInfoChange: %d\n", mHdmiInfoChange);
#endif
// stop all..
#if defined(BOARD_USES_CEC)
@@ -1467,28 +1467,28 @@
#endif
if (m_setHdmiOutputMode(mHdmiOutputMode) == false) {
- LOGE("%s::m_setHdmiOutputMode() fail \n", __func__);
+ ALOGE("%s::m_setHdmiOutputMode() fail \n", __func__);
return false;
}
if (mHdmiOutputMode == COMPOSITE_OUTPUT_MODE) {
std_id = composite_std_2_v4l2_std_id(mCompositeStd);
if ((int)std_id < 0) {
- LOGE("%s::composite_std_2_v4l2_std_id(%d) fail\n", __func__, mCompositeStd);
+ ALOGE("%s::composite_std_2_v4l2_std_id(%d) fail\n", __func__, mCompositeStd);
return false;
}
if (m_setCompositeResolution(mCompositeStd) == false) {
- LOGE("%s::m_setCompositeRsolution() fail \n", __func__);
+ ALOGE("%s::m_setCompositeRsolution() fail \n", __func__);
return false;
}
} else if (mHdmiOutputMode >= HDMI_OUTPUT_MODE_YCBCR &&
mHdmiOutputMode <= HDMI_OUTPUT_MODE_DVI) {
if (m_setHdmiResolution(mHdmiResolutionValue) == false) {
- LOGE("%s::m_setHdmiResolution() fail \n", __func__);
+ ALOGE("%s::m_setHdmiResolution() fail \n", __func__);
return false;
}
if (m_setHdcpMode(mHdcpMode) == false) {
- LOGE("%s::m_setHdcpMode() fail \n", __func__);
+ ALOGE("%s::m_setHdcpMode() fail \n", __func__);
return false;
}
#if !defined(BOARD_USE_V4L2)
@@ -1501,12 +1501,12 @@
for (int layer = HDMI_LAYER_BASE + 1; layer < HDMI_LAYER_MAX; layer++) {
if (hdmi_deinit_layer(layer) < 0)
- LOGE("%s::hdmi_init_layer(%d) fail \n", __func__, layer);
+ ALOGE("%s::hdmi_init_layer(%d) fail \n", __func__, layer);
}
for (int layer = HDMI_LAYER_BASE + 1; layer < HDMI_LAYER_MAX; layer++) {
if (hdmi_init_layer(layer) < 0)
- LOGE("%s::hdmi_init_layer(%d) fail \n", __func__, layer);
+ ALOGE("%s::hdmi_init_layer(%d) fail \n", __func__, layer);
}
#endif
@@ -1518,7 +1518,7 @@
#endif
if (m_setAudioMode(mAudioMode) == false)
- LOGE("%s::m_setAudioMode() fail \n", __func__);
+ ALOGE("%s::m_setAudioMode() fail \n", __func__);
}
mHdmiInfoChange = false;
@@ -1535,14 +1535,14 @@
bool SecHdmi::m_startHdmi(int hdmiLayer, unsigned int num_of_plane)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
bool ret = true;
int buf_index = 0;
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s: hdmiLayer(%d) called\n", __func__, hdmiLayer);
+ ALOGD("### %s: hdmiLayer(%d) called\n", __func__, hdmiLayer);
#endif
if (mFlagLayerEnable[hdmiLayer]) {
@@ -1552,13 +1552,13 @@
index = 0;
if (tvout_std_v4l2_qbuf(mHdmiFd[hdmiLayer], V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_MEMORY_USERPTR,
index, num_of_plane, &mMixerBuffer[hdmiLayer][0]) < 0) {
- LOGE("%s::tvout_std_v4l2_qbuf(index : %d) (mSrcBufNum : %d) failed", __func__, index, HDMI_NUM_MIXER_BUF);
+ ALOGE("%s::tvout_std_v4l2_qbuf(index : %d) (mSrcBufNum : %d) failed", __func__, index, HDMI_NUM_MIXER_BUF);
return false;
}
index++;
if (tvout_std_v4l2_streamon(mHdmiFd[hdmiLayer], V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) < 0) {
- LOGE("%s::tvout_std_v4l2_streamon() failed", __func__);
+ ALOGE("%s::tvout_std_v4l2_streamon() failed", __func__);
return false;
}
@@ -1566,12 +1566,12 @@
} else {
if (tvout_std_v4l2_qbuf(mHdmiFd[hdmiLayer], V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_MEMORY_USERPTR,
index, num_of_plane, &mMixerBuffer[hdmiLayer][0]) < 0) {
- LOGE("%s::tvout_std_v4l2_qbuf() failed", __func__);
+ ALOGE("%s::tvout_std_v4l2_qbuf() failed", __func__);
return false;
}
if (tvout_std_v4l2_dqbuf(mHdmiFd[hdmiLayer], V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_MEMORY_USERPTR, &buf_index, num_of_plane) < 0) {
- LOGE("%s::tvout_std_v4l2_dqbuf() failed", __func__);
+ ALOGE("%s::tvout_std_v4l2_dqbuf() failed", __func__);
return false;
}
index = buf_index;
@@ -1584,14 +1584,14 @@
bool SecHdmi::m_startHdmi(int hdmiLayer)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
bool ret = true;
int buf_index = 0;
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s: hdmiLayer(%d) called\n", __func__, hdmiLayer);
+ ALOGD("### %s: hdmiLayer(%d) called\n", __func__, hdmiLayer);
#endif
switch (hdmiLayer) {
@@ -1612,7 +1612,7 @@
}
break;
default :
- LOGE("%s::unmathced layer(%d) fail", __func__, hdmiLayer);
+ ALOGE("%s::unmathced layer(%d) fail", __func__, hdmiLayer);
ret = false;
break;
}
@@ -1624,17 +1624,17 @@
bool SecHdmi::m_stopHdmi(int hdmiLayer)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
bool ret = true;
if (mFlagHdmiStart[hdmiLayer] == false) {
- LOGD("%s::already HDMI(%d layer) stopped.. \n", __func__, hdmiLayer);
+ ALOGD("%s::already HDMI(%d layer) stopped.. \n", __func__, hdmiLayer);
return true;
}
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s : layer[%d] called\n", __func__, hdmiLayer);
+ ALOGD("### %s : layer[%d] called\n", __func__, hdmiLayer);
#endif
#if defined(BOARD_USE_V4L2)
@@ -1652,20 +1652,20 @@
#endif
break;
default :
- LOGE("%s::unmathced layer(%d) fail", __func__, hdmiLayer);
+ ALOGE("%s::unmathced layer(%d) fail", __func__, hdmiLayer);
ret = false;
break;
}
if (mFlagLayerEnable[hdmiLayer]) {
if (tvout_std_v4l2_streamoff(mHdmiFd[hdmiLayer], V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) < 0) {
- LOGE("%s::tvout_std_v4l2_streamon layer(%d) failed", __func__, hdmiLayer);
+ ALOGE("%s::tvout_std_v4l2_streamon layer(%d) failed", __func__, hdmiLayer);
return false;
}
/* clear buffer */
if (tvout_std_v4l2_reqbuf(mHdmiFd[hdmiLayer], V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_MEMORY_USERPTR, 0) < 0) {
- LOGE("%s::tvout_std_v4l2_reqbuf(buf_num=%d)[graphic layer] failed", __func__, 0);
+ ALOGE("%s::tvout_std_v4l2_reqbuf(buf_num=%d)[graphic layer] failed", __func__, 0);
return -1;
}
@@ -1694,7 +1694,7 @@
}
break;
default :
- LOGE("%s::unmathced layer(%d) fail", __func__, hdmiLayer);
+ ALOGE("%s::unmathced layer(%d) fail", __func__, hdmiLayer);
ret = false;
break;
}
@@ -1706,23 +1706,23 @@
bool SecHdmi::m_setHdmiOutputMode(int hdmiOutputMode)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
if (hdmiOutputMode == mCurrentHdmiOutputMode) {
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s::same hdmiOutputMode(%d) \n", __func__, hdmiOutputMode);
+ ALOGD("%s::same hdmiOutputMode(%d) \n", __func__, hdmiOutputMode);
#endif
return true;
}
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s called\n", __func__);
+ ALOGD("### %s called\n", __func__);
#endif
int v4l2OutputType = hdmi_outputmode_2_v4l2_output_type(hdmiOutputMode);
if (v4l2OutputType < 0) {
- LOGE("%s::hdmi_outputmode_2_v4l2_output_type(%d) fail\n", __func__, hdmiOutputMode);
+ ALOGE("%s::hdmi_outputmode_2_v4l2_output_type(%d) fail\n", __func__, hdmiOutputMode);
return false;
}
@@ -1736,18 +1736,18 @@
bool SecHdmi::m_setCompositeResolution(unsigned int compositeStdId)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s called\n", __func__);
+ ALOGD("### %s called\n", __func__);
#endif
int w = 0;
int h = 0;
if (mHdmiOutputMode != COMPOSITE_OUTPUT_MODE) {
- LOGE("%s:: not supported output type \n", __func__);
+ ALOGE("%s:: not supported output type \n", __func__);
return false;
}
@@ -1766,7 +1766,7 @@
h = 576;
break;
default:
- LOGE("%s::unmathced composite_std(%d)", __func__, compositeStdId);
+ ALOGE("%s::unmathced composite_std(%d)", __func__, compositeStdId);
return false;
}
@@ -1782,18 +1782,18 @@
bool SecHdmi::m_setHdmiResolution(unsigned int hdmiResolutionValue)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
if (hdmiResolutionValue == mCurrentHdmiResolutionValue) {
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s::same hdmiResolutionValue(%d) \n", __func__, hdmiResolutionValue);
+ ALOGD("%s::same hdmiResolutionValue(%d) \n", __func__, hdmiResolutionValue);
#endif
return true;
}
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s called\n", __func__);
+ ALOGD("### %s called\n", __func__);
#endif
int w = 0;
@@ -1809,19 +1809,19 @@
mHdmiOutputMode <= HDMI_OUTPUT_MODE_DVI) {
#if defined(BOARD_USE_V4L2)
if (hdmi_resolution_2_preset_id(hdmiResolutionValue, &w, &h, &preset_id) < 0) {
- LOGE("%s::hdmi_resolution_2_std_id(%d) fail\n", __func__, hdmiResolutionValue);
+ ALOGE("%s::hdmi_resolution_2_std_id(%d) fail\n", __func__, hdmiResolutionValue);
return false;
}
mHdmiPresetId = preset_id;
#else
if (hdmi_resolution_2_std_id(hdmiResolutionValue, &w, &h, &std_id) < 0) {
- LOGE("%s::hdmi_resolution_2_std_id(%d) fail\n", __func__, hdmiResolutionValue);
+ ALOGE("%s::hdmi_resolution_2_std_id(%d) fail\n", __func__, hdmiResolutionValue);
return false;
}
mHdmiStdId = std_id;
#endif
} else {
- LOGE("%s:: not supported output type \n", __func__);
+ ALOGE("%s:: not supported output type \n", __func__);
return false;
}
@@ -1838,14 +1838,14 @@
#ifdef DEBUG_HDMI_HW_LEVEL
#if defined(BOARD_USE_V4L2)
- LOGD("%s:: mHdmiDstWidth = %d, mHdmiDstHeight = %d, mHdmiPresetId = 0x%x, hdmiResolutionValue = 0x%x\n",
+ ALOGD("%s:: mHdmiDstWidth = %d, mHdmiDstHeight = %d, mHdmiPresetId = 0x%x, hdmiResolutionValue = 0x%x\n",
__func__,
mHdmiDstWidth,
mHdmiDstHeight,
mHdmiPresetId,
hdmiResolutionValue);
#else
- LOGD("%s:: mHdmiDstWidth = %d, mHdmiDstHeight = %d, mHdmiStdId = 0x%x, hdmiResolutionValue = 0x%x\n",
+ ALOGD("%s:: mHdmiDstWidth = %d, mHdmiDstHeight = %d, mHdmiStdId = 0x%x, hdmiResolutionValue = 0x%x\n",
__func__,
mHdmiDstWidth,
mHdmiDstHeight,
@@ -1860,19 +1860,19 @@
bool SecHdmi::m_setHdcpMode(bool hdcpMode)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
if (hdcpMode == mCurrentHdcpMode) {
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s::same hdcpMode(%d) \n", __func__, hdcpMode);
+ ALOGD("%s::same hdcpMode(%d) \n", __func__, hdcpMode);
#endif
return true;
}
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s called\n", __func__);
+ ALOGD("### %s called\n", __func__);
#endif
if (hdcpMode == true)
@@ -1888,22 +1888,22 @@
bool SecHdmi::m_setAudioMode(int audioMode)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
if (audioMode == mCurrentAudioMode) {
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s::same audioMode(%d) \n", __func__, audioMode);
+ ALOGD("%s::same audioMode(%d) \n", __func__, audioMode);
#endif
return true;
}
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s called\n", __func__);
+ ALOGD("### %s called\n", __func__);
#endif
if (hdmi_check_audio() < 0) {
- LOGE("%s::hdmi_check_audio() fail \n", __func__);
+ ALOGE("%s::hdmi_check_audio() fail \n", __func__);
return false;
}
@@ -1915,7 +1915,7 @@
int SecHdmi::m_resolutionValueIndex(unsigned int ResolutionValue)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int index = -1;
@@ -1932,11 +1932,11 @@
bool SecHdmi::m_flagHWConnected(void)
{
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s called\n", __func__);
+ ALOGD("### %s called\n", __func__);
#endif
bool ret = true;
@@ -1944,7 +1944,7 @@
if (hdmiStatus <= 0) {
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s::hdmi_cable_status() fail \n", __func__);
+ ALOGD("%s::hdmi_cable_status() fail \n", __func__);
#endif
ret = false;
} else {
diff --git a/exynos4/hal/libhdmi/SecHdmi/SecHdmiCommon.h b/exynos4/hal/libhdmi/SecHdmi/SecHdmiCommon.h
index 203dfe4..a90e687 100644
--- a/exynos4/hal/libhdmi/SecHdmi/SecHdmiCommon.h
+++ b/exynos4/hal/libhdmi/SecHdmi/SecHdmiCommon.h
@@ -18,8 +18,8 @@
**
*/
-//#define LOG_NDEBUG 0
-//#define LOG_TAG "libhdmi"
+//#define ALOG_NDEBUG 0
+//#define ALOG_TAG "libhdmi"
#include <cutils/log.h>
#include "videodev2.h"
diff --git a/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp b/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp
index 217ce51..fd135f1 100644
--- a/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp
+++ b/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.cpp
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-//#define LOG_NDEBUG 0
-//#define LOG_TAG "libhdmi"
+//#define ALOG_NDEBUG 0
+//#define ALOG_TAG "libhdmi"
#include <cutils/log.h>
#include <sys/types.h>
@@ -81,7 +81,7 @@
struct HDMIAudioParameter audio;
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
audio.formatCode = LPCM_FORMAT;
@@ -89,142 +89,142 @@
audio.channelNum = CH_2;
audio.sampleFreq = SF_44KHZ;
- LOGI("=============== HDMI Audio =============\n");
+ ALOGI("=============== HDMI Audio =============\n");
if (EDIDAudioModeSupport(&audio))
- LOGI("= 2CH_PCM 44100Hz audio supported =\n");
+ ALOGI("= 2CH_PCM 44100Hz audio supported =\n");
- LOGI("========= HDMI Mode & Color Space =======\n");
+ ALOGI("========= HDMI Mode & Color Space =======\n");
video.mode = HDMI;
if (EDIDHDMIModeSupport(&video)) {
video.colorSpace = HDMI_CS_YCBCR444;
if (EDIDColorSpaceSupport(&video))
- LOGI("= 1. HDMI(YCbCr) =\n");
+ ALOGI("= 1. HDMI(YCbCr) =\n");
video.colorSpace = HDMI_CS_RGB;
if (EDIDColorSpaceSupport(&video))
- LOGI("= 2. HDMI(RGB) =\n");
+ ALOGI("= 2. HDMI(RGB) =\n");
} else {
video.mode = DVI;
if (EDIDHDMIModeSupport(&video))
- LOGI("= 3. DVI =\n");
+ ALOGI("= 3. DVI =\n");
}
- LOGI("=========== HDMI Rseolution ========\n");
+ ALOGI("=========== HDMI Rseolution ========\n");
/* 480P */
video.resolution = v720x480p_60Hz;
video.pixelAspectRatio = HDMI_PIXEL_RATIO_16_9;
video.hdmi_3d_format = HDMI_2D_VIDEO_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= 4. 480P_60_16_9 (0x04000000) =\n");
+ ALOGI("= 4. 480P_60_16_9 (0x04000000) =\n");
video.resolution = v640x480p_60Hz;
video.pixelAspectRatio = HDMI_PIXEL_RATIO_4_3;
video.hdmi_3d_format = HDMI_2D_VIDEO_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= 5. 480P_60_4_3 (0x05000000) =\n");
+ ALOGI("= 5. 480P_60_4_3 (0x05000000) =\n");
/* 576P */
video.resolution = v720x576p_50Hz;
video.pixelAspectRatio = HDMI_PIXEL_RATIO_16_9;
video.hdmi_3d_format = HDMI_2D_VIDEO_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= 6. 576P_50_16_9 (0x06000000) =\n");
+ ALOGI("= 6. 576P_50_16_9 (0x06000000) =\n");
video.pixelAspectRatio = HDMI_PIXEL_RATIO_4_3;
video.hdmi_3d_format = HDMI_2D_VIDEO_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= 7. 576P_50_4_3 (0x07000000) =\n");
+ ALOGI("= 7. 576P_50_4_3 (0x07000000) =\n");
/* 720P 60 */
video.resolution = v1280x720p_60Hz;
video.hdmi_3d_format = HDMI_2D_VIDEO_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= 8. 720P_60 (0x08000000) =\n");
+ ALOGI("= 8. 720P_60 (0x08000000) =\n");
/* 720P_50 */
video.resolution = v1280x720p_50Hz;
video.hdmi_3d_format = HDMI_2D_VIDEO_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= 9. 720P_50 (0x09000000) =\n");
+ ALOGI("= 9. 720P_50 (0x09000000) =\n");
/* 1080P_60 */
video.resolution = v1920x1080p_60Hz;
video.hdmi_3d_format = HDMI_2D_VIDEO_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= a. 1080P_60 (0x0a000000) =\n");
+ ALOGI("= a. 1080P_60 (0x0a000000) =\n");
/* 1080P_50 */
video.resolution = v1920x1080p_50Hz;
video.hdmi_3d_format = HDMI_2D_VIDEO_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= b. 1080P_50 (0x0b000000) =\n");
+ ALOGI("= b. 1080P_50 (0x0b000000) =\n");
/* 1080I_60 */
video.resolution = v1920x1080i_60Hz;
video.hdmi_3d_format = HDMI_2D_VIDEO_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= c. 1080I_60 (0x0c000000) =\n");
+ ALOGI("= c. 1080I_60 (0x0c000000) =\n");
/* 1080I_50 */
video.resolution = v1920x1080i_50Hz;
video.hdmi_3d_format = HDMI_2D_VIDEO_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= d. 1080I_50 (0x0d000000) =\n");
+ ALOGI("= d. 1080I_50 (0x0d000000) =\n");
/* 1080P_30 */
video.resolution = v1920x1080p_30Hz;
video.hdmi_3d_format = HDMI_2D_VIDEO_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= e. 1080P_30 (0x12000000) =\n");
+ ALOGI("= e. 1080P_30 (0x12000000) =\n");
- LOGI("=========== HDMI 3D Format ========\n");
+ ALOGI("=========== HDMI 3D Format ========\n");
/* 720P_60_SBS_HALF */
video.resolution = v1280x720p_60Hz;
video.hdmi_3d_format = HDMI_3D_SSH_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= f. 720P_60_SBS_HALF (0x13000000) =\n");
+ ALOGI("= f. 720P_60_SBS_HALF (0x13000000) =\n");
/* 720P_59_SBS_HALF */
video.resolution = v1280x720p_60Hz;
video.hdmi_3d_format = HDMI_3D_SSH_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= 10. 720P_59_SBS_HALF (0x14000000) =\n");
+ ALOGI("= 10. 720P_59_SBS_HALF (0x14000000) =\n");
/* 720P_50_TB */
video.resolution = v1280x720p_50Hz;
video.hdmi_3d_format = HDMI_3D_TB_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= 11. 720P_50_TB (0x15000000) =\n");
+ ALOGI("= 11. 720P_50_TB (0x15000000) =\n");
/* 1080P_24_TB */
video.resolution = v1920x1080p_24Hz;
video.hdmi_3d_format = HDMI_3D_TB_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= 12. 1080P_24_TB (0x16000000) =\n");
+ ALOGI("= 12. 1080P_24_TB (0x16000000) =\n");
/* 1080P_23_TB */
video.resolution = v1920x1080p_24Hz;
video.hdmi_3d_format = HDMI_3D_TB_FORMAT;
if (EDIDVideoResolutionSupport(&video))
- LOGI("= 13. 1080P_24_TB (0x17000000) =\n");
- LOGI("=========================================\n");
+ ALOGI("= 13. 1080P_24_TB (0x17000000) =\n");
+ ALOGI("=========================================\n");
}
int tvout_open(const char *fp_name)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int fp;
fp = open(fp_name, O_RDWR);
if (fp < 0)
- LOGE("drv (%s) open failed!!\n", fp_name);
+ ALOGE("drv (%s) open failed!!\n", fp_name);
return fp;
}
@@ -232,7 +232,7 @@
int tvout_std_v4l2_init(int fd, unsigned int preset_id)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s:: preset_id = 0x%x", __func__, preset_id);
+ ALOGD("%s:: preset_id = 0x%x", __func__, preset_id);
#endif
int ret;
@@ -246,7 +246,7 @@
if (output_type >= V4L2_OUTPUT_TYPE_DIGITAL &&
output_type <= V4L2_OUTPUT_TYPE_DVI)
if (ioctl(fd_tvout, VIDIOC_HDCP_ENABLE, g_hdcp_en) < 0)
- LOGE("%s::VIDIOC_HDCP_ENABLE failed %d", __func__, errno);
+ ALOGE("%s::VIDIOC_HDCP_ENABLE failed %d", __func__, errno);
*/
i = 0;
@@ -254,7 +254,7 @@
do {
output.index = i;
ret = tvout_std_v4l2_enum_output(fd, &output);
- LOGD("tvout_v4l2_enum_output():: output_type=%d output.index=%d output.name=%s", output.type, output.index, output.name);
+ ALOGD("tvout_v4l2_enum_output():: output_type=%d output.index=%d output.name=%s", output.type, output.index, output.name);
if (output.type == output_type) {
matched = 1;
break;
@@ -263,7 +263,7 @@
} while (ret >=0);
if (!matched) {
- LOGE("%s::no matched output type [type=%d]", __func__, output_type);
+ ALOGE("%s::no matched output type [type=%d]", __func__, output_type);
// return -1;
}
@@ -276,7 +276,7 @@
tvout_std_v4l2_enum_dv_presets(fd);
preset.preset = preset_id;
if (tvout_std_v4l2_s_dv_preset(fd, &preset) < 0 ) {
- LOGE("%s::tvout_std_v4l2_s_dv_preset failed", __func__);
+ ALOGE("%s::tvout_std_v4l2_s_dv_preset failed", __func__);
return -1;
}
// }
@@ -287,23 +287,23 @@
int tvout_std_v4l2_querycap(int fd, char *node)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
struct v4l2_capability v4l2cap;
if (ioctl(fd, VIDIOC_QUERYCAP, &v4l2cap) < 0) {
- LOGE("%s::VIDIOC_QUERYCAP failed", __func__);
+ ALOGE("%s::VIDIOC_QUERYCAP failed", __func__);
return -1;
}
if (!(v4l2cap.capabilities & V4L2_CAP_STREAMING)) {
- LOGE("%s::%s is not support streaming", __func__, node);
+ ALOGE("%s::%s is not support streaming", __func__, node);
return -1;
}
if (!(v4l2cap.capabilities & V4L2_CAP_VIDEO_OUTPUT_MPLANE)) {
- LOGE("%s::%s is not support video output mplane", __func__, node);
+ ALOGE("%s::%s is not support video output mplane", __func__, node);
return -1;
}
@@ -313,7 +313,7 @@
int tvout_std_v4l2_enum_dv_presets(int fd)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
struct v4l2_dv_enum_preset enum_preset;
@@ -326,11 +326,11 @@
if (ret < 0) {
if (errno == EINVAL)
break;
- LOGE("%s::VIDIOC_ENUM_DV_PRESETS", __func__);
+ ALOGE("%s::VIDIOC_ENUM_DV_PRESETS", __func__);
return -1;
}
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s::index=%d, preset=0x%08x, name=%s, w=%d, h=%d",
+ ALOGD("%s::index=%d, preset=0x%08x, name=%s, w=%d, h=%d",
__func__, enum_preset.index, enum_preset.preset, enum_preset.name, enum_preset.width, enum_preset.height);
#endif
}
@@ -341,11 +341,11 @@
int tvout_std_v4l2_s_dv_preset(int fd, struct v4l2_dv_preset *preset)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
if (ioctl(fd, VIDIOC_S_DV_PRESET, preset) < 0) {
- LOGE("%s::VIDIOC_S_DV_PRESET failed", __func__);
+ ALOGE("%s::VIDIOC_S_DV_PRESET failed", __func__);
return -1;
}
@@ -361,7 +361,7 @@
int tvout_std_v4l2_enum_output(int fd, struct v4l2_output *output)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int ret;
@@ -369,7 +369,7 @@
ret = ioctl(fd, VIDIOC_ENUMOUTPUT, output);
if (ret >=0)
- LOGV("tvout_v4l2_enum_output" "enum. output [index = %d] :: type : 0x%08x , name = %s\n",
+ ALOGV("tvout_v4l2_enum_output" "enum. output [index = %d] :: type : 0x%08x , name = %s\n",
output->index,output->type,output->name);
return ret;
@@ -384,14 +384,14 @@
int tvout_std_v4l2_s_output(int fd, int index)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s:: index = 0x%x", __func__, index);
+ ALOGD("%s:: index = 0x%x", __func__, index);
#endif
int ret;
ret = ioctl(fd, VIDIOC_S_OUTPUT, &index);
if (ret < 0) {
- LOGE("tvout_v4l2_s_output" "VIDIOC_S_OUTPUT failed %d\n", errno);
+ ALOGE("tvout_v4l2_s_output" "VIDIOC_S_OUTPUT failed %d\n", errno);
return ret;
}
@@ -401,17 +401,17 @@
int tvout_std_v4l2_g_output(int fd, int *index)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int ret;
ret = ioctl(fd, VIDIOC_G_OUTPUT, index);
if (ret < 0) {
- LOGE("tvout_v4l2_g_output" "VIDIOC_G_OUTPUT failed %d\n", errno);
+ ALOGE("tvout_v4l2_g_output" "VIDIOC_G_OUTPUT failed %d\n", errno);
return ret;
} else {
- LOGV("tvout_v4l2_g_output" "Current output index %d\n", *index);
+ ALOGV("tvout_v4l2_g_output" "Current output index %d\n", *index);
}
return ret;
@@ -420,14 +420,14 @@
int tvout_std_v4l2_s_fmt(int fd, enum v4l2_buf_type type, enum v4l2_field field, int w, int h, int colorformat, int num_planes)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
struct v4l2_format fmt;
fmt.type = type;
// if (ioctl(fd, VIDIOC_G_FMT, &fmt) < 0) {
-// LOGE("%s::VIDIOC_G_FMT failed", __func__);
+// ALOGE("%s::VIDIOC_G_FMT failed", __func__);
// return -1;
// }
@@ -448,13 +448,13 @@
fmt.fmt.pix_mp.num_planes = num_planes;
break;
default:
- LOGE("%s::invalid buffer type", __func__);
+ ALOGE("%s::invalid buffer type", __func__);
return -1;
break;
}
if (ioctl(fd, VIDIOC_S_FMT, &fmt) < 0) {
- LOGE("%s::VIDIOC_S_FMT failed", __func__);
+ ALOGE("%s::VIDIOC_S_FMT failed", __func__);
return -1;
}
@@ -464,7 +464,7 @@
int tvout_std_v4l2_s_crop(int fd, enum v4l2_buf_type type, enum v4l2_field, int x, int y, int w, int h)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
struct v4l2_crop crop;
@@ -476,7 +476,7 @@
crop.c.height = h;
if (ioctl(fd, VIDIOC_S_CROP, &crop) < 0) {
- LOGE("%s::VIDIOC_S_CROP (x=%d, y=%d, w=%d, h=%d) failed",
+ ALOGE("%s::VIDIOC_S_CROP (x=%d, y=%d, w=%d, h=%d) failed",
__func__, x, y, w, h);
return -1;
}
@@ -487,7 +487,7 @@
int tvout_std_v4l2_s_ctrl(int fd, int id, int value)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
struct v4l2_control vc;
@@ -496,7 +496,7 @@
vc.value = value;
if (ioctl(fd, VIDIOC_S_CTRL, &vc) < 0) {
- LOGE("%s::VIDIOC_S_CTRL (id=%d,value=%d) failed", __func__, id, value);
+ ALOGE("%s::VIDIOC_S_CTRL (id=%d,value=%d) failed", __func__, id, value);
return -1;
}
@@ -506,7 +506,7 @@
int tvout_std_v4l2_reqbuf(int fd, enum v4l2_buf_type type, enum v4l2_memory memory, unsigned int num_bufs)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
struct v4l2_requestbuffers reqbuf;
@@ -516,12 +516,12 @@
reqbuf.count = num_bufs;
if (ioctl(fd, VIDIOC_REQBUFS, &reqbuf) < 0) {
- LOGE("%s::VIDIOC_REQBUFS failed", __func__);
+ ALOGE("%s::VIDIOC_REQBUFS failed", __func__);
return -1;
}
if (reqbuf.count < num_bufs) {
- LOGE("%s::VIDIOC_REQBUFS failed ((reqbuf.count(%d) < num_bufs(%d))",
+ ALOGE("%s::VIDIOC_REQBUFS failed ((reqbuf.count(%d) < num_bufs(%d))",
__func__, reqbuf.count, num_bufs);
return -1;
}
@@ -532,7 +532,7 @@
int tvout_std_v4l2_querybuf(int fd, enum v4l2_buf_type type, enum v4l2_memory memory, unsigned int buf_index, unsigned int num_planes, SecBuffer *secBuf)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
struct v4l2_buffer buf;
@@ -544,7 +544,7 @@
memset(&planes[i], 0, sizeof(struct v4l2_plane));
if (MAX_BUFFERS_MIXER <= buf_index || MAX_PLANES_MIXER <= num_planes) {
- LOGE("%s::exceed MAX! : buf_index=%d, num_plane=%d", __func__, buf_index, num_planes);
+ ALOGE("%s::exceed MAX! : buf_index=%d, num_plane=%d", __func__, buf_index, num_planes);
return -1;
}
@@ -555,24 +555,24 @@
buf.m.planes = planes;
if (ioctl(fd, VIDIOC_QUERYBUF, &buf) < 0) {
- LOGE("%s::VIDIOC_QUERYBUF failed, plane_cnt=%d", __func__, buf.length);
+ ALOGE("%s::VIDIOC_QUERYBUF failed, plane_cnt=%d", __func__, buf.length);
return -1;
}
for (unsigned int i = 0; i < num_planes; i++) {
if ((secBuf->virt.extP[i] = (char *)mmap(0, buf.m.planes[i].length,
PROT_READ | PROT_WRITE, MAP_SHARED, fd, buf.m.planes[i].m.mem_offset)) < 0) {
- LOGE("%s::mmap failed", __func__);
- LOGE("%s::Offset = 0x%x", __func__, buf.m.planes[i].m.mem_offset);
- LOGE("%s::Legnth = %d" , __func__, buf.m.planes[i].length);
- LOGE("%s::vaddr[%d][%d] = 0x%x", __func__, buf_index, i, (unsigned int)secBuf->virt.extP[i]);
+ ALOGE("%s::mmap failed", __func__);
+ ALOGE("%s::Offset = 0x%x", __func__, buf.m.planes[i].m.mem_offset);
+ ALOGE("%s::Legnth = %d" , __func__, buf.m.planes[i].length);
+ ALOGE("%s::vaddr[%d][%d] = 0x%x", __func__, buf_index, i, (unsigned int)secBuf->virt.extP[i]);
return -1;
}
secBuf->size.extS[i] = buf.m.planes[i].length;
#ifdef DEBUG_LIB_FIMC
- LOGD("%s::vaddr[bufidx=%d][planeidx=%d] = 0x%x", __func__, buf_index, i, (unsigned int)secBuf->virt.extP[i]);
- LOGD("%s::Legnth = %d" , __func__, buf.m.planes[i].length);
+ ALOGD("%s::vaddr[bufidx=%d][planeidx=%d] = 0x%x", __func__, buf_index, i, (unsigned int)secBuf->virt.extP[i]);
+ ALOGD("%s::Legnth = %d" , __func__, buf.m.planes[i].length);
#endif
}
@@ -582,7 +582,7 @@
int tvout_std_v4l2_qbuf(int fd, enum v4l2_buf_type type, enum v4l2_memory memory, int buf_index, int num_planes, SecBuffer *secBuf)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
struct v4l2_buffer buf;
@@ -605,7 +605,7 @@
}
if (ioctl(fd, VIDIOC_QBUF, &buf) < 0) {
- LOGE("%s::VIDIOC_QBUF failed", __func__);
+ ALOGE("%s::VIDIOC_QBUF failed", __func__);
return -1;
}
@@ -615,7 +615,7 @@
int tvout_std_v4l2_dqbuf(int fd, enum v4l2_buf_type type, enum v4l2_memory memory, int *buf_index, int num_planes)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
struct v4l2_buffer buf;
@@ -632,7 +632,7 @@
buf.m.planes = planes;
if (ioctl(fd, VIDIOC_DQBUF, &buf) < 0) {
- LOGE("%s::VIDIOC_DQBUF failed", __func__);
+ ALOGE("%s::VIDIOC_DQBUF failed", __func__);
return -1;
}
*buf_index = buf.index;
@@ -643,11 +643,11 @@
int tvout_std_v4l2_streamon(int fd, enum v4l2_buf_type type)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
if (ioctl(fd, VIDIOC_STREAMON, &type) < 0) {
- LOGE("%s::VIDIOC_STREAMON failed", __func__);
+ ALOGE("%s::VIDIOC_STREAMON failed", __func__);
return -1;
}
@@ -657,11 +657,11 @@
int tvout_std_v4l2_streamoff(int fd, enum v4l2_buf_type type)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
if (ioctl(fd, VIDIOC_STREAMOFF, &type) < 0) {
- LOGE("%s::VIDIOC_STREAMOFF failed", __func__);
+ ALOGE("%s::VIDIOC_STREAMOFF failed", __func__);
return -1;
}
@@ -671,7 +671,7 @@
int tvout_init(v4l2_std_id std_id)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s:: std_id = 0x%x", __func__, std_id);
+ ALOGD("%s:: std_id = 0x%x", __func__, std_id);
#endif
int ret;
@@ -687,7 +687,7 @@
if (fp_tvout <= 0) {
fp_tvout = tvout_open(TVOUT_DEV);
if (fp_tvout < 0) {
- LOGE("tvout video drv open failed\n");
+ ALOGE("tvout video drv open failed\n");
return -1;
}
}
@@ -695,7 +695,7 @@
if (output_type >= V4L2_OUTPUT_TYPE_DIGITAL &&
output_type <= V4L2_OUTPUT_TYPE_DVI)
if (ioctl(fp_tvout, VIDIOC_HDCP_ENABLE, g_hdcp_en) < 0)
- LOGE("tvout_init" "VIDIOC_HDCP_ENABLE failed %d\n", errno);
+ ALOGE("tvout_init" "VIDIOC_HDCP_ENABLE failed %d\n", errno);
/* ============== query capability============== */
tvout_v4l2_querycap(fp_tvout);
@@ -719,7 +719,7 @@
} while (ret >=0);
if (!matched) {
- LOGE("no matched output type [type : 0x%08x]\n", output_type);
+ ALOGE("no matched output type [type : 0x%08x]\n", output_type);
return -1;
}
@@ -747,7 +747,7 @@
int tvout_deinit()
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
if (0 < fp_tvout) {
@@ -760,7 +760,7 @@
int tvout_v4l2_querycap(int fp)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s:: fp = 0x%x", __func__, fp);
+ ALOGD("%s:: fp = 0x%x", __func__, fp);
#endif
struct v4l2_capability cap;
@@ -769,12 +769,12 @@
ret = ioctl(fp, VIDIOC_QUERYCAP, &cap);
if (ret < 0) {
- LOGE("tvout_v4l2_querycap" "VIDIOC_QUERYCAP failed %d\n", errno);
+ ALOGE("tvout_v4l2_querycap" "VIDIOC_QUERYCAP failed %d\n", errno);
return ret;
}
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("tvout_v4l2_querycap" "DRIVER : %s, CARD : %s, CAP.: 0x%08x\n",
+ ALOGD("tvout_v4l2_querycap" "DRIVER : %s, CARD : %s, CAP.: 0x%08x\n",
cap.driver, cap.card, cap.capabilities);
#endif
@@ -791,14 +791,14 @@
int tvout_v4l2_g_std(int fp, v4l2_std_id *std_id)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int ret;
ret = ioctl(fp, VIDIOC_G_STD, std_id);
if (ret < 0) {
- LOGE("tvout_v4l2_g_std" "VIDIOC_G_STD failed %d\n", errno);
+ ALOGE("tvout_v4l2_g_std" "VIDIOC_G_STD failed %d\n", errno);
return ret;
}
@@ -808,14 +808,14 @@
int tvout_v4l2_s_std(int fp, v4l2_std_id std_id)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s:: std_id = 0x%x", __func__, std_id);
+ ALOGD("%s:: std_id = 0x%x", __func__, std_id);
#endif
int ret;
ret = ioctl(fp, VIDIOC_S_STD, &std_id);
if (ret < 0) {
- LOGE("tvout_v4l2_s_std" "VIDIOC_S_STD failed %d\n", errno);
+ ALOGE("tvout_v4l2_s_std" "VIDIOC_S_STD failed %d\n", errno);
return ret;
}
@@ -832,13 +832,13 @@
int tvout_v4l2_enum_std(int fp, struct v4l2_standard *std, v4l2_std_id std_id)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
std->index = 0;
while (0 == ioctl (fp, VIDIOC_ENUMSTD, std)) {
if (std->id & std_id)
- LOGV("tvout_v4l2_enum_std" "Current video standard: %s\n", std->name);
+ ALOGV("tvout_v4l2_enum_std" "Current video standard: %s\n", std->name);
std->index++;
}
@@ -855,7 +855,7 @@
int tvout_v4l2_enum_output(int fp, struct v4l2_output *output)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int ret;
@@ -863,7 +863,7 @@
ret = ioctl(fp, VIDIOC_ENUMOUTPUT, output);
if (ret >=0)
- LOGV("tvout_v4l2_enum_output" "enum. output [index = %d] :: type : 0x%08x , name = %s\n",
+ ALOGV("tvout_v4l2_enum_output" "enum. output [index = %d] :: type : 0x%08x , name = %s\n",
output->index,output->type,output->name);
return ret;
@@ -878,14 +878,14 @@
int tvout_v4l2_s_output(int fp, int index)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s:: index = 0x%x", __func__, index);
+ ALOGD("%s:: index = 0x%x", __func__, index);
#endif
int ret;
ret = ioctl(fp, VIDIOC_S_OUTPUT, &index);
if (ret < 0) {
- LOGE("tvout_v4l2_s_output" "VIDIOC_S_OUTPUT failed %d\n", errno);
+ ALOGE("tvout_v4l2_s_output" "VIDIOC_S_OUTPUT failed %d\n", errno);
return ret;
}
@@ -895,17 +895,17 @@
int tvout_v4l2_g_output(int fp, int *index)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int ret;
ret = ioctl(fp, VIDIOC_G_OUTPUT, index);
if (ret < 0) {
- LOGE("tvout_v4l2_g_output" "VIDIOC_G_OUTPUT failed %d\n", errno);
+ ALOGE("tvout_v4l2_g_output" "VIDIOC_G_OUTPUT failed %d\n", errno);
return ret;
} else {
- LOGV("tvout_v4l2_g_output" "Current output index %d\n", *index);
+ ALOGV("tvout_v4l2_g_output" "Current output index %d\n", *index);
}
return ret;
@@ -921,12 +921,12 @@
int tvout_v4l2_enum_fmt(int fp, struct v4l2_fmtdesc *desc)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
desc->index = 0;
while (0 == ioctl(fp, VIDIOC_ENUM_FMT, desc)) {
- LOGV("tvout_v4l2_enum_fmt" "enum. fmt [id : 0x%08x] :: type = 0x%08x, name = %s, pxlfmt = 0x%08x\n",
+ ALOGV("tvout_v4l2_enum_fmt" "enum. fmt [id : 0x%08x] :: type = 0x%08x, name = %s, pxlfmt = 0x%08x\n",
desc->index,
desc->type,
desc->description,
@@ -940,7 +940,7 @@
int tvout_v4l2_g_fmt(int fp, int buf_type, void* ptr)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int ret;
@@ -951,11 +951,11 @@
ret = ioctl(fp, VIDIOC_G_FMT, &format);
if (ret < 0) {
- LOGE("tvout_v4l2_g_fmt" "type : %d, VIDIOC_G_FMT failed %d\n", buf_type, errno);
+ ALOGE("tvout_v4l2_g_fmt" "type : %d, VIDIOC_G_FMT failed %d\n", buf_type, errno);
return ret;
} else {
memcpy(fmt_param, format.fmt.raw_data, sizeof(struct v4l2_pix_format_s5p_tvout));
- LOGV("tvout_v4l2_g_fmt" "get. fmt [base_c : 0x%08x], [base_y : 0x%08x] type = 0x%08x, width = %d, height = %d\n",
+ ALOGV("tvout_v4l2_g_fmt" "get. fmt [base_c : 0x%08x], [base_y : 0x%08x] type = 0x%08x, width = %d, height = %d\n",
fmt_param->base_c,
fmt_param->base_y,
fmt_param->pix_fmt.pixelformat,
@@ -969,7 +969,7 @@
int tvout_v4l2_s_fmt(int fp, int buf_type, void *ptr)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
struct v4l2_format format;
@@ -1002,7 +1002,7 @@
ret = ioctl(fp, VIDIOC_S_FMT, &format);
if (ret < 0) {
- LOGE("tvout_v4l2_s_fmt [tvout_v4l2_s_fmt] : type : %d, VIDIOC_S_FMT failed %d\n",
+ ALOGE("tvout_v4l2_s_fmt [tvout_v4l2_s_fmt] : type : %d, VIDIOC_S_FMT failed %d\n",
buf_type, errno);
return ret;
}
@@ -1013,18 +1013,18 @@
int tvout_v4l2_g_fbuf(int fp, struct v4l2_framebuffer *frame)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int ret;
ret = ioctl(fp, VIDIOC_G_FBUF, frame);
if (ret < 0) {
- LOGE("tvout_v4l2_g_fbuf" "VIDIOC_STREAMON failed %d\n", errno);
+ ALOGE("tvout_v4l2_g_fbuf" "VIDIOC_STREAMON failed %d\n", errno);
return ret;
}
- LOGV("tvout_v4l2_g_fbuf" "get. fbuf: base = 0x%08X, pixel format = %d\n",
+ ALOGV("tvout_v4l2_g_fbuf" "get. fbuf: base = 0x%08X, pixel format = %d\n",
frame->base,
frame->fmt.pixelformat);
return 0;
@@ -1033,14 +1033,14 @@
int tvout_v4l2_s_fbuf(int fp, struct v4l2_framebuffer *frame)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int ret;
ret = ioctl(fp, VIDIOC_S_FBUF, frame);
if (ret < 0) {
- LOGE("tvout_v4l2_s_fbuf" "VIDIOC_STREAMON failed %d\n", errno);
+ ALOGE("tvout_v4l2_s_fbuf" "VIDIOC_STREAMON failed %d\n", errno);
return ret;
}
return 0;
@@ -1049,14 +1049,14 @@
int tvout_v4l2_s_baseaddr(int fp, void *base_addr)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int ret;
ret = ioctl(fp, S5PTVFB_WIN_SET_ADDR, base_addr);
if (ret < 0) {
- LOGE("tvout_v4l2_baseaddr" "VIDIOC_S_BASEADDR failed %d\n", errno);
+ ALOGE("tvout_v4l2_baseaddr" "VIDIOC_S_BASEADDR failed %d\n", errno);
return ret;
}
return 0;
@@ -1065,7 +1065,7 @@
int tvout_v4l2_g_crop(int fp, unsigned int type, struct v4l2_rect *rect)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int ret;
@@ -1073,7 +1073,7 @@
crop.type = (enum v4l2_buf_type)type;
ret = ioctl(fp, VIDIOC_G_CROP, &crop);
if (ret < 0) {
- LOGE("tvout_v4l2_g_crop" "VIDIOC_G_CROP failed %d\n", errno);
+ ALOGE("tvout_v4l2_g_crop" "VIDIOC_G_CROP failed %d\n", errno);
return ret;
}
@@ -1082,7 +1082,7 @@
rect->width = crop.c.width;
rect->height = crop.c.height;
- LOGV("tvout_v4l2_g_crop" "get. crop : left = %d, top = %d, width = %d, height = %d\n",
+ ALOGV("tvout_v4l2_g_crop" "get. crop : left = %d, top = %d, width = %d, height = %d\n",
rect->left,
rect->top,
rect->width,
@@ -1093,7 +1093,7 @@
int tvout_v4l2_s_crop(int fp, unsigned int type, struct v4l2_rect *rect)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
struct v4l2_crop crop;
@@ -1108,7 +1108,7 @@
ret = ioctl(fp, VIDIOC_S_CROP, &crop);
if (ret < 0) {
- LOGE("tvout_v4l2_s_crop" "VIDIOC_S_CROP failed %d\n", errno);
+ ALOGE("tvout_v4l2_s_crop" "VIDIOC_S_CROP failed %d\n", errno);
return ret;
}
@@ -1118,14 +1118,14 @@
int tvout_v4l2_start_overlay(int fp)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int ret, start = 1;
ret = ioctl(fp, VIDIOC_OVERLAY, &start);
if (ret < 0) {
- LOGE("tvout_v4l2_start_overlay" "VIDIOC_OVERLAY failed\n");
+ ALOGE("tvout_v4l2_start_overlay" "VIDIOC_OVERLAY failed\n");
return ret;
}
@@ -1135,14 +1135,14 @@
int tvout_v4l2_stop_overlay(int fp)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int ret, stop =0;
ret = ioctl(fp, VIDIOC_OVERLAY, &stop);
if (ret < 0) {
- LOGE("tvout_v4l2_stop_overlay" "VIDIOC_OVERLAY failed\n");
+ ALOGE("tvout_v4l2_stop_overlay" "VIDIOC_OVERLAY failed\n");
return ret;
}
@@ -1154,7 +1154,7 @@
{
int fd = -1;
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s (layer = %d) called", __func__, layer);
+ ALOGD("### %s (layer = %d) called", __func__, layer);
#endif
switch (layer) {
@@ -1162,7 +1162,7 @@
if (fp_tvout_v <= 0) {
fp_tvout_v = tvout_open(TVOUT_DEV_V);
if (fp_tvout_v < 0) {
- LOGE("tvout video layer open failed\n");
+ ALOGE("tvout video layer open failed\n");
return -1;
}
fd = fp_tvout_v;
@@ -1176,7 +1176,7 @@
fp_tvout_g0 = fb_open(TVOUT_FB_G0);
#endif
if (fp_tvout_g0 < 0) {
- LOGE("tvout graphic layer 0 open failed\n");
+ ALOGE("tvout graphic layer 0 open failed\n");
return -1;
}
fd = fp_tvout_g0;
@@ -1190,14 +1190,14 @@
fp_tvout_g1 = fb_open(TVOUT_FB_G1);
#endif
if (fp_tvout_g1 < 0) {
- LOGE("tvout graphic layer 1 open failed\n");
+ ALOGE("tvout graphic layer 1 open failed\n");
return -1;
}
fd = fp_tvout_g1;
}
break;
default :
- LOGE("%s::unmathced layer(%d) fail", __func__, layer);
+ ALOGE("%s::unmathced layer(%d) fail", __func__, layer);
fd = -1;
break;
}
@@ -1209,7 +1209,7 @@
{
int ret = 0;
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("### %s(layer = %d) called", __func__, layer);
+ ALOGD("### %s(layer = %d) called", __func__, layer);
#endif
switch (layer) {
case HDMI_LAYER_VIDEO :
@@ -1231,7 +1231,7 @@
}
break;
default :
- LOGE("%s::unmathced layer(%d) fail", __func__, layer);
+ ALOGE("%s::unmathced layer(%d) fail", __func__, layer);
ret = -1;
break;
}
@@ -1277,7 +1277,7 @@
*num_of_plane = 2;
break;
default:
- LOGE("%s::invalid color type", __func__);
+ ALOGE("%s::invalid color type", __func__);
return -1;
}
@@ -1293,7 +1293,7 @@
int dst_x, int dst_y, int dst_w, int dst_h)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int v4l2ColorFormat = HAL_PIXEL_FORMAT_2_V4L2_PIX(srcColorFormat);
@@ -1324,7 +1324,7 @@
num_of_plane = 2;
break;
default:
- LOGE("%s::invalid color type", __func__);
+ ALOGE("%s::invalid color type", __func__);
return false;
break;
}
@@ -1334,25 +1334,25 @@
/* set format for VP input */
if (tvout_std_v4l2_s_fmt(fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_FIELD_ANY, round_up_src_w, round_up_src_h, v4l2ColorFormat, num_of_plane) < 0) {
- LOGE("%s::tvout_std_v4l2_s_fmt()[video layer] failed", __func__);
+ ALOGE("%s::tvout_std_v4l2_s_fmt()[video layer] failed", __func__);
return -1;
}
/* set crop for VP input */
if (tvout_std_v4l2_s_crop(fd, V4L2_BUF_TYPE_VIDEO_OVERLAY, V4L2_FIELD_ANY, 0, 0, src_w, src_h) < 0) {
- LOGE("%s::tvout_std_v4l2_s_crop()[video layer] failed", __func__);
+ ALOGE("%s::tvout_std_v4l2_s_crop()[video layer] failed", __func__);
return -1;
}
/* set crop for VP output */
if (tvout_std_v4l2_s_crop(fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_FIELD_ANY, rect.left, rect.top, rect.width, rect.height) < 0) {
- LOGE("%s::tvout_std_v4l2_s_crop()[video layer] failed", __func__);
+ ALOGE("%s::tvout_std_v4l2_s_crop()[video layer] failed", __func__);
return -1;
}
/* request buffer for VP input */
if (tvout_std_v4l2_reqbuf(fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_MEMORY_USERPTR, HDMI_NUM_MIXER_BUF) < 0) {
- LOGE("%s::tvout_std_v4l2_reqbuf(buf_num=%d)[video layer] failed", __func__, HDMI_NUM_MIXER_BUF);
+ ALOGE("%s::tvout_std_v4l2_reqbuf(buf_num=%d)[video layer] failed", __func__, HDMI_NUM_MIXER_BUF);
return -1;
}
@@ -1366,7 +1366,7 @@
int dst_x, int dst_y, int dst_w, int dst_h)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
struct v4l2_rect rect;
@@ -1392,44 +1392,44 @@
dstBuffer->size.s = rect.width * rect.height << 1;
break;
default:
- LOGE("%s::invalid color type", __func__);
+ ALOGE("%s::invalid color type", __func__);
return false;
break;
}
/* set format for mixer graphic layer input device*/
if (tvout_std_v4l2_s_fmt(fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_FIELD_ANY, rect.width, rect.height, v4l2ColorFormat, 1) < 0) {
- LOGE("%s::tvout_std_v4l2_s_fmt() [layer=%d] failed", __func__, layer);
+ ALOGE("%s::tvout_std_v4l2_s_fmt() [layer=%d] failed", __func__, layer);
return -1;
}
/* set crop for mixer graphic layer input device*/
if (tvout_std_v4l2_s_crop(fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_FIELD_ANY, rect.left, rect.top, rect.width, rect.height) < 0) {
- LOGE("%s::tvout_std_v4l2_s_crop() [layer=%d] failed", __func__, layer);
+ ALOGE("%s::tvout_std_v4l2_s_crop() [layer=%d] failed", __func__, layer);
return -1;
}
/* request buffer for mixer graphic layer input device */
if (tvout_std_v4l2_reqbuf(fd, V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, V4L2_MEMORY_USERPTR, HDMI_NUM_MIXER_BUF) < 0) {
- LOGE("%s::tvout_std_v4l2_reqbuf(buf_num=%d) [layer=%d] failed", __func__, HDMI_NUM_MIXER_BUF, layer);
+ ALOGE("%s::tvout_std_v4l2_reqbuf(buf_num=%d) [layer=%d] failed", __func__, HDMI_NUM_MIXER_BUF, layer);
return -1;
}
/* enable alpha blending for mixer graphic layer */
if (tvout_std_v4l2_s_ctrl(fd, V4L2_CID_TV_LAYER_BLEND_ENABLE, 1) < 0) {
- LOGE("%s::tvout_std_v4l2_s_ctrl() [layer=%d] failed", __func__, layer);
+ ALOGE("%s::tvout_std_v4l2_s_ctrl() [layer=%d] failed", __func__, layer);
return -1;
}
/* enable per-pixel blending for mixer graphic layer */
if (tvout_std_v4l2_s_ctrl(fd, V4L2_CID_TV_PIXEL_BLEND_ENABLE, 1) < 0) {
- LOGE("%s::tvout_std_v4l2_s_ctrl [layer=%d] failed", __func__, layer);
+ ALOGE("%s::tvout_std_v4l2_s_ctrl [layer=%d] failed", __func__, layer);
return false;
}
/* set global alpha value for mixer graphic layer */
if (tvout_std_v4l2_s_ctrl(fd, V4L2_CID_TV_LAYER_BLEND_ALPHA, 255) < 0) {
- LOGE("%s::tvout_std_v4l2_s_ctrl() [layer=%d] failed", __func__, layer);
+ ALOGE("%s::tvout_std_v4l2_s_ctrl() [layer=%d] failed", __func__, layer);
return -1;
}
@@ -1522,7 +1522,7 @@
g2d_rotation = ROT_270;
break;
default:
- LOGE("%s::invalid rotVal(%d) fail", __func__, rotVal);
+ ALOGE("%s::invalid rotVal(%d) fail", __func__, rotVal);
return -1;
break;
}
@@ -1530,12 +1530,12 @@
BlitParam = {BLIT_OP_SRC, NON_PREMULTIPLIED, 0xff, 0, g2d_rotation, &Scaling, 0, 0, &dstClip, 0, &srcImage, &dstImage, NULL, &srcRect, &dstRect, NULL, 0};
if (stretchFimgApi(&BlitParam) < 0) {
- LOGE("%s::stretchFimgApi() fail", __func__);
+ ALOGE("%s::stretchFimgApi() fail", __func__);
return -1;
}
#ifdef DEBUG_MSG_ENABLE
- LOGD("hdmi_set_g_scaling:: \n \\
+ ALOGD("hdmi_set_g_scaling:: \n \\
layer=%d,\n \\
srcColorFormat=%d,\n \\
src_w=%d, src_h=%d,\n\\
@@ -1562,13 +1562,13 @@
int dst_w, int dst_h)
{
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int round_up_src_w;
int round_up_src_h;
if (fp_tvout_v <= 0) {
- LOGE("fp_tvout is < 0 fail\n");
+ ALOGE("fp_tvout is < 0 fail\n");
return -1;
}
@@ -1714,7 +1714,7 @@
g2d_rotation = ROT_270;
break;
default:
- LOGE("%s::invalid rotVal(%d) fail", __func__, rotVal);
+ ALOGE("%s::invalid rotVal(%d) fail", __func__, rotVal);
return -1;
break;
}
@@ -1722,7 +1722,7 @@
BlitParam = {BLIT_OP_SRC, NON_PREMULTIPLIED, 0xff, 0, g2d_rotation, &Scaling, 0, 0, &dstClip, 0, &srcImage, &dstImage, NULL, &srcRect, &dstRect, NULL, 0};
if (stretchFimgApi(&BlitParam) < 0) {
- LOGE("%s::stretchFimgApi() fail", __func__);
+ ALOGE("%s::stretchFimgApi() fail", __func__);
return -1;
}
@@ -1744,7 +1744,7 @@
put_vscreeninfo(fp_tvout_g, &var);
if (ioctl(fp_tvout_g, S5PTVFB_WIN_POSITION, &window) < 0) {
- LOGE("%s::S5PTVFB_WIN_POSITION ioctl failed.", __func__);
+ ALOGE("%s::S5PTVFB_WIN_POSITION ioctl failed.", __func__);
return -1;
}
}
@@ -1760,7 +1760,7 @@
int fp_tvout_g;
#ifdef DEBUG_MSG_ENABLE
- LOGD("hdmi_gl_set_param:: \n \\
+ ALOGD("hdmi_gl_set_param:: \n \\
layer=%d,\n \\
srcColorFormat=%d,\n \\
src_w=%d, src_h=%d,\n\\
@@ -1802,7 +1802,7 @@
tvout_v4l2_s_baseaddr(fp_tvout_g, (void *)src_y_address);
put_vscreeninfo(fp_tvout_g, &var);
if (ioctl(fp_tvout_g, S5PTVFB_WIN_POSITION, &window) < 0) {
- LOGE("%s:: S5PTVFB_WIN_POSITION ioctl failed.", __func__);
+ ALOGE("%s:: S5PTVFB_WIN_POSITION ioctl failed.", __func__);
return -1;
}
@@ -1815,7 +1815,7 @@
{
#if defined(BOARD_USE_V4L2)
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("%s", __func__);
+ ALOGD("%s", __func__);
#endif
int cable_status = 0;
@@ -1824,21 +1824,21 @@
fd = open(TVOUT_DEV_G0, O_RDWR);
if (fd <= 0) {
- LOGE("%s: graphic layer 0 drv open failed", __func__);
+ ALOGE("%s: graphic layer 0 drv open failed", __func__);
return -1;
}
ctrl.id = V4L2_CID_TV_HPD_STATUS;
if (ioctl(fd, VIDIOC_S_CTRL, &ctrl) < 0) {
- LOGE("Get HPD_STATUS fail");
+ ALOGE("Get HPD_STATUS fail");
cable_status = -1;
} else {
cable_status = ctrl.value;
}
#ifdef DEBUG_HDMI_HW_LEVEL
- LOGD("HPD_STATUS = %d", cable_status);
+ ALOGD("HPD_STATUS = %d", cable_status);
#endif
close(fd);
@@ -1850,14 +1850,14 @@
fp_hpd = open(HPD_DEV, O_RDWR);
if (fp_hpd <= 0) {
- LOGE("hpd drv open failed\n");
+ ALOGE("hpd drv open failed\n");
return -1;
}
//Delay about 0.3s
usleep(500000);
if (ioctl(fp_hpd, HPD_GET_STATE, &cable_status) < 0) {
- LOGE("hpd drv HPD_GET_STATE ioctl failed\n");
+ ALOGE("hpd drv HPD_GET_STATE ioctl failed\n");
cable_status = -1;
}
@@ -1885,7 +1885,7 @@
v4l2_output_type = V4L2_OUTPUT_TYPE_COMPOSITE;
break;
default:
- LOGE("%s::unmathced HDMI_mode(%d)", __func__, output_mode);
+ ALOGE("%s::unmathced HDMI_mode(%d)", __func__, output_mode);
v4l2_output_type = -1;
break;
}
@@ -1911,7 +1911,7 @@
outputMode = COMPOSITE_OUTPUT_MODE;
break;
default:
- LOGE("%s::unmathced v4l2_output_type(%d)", __func__, v4l2_output_type);
+ ALOGE("%s::unmathced v4l2_output_type(%d)", __func__, v4l2_output_type);
outputMode = -1;
break;
}
@@ -1946,7 +1946,7 @@
std_id = V4L2_STD_PAL_60;
break;
default:
- LOGE("%s::unmathced composite_std(%d)", __func__, std);
+ ALOGE("%s::unmathced composite_std(%d)", __func__, std);
break;
}
@@ -1969,14 +1969,14 @@
video.mode = HDMI;
if (!EDIDHDMIModeSupport(&video)) {
calbirate_v4l2_mode = V4L2_OUTPUT_TYPE_DVI;
- LOGI("Change mode into DVI\n");
+ ALOGI("Change mode into DVI\n");
break;
}
video.colorSpace = HDMI_CS_YCBCR444;
if (!EDIDColorSpaceSupport(&video)) {
calbirate_v4l2_mode = V4L2_OUTPUT_TYPE_HDMI_RGB;
- LOGI("Change mode into HDMI_RGB\n");
+ ALOGI("Change mode into HDMI_RGB\n");
}
break;
@@ -1984,14 +1984,14 @@
video.mode = HDMI;
if (!EDIDHDMIModeSupport(&video)) {
calbirate_v4l2_mode = V4L2_OUTPUT_TYPE_DVI;
- LOGI("Change mode into DVI\n");
+ ALOGI("Change mode into DVI\n");
break;
}
video.colorSpace = HDMI_CS_RGB;
if (!EDIDColorSpaceSupport(&video)) {
calbirate_v4l2_mode = V4L2_OUTPUT_TYPE_DIGITAL;
- LOGI("Change mode into HDMI_YCBCR\n");
+ ALOGI("Change mode into HDMI_YCBCR\n");
}
break;
@@ -2001,10 +2001,10 @@
video.colorSpace = HDMI_CS_YCBCR444;
if (!EDIDColorSpaceSupport(&video)) {
calbirate_v4l2_mode = V4L2_OUTPUT_TYPE_HDMI_RGB;
- LOGI("Change mode into HDMI_RGB\n");
+ ALOGI("Change mode into HDMI_RGB\n");
} else {
calbirate_v4l2_mode = V4L2_OUTPUT_TYPE_DIGITAL;
- LOGI("Change mode into HDMI_YCBCR\n");
+ ALOGI("Change mode into HDMI_YCBCR\n");
}
break;
}
@@ -2099,14 +2099,14 @@
video.hdmi_3d_format = HDMI_3D_TB_FORMAT;
break;
default:
- LOGE("%s::unmathced preset_id(%d)", __func__, preset_id);
+ ALOGE("%s::unmathced preset_id(%d)", __func__, preset_id);
return -1;
break;
}
if (!EDIDVideoResolutionSupport(&video)) {
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s::EDIDVideoResolutionSupport(%d) fail (not suppoted preset_id) \n", __func__, preset_id);
+ ALOGD("%s::EDIDVideoResolutionSupport(%d) fail (not suppoted preset_id) \n", __func__, preset_id);
#endif
return -1;
}
@@ -2190,7 +2190,7 @@
*preset_id = V4L2_DV_480P60;
break;
default:
- LOGE("%s::unmathced resolution(%d)", __func__, resolution);
+ ALOGE("%s::unmathced resolution(%d)", __func__, resolution);
ret = -1;
break;
}
@@ -2289,14 +2289,14 @@
video.hdmi_3d_format = HDMI_3D_TB_FORMAT;
break;
default:
- LOGE("%s::unmathced std_id(%lld)", __func__, std_id);
+ ALOGE("%s::unmathced std_id(%lld)", __func__, std_id);
return -1;
break;
}
if (!EDIDVideoResolutionSupport(&video)) {
#ifdef DEBUG_MSG_ENABLE
- LOGD("%s::EDIDVideoResolutionSupport(%llx) fail (not suppoted std_id) \n", __func__, std_id);
+ ALOGD("%s::EDIDVideoResolutionSupport(%llx) fail (not suppoted std_id) \n", __func__, std_id);
#endif
return -1;
}
@@ -2380,7 +2380,7 @@
*h = 480;
break;
default:
- LOGE("%s::unmathced resolution(%d)", __func__, resolution);
+ ALOGE("%s::unmathced resolution(%d)", __func__, resolution);
ret = -1;
break;
}
@@ -2392,7 +2392,7 @@
int hdmi_enable_hdcp(unsigned int hdcp_en)
{
if (ioctl(fp_tvout, VIDIOC_HDCP_ENABLE, hdcp_en) < 0) {
- LOGD("%s::VIDIOC_HDCP_ENABLE(%d) fail \n", __func__, hdcp_en);
+ ALOGD("%s::VIDIOC_HDCP_ENABLE(%d) fail \n", __func__, hdcp_en);
return -1;
}
@@ -2418,12 +2418,12 @@
#endif
if (audio_state == ON) {
if (ioctl(fp_tvout, VIDIOC_INIT_AUDIO, 1) < 0) {
- LOGE("%s::VIDIOC_INIT_AUDIO(1) fail", __func__);
+ ALOGE("%s::VIDIOC_INIT_AUDIO(1) fail", __func__);
ret = -1;
}
} else {
if (ioctl(fp_tvout, VIDIOC_INIT_AUDIO, 0) < 0) {
- LOGE("%s::VIDIOC_INIT_AUDIO(0) fail", __func__);
+ ALOGE("%s::VIDIOC_INIT_AUDIO(0) fail", __func__);
ret = -1;
}
}
diff --git a/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h b/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h
index a4aa69c..f31169e 100644
--- a/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h
+++ b/exynos4/hal/libhdmi/SecHdmi/SecHdmiV4L2Utils.h
@@ -17,8 +17,8 @@
#ifndef __HDMI_HAL_V4L2_UTILS_H__
#define __HDMI_HAL_V4L2_UTILS_H__
-//#define LOG_NDEBUG 0
-//#define LOG_TAG "libhdmi"
+//#define ALOG_NDEBUG 0
+//#define ALOG_TAG "libhdmi"
#if defined(BOARD_USE_V4L2)
#include "SecBuffer.h"
#endif
diff --git a/exynos4/hal/libhdmi/SecHdmi/fimd_api.c b/exynos4/hal/libhdmi/SecHdmi/fimd_api.c
index 0e07ef3..0f14f5d 100644
--- a/exynos4/hal/libhdmi/SecHdmi/fimd_api.c
+++ b/exynos4/hal/libhdmi/SecHdmi/fimd_api.c
@@ -41,7 +41,7 @@
fp = open(node, O_RDWR);
if (fp < 0)
- LOGE("%s: fb[%d] open failed", __func__, win);
+ ALOGE("%s: fb[%d] open failed", __func__, win);
return fp;
}
@@ -51,7 +51,7 @@
if (fp)
close(fp);
else
- LOGE("%s: fb is not allocated %d", __func__, fp);
+ ALOGE("%s: fb is not allocated %d", __func__, fp);
return 0;
}
@@ -62,7 +62,7 @@
ret = ioctl(fp, FBIOGET_FSCREENINFO, fix);
if (ret)
- LOGE("%s: FBIOGET_FSCREENINFO failed", __func__);
+ ALOGE("%s: FBIOGET_FSCREENINFO failed", __func__);
return ret;
}
@@ -73,7 +73,7 @@
ret = ioctl(fp, FBIOGET_VSCREENINFO, var);
if (ret)
- LOGE("%s:: FBIOGET_VSCREENINFO failed", __func__);
+ ALOGE("%s:: FBIOGET_VSCREENINFO failed", __func__);
return ret;
}
@@ -84,7 +84,7 @@
ret = ioctl(fp, FBIOPUT_VSCREENINFO, var);
if (ret)
- LOGE("%s:: FBIOPUT_VSCREENINFO failed", __func__);
+ ALOGE("%s:: FBIOPUT_VSCREENINFO failed", __func__);
return ret;
}
@@ -102,7 +102,7 @@
buffer = (char *)mmap(0, size, PROT_READ | PROT_WRITE,
MAP_SHARED, fp, 0);
if (!buffer) {
- LOGE("%s:: mmap failed", __func__);
+ ALOGE("%s:: mmap failed", __func__);
return NULL;
}
@@ -115,7 +115,7 @@
ret = ioctl(fp, cmd, arg);
if (ret < 0)
- LOGE("%s:: ioctl (%d) failed", __func__, cmd);
+ ALOGE("%s:: ioctl (%d) failed", __func__, cmd);
return ret;
}
@@ -126,7 +126,7 @@
ret = ioctl(fp, FBIOBLANK, FB_BLANK_UNBLANK);
if (ret)
- LOGE("%s:: FBIOBLANK failed", __func__);
+ ALOGE("%s:: FBIOBLANK failed", __func__);
return ret;
}
@@ -137,7 +137,7 @@
ret = ioctl(fp, FBIOBLANK, FB_BLANK_POWERDOWN);
if (ret)
- LOGE("%s:: FBIOBLANK failed", __func__);
+ ALOGE("%s:: FBIOBLANK failed", __func__);
return ret;
}
@@ -152,7 +152,7 @@
return -1;
if (ioctl(fp, FBIOBLANK, FB_BLANK_POWERDOWN) < 0)
- LOGE("%s:: FBIOBLANK failed", __func__);
+ ALOGE("%s:: FBIOBLANK failed", __func__);
fb_off(fp);
fb_close(fp);
diff --git a/exynos4/hal/libhdmi/libhdmiservice/MessageQueue.cpp b/exynos4/hal/libhdmi/libhdmiservice/MessageQueue.cpp
index aebe1b8..9441019 100644
--- a/exynos4/hal/libhdmi/libhdmiservice/MessageQueue.cpp
+++ b/exynos4/hal/libhdmi/libhdmiservice/MessageQueue.cpp
@@ -111,7 +111,7 @@
}
if (nextEventTime >= 0) {
- //LOGD("nextEventTime = %lld ms", nextEventTime);
+ //ALOGD("nextEventTime = %lld ms", nextEventTime);
if (nextEventTime > 0) {
// we're about to wait, flush the binder command buffer
IPCThreadState::self()->flushCommands();
@@ -121,7 +121,7 @@
}
}
} else {
- //LOGD("going to wait");
+ //ALOGD("going to wait");
// we're about to wait, flush the binder command buffer
IPCThreadState::self()->flushCommands();
mCondition.wait(mLock);
@@ -165,7 +165,7 @@
message->when = systemTime() + relTime;
mMessages.insert(message);
- //LOGD("MessageQueue::queueMessage time = %lld ms", message->when);
+ //ALOGD("MessageQueue::queueMessage time = %lld ms", message->when);
//dumpLocked(message);
mCondition.signal();
@@ -185,7 +185,7 @@
int c = 0;
while (cur != end) {
const char tick = (*cur == message) ? '>' : ' ';
- LOGD("%c %d: msg{.what=%08x, when=%lld}",
+ ALOGD("%c %d: msg{.what=%08x, when=%lld}",
tick, c, (*cur)->what, (*cur)->when);
++cur;
c++;
diff --git a/exynos4/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp b/exynos4/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp
index c5cca78..9fd330c 100644
--- a/exynos4/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp
+++ b/exynos4/hal/libhdmi/libhdmiservice/SecHdmiClient.cpp
@@ -22,7 +22,7 @@
** @date 2011-07-06
*/
-#define LOG_TAG "libhdmiclient"
+#define ALOG_TAG "libhdmiclient"
#include "SecHdmiClient.h"
@@ -48,7 +48,7 @@
void SecHdmiClient::setHdmiCableStatus(int status)
{
- //LOGD("%s HDMI status: %d\n", __func__, status);
+ //ALOGD("%s HDMI status: %d\n", __func__, status);
if (g_SecTVOutService != 0)
g_SecTVOutService->setHdmiCableStatus(status);
@@ -56,7 +56,7 @@
void SecHdmiClient::setHdmiMode(int mode)
{
- //LOGD("%s HDMI Mode: %d\n", __func__, mode);
+ //ALOGD("%s HDMI Mode: %d\n", __func__, mode);
if (g_SecTVOutService != 0)
g_SecTVOutService->setHdmiMode(mode);
@@ -64,7 +64,7 @@
void SecHdmiClient::setHdmiResolution(int resolution)
{
- //LOGD("%s HDMI Resolution: %d\n", __func__, resolution);
+ //ALOGD("%s HDMI Resolution: %d\n", __func__, resolution);
if (g_SecTVOutService != 0)
g_SecTVOutService->setHdmiResolution(resolution);
@@ -72,7 +72,7 @@
void SecHdmiClient::setHdmiHdcp(int enHdcp)
{
- //LOGD("%s HDMI HDCP: %d\n", __func__, enHdcp);
+ //ALOGD("%s HDMI HDCP: %d\n", __func__, enHdcp);
if (g_SecTVOutService != 0)
g_SecTVOutService->setHdmiHdcp(enHdcp);
@@ -80,7 +80,7 @@
void SecHdmiClient::setHdmiRotate(int rotVal, uint32_t hwcLayer)
{
- //LOGD("%s HDMI ROTATE: %d\n", __func__, rotVal);
+ //ALOGD("%s HDMI ROTATE: %d\n", __func__, rotVal);
if (g_SecTVOutService != 0)
g_SecTVOutService->setHdmiRotate(rotVal, hwcLayer);
@@ -88,7 +88,7 @@
void SecHdmiClient::setHdmiHwcLayer(uint32_t hwcLayer)
{
- //LOGD("%s HDMI HWCLAYER: %d\n", __func__, hwcLayer);
+ //ALOGD("%s HDMI HWCLAYER: %d\n", __func__, hwcLayer);
if (g_SecTVOutService != 0)
g_SecTVOutService->setHdmiHwcLayer(hwcLayer);
@@ -96,7 +96,7 @@
void SecHdmiClient::setHdmiEnable(uint32_t enable)
{
- //LOGD("%s HDMI ENABLE: %d\n", __func__, enable);
+ //ALOGD("%s HDMI ENABLE: %d\n", __func__, enable);
if (g_SecTVOutService != 0)
mEnable = enable;
@@ -128,7 +128,7 @@
for(getSvcTimes = 0; getSvcTimes < GETSERVICETIMEOUT; getSvcTimes++) {
binder = sm->getService(String16("SecTVOutService"));
if (binder == 0) {
- LOGW("SecTVOutService not published, waiting...");
+ ALOGW("SecTVOutService not published, waiting...");
usleep(500000); // 0.5 s
} else {
break;
@@ -139,7 +139,7 @@
sc = interface_cast<ISecTVOut>(binder);
g_SecTVOutService = sc;
} else {
- LOGW("Failed to get SecTVOutService... SecHdmiClient will get it later..");
+ ALOGW("Failed to get SecTVOutService... SecHdmiClient will get it later..");
}
}
return g_SecTVOutService;
diff --git a/exynos4/hal/libhdmi/libhdmiservice/SecTVOutService.cpp b/exynos4/hal/libhdmi/libhdmiservice/SecTVOutService.cpp
index de98810..7308473 100644
--- a/exynos4/hal/libhdmi/libhdmiservice/SecTVOutService.cpp
+++ b/exynos4/hal/libhdmi/libhdmiservice/SecTVOutService.cpp
@@ -22,7 +22,7 @@
** @date 2011-07-06
*/
-#define LOG_TAG "SecTVOutService"
+#define ALOG_TAG "SecTVOutService"
#include <binder/IServiceManager.h>
#include <utils/RefBase.h>
@@ -61,15 +61,15 @@
int SecTVOutService::instantiate()
{
- LOGD("SecTVOutService instantiate");
+ ALOGD("SecTVOutService instantiate");
int r = defaultServiceManager()->addService(String16( "SecTVOutService"), new SecTVOutService ());
- LOGD("SecTVOutService r=%d", r);
+ ALOGD("SecTVOutService r=%d", r);
return r;
}
SecTVOutService::SecTVOutService () {
- LOGV("SecTVOutService created");
+ ALOGV("SecTVOutService created");
mHdmiCableInserted = false;
#ifdef SUPPORT_G2D_UI_MODE
mUILayerMode = SecHdmi::HDMI_LAYER_GRAPHIC_1;
@@ -81,7 +81,7 @@
setLCDsize();
if (mSecHdmi.create(mLCD_width, mLCD_height) == false)
- LOGE("%s::mSecHdmi.create() fail", __func__);
+ ALOGE("%s::mSecHdmi.create() fail", __func__);
else
setHdmiStatus(1);
@@ -118,7 +118,7 @@
}
SecTVOutService::~SecTVOutService () {
- LOGV ("SecTVOutService destroyed");
+ ALOGV ("SecTVOutService destroyed");
if (mHdmiFlushThread != NULL) {
mHdmiFlushThread->requestExit();
@@ -178,7 +178,7 @@
} break;
default :
- LOGE ( "onTransact::default");
+ ALOGE ( "onTransact::default");
return BBinder::onTransact (code, data, reply, flags);
}
@@ -188,7 +188,7 @@
void SecTVOutService::setHdmiStatus(uint32_t status)
{
- LOGD("%s HDMI cable status = %d", __func__, status);
+ ALOGD("%s HDMI cable status = %d", __func__, status);
{
Mutex::Autolock _l(mLock);
@@ -199,12 +199,12 @@
if (hdmiCableInserted == true) {
if (mSecHdmi.connect() == false) {
- LOGE("%s::mSecHdmi.connect() fail", __func__);
+ ALOGE("%s::mSecHdmi.connect() fail", __func__);
hdmiCableInserted = false;
}
} else {
if (mSecHdmi.disconnect() == false)
- LOGE("%s::mSecHdmi.disconnect() fail", __func__);
+ ALOGE("%s::mSecHdmi.disconnect() fail", __func__);
}
mHdmiCableInserted = hdmiCableInserted;
@@ -216,51 +216,51 @@
void SecTVOutService::setHdmiMode(uint32_t mode)
{
- LOGD("%s TV mode = %d", __func__, mode);
+ ALOGD("%s TV mode = %d", __func__, mode);
Mutex::Autolock _l(mLock);
if ((hdmiCableInserted() == true) && (mSecHdmi.setHdmiOutputMode(mode)) == false) {
- LOGE("%s::mSecHdmi.setHdmiOutputMode() fail", __func__);
+ ALOGE("%s::mSecHdmi.setHdmiOutputMode() fail", __func__);
return;
}
}
void SecTVOutService::setHdmiResolution(uint32_t resolution)
{
- //LOGD("%s TV resolution = %d", __func__, resolution);
+ //ALOGD("%s TV resolution = %d", __func__, resolution);
Mutex::Autolock _l(mLock);
if ((hdmiCableInserted() == true) && (mSecHdmi.setHdmiResolution(resolution)) == false) {
- LOGE("%s::mSecHdmi.setHdmiResolution() fail", __func__);
+ ALOGE("%s::mSecHdmi.setHdmiResolution() fail", __func__);
return;
}
}
void SecTVOutService::setHdmiHdcp(uint32_t hdcp_en)
{
- LOGD("%s TV HDCP = %d", __func__, hdcp_en);
+ ALOGD("%s TV HDCP = %d", __func__, hdcp_en);
Mutex::Autolock _l(mLock);
if ((hdmiCableInserted() == true) && (mSecHdmi.setHdcpMode(hdcp_en)) == false) {
- LOGE("%s::mSecHdmi.setHdcpMode() fail", __func__);
+ ALOGE("%s::mSecHdmi.setHdcpMode() fail", __func__);
return;
}
}
void SecTVOutService::setHdmiRotate(uint32_t rotVal, uint32_t hwcLayer)
{
- //LOGD("%s TV ROTATE = %d", __func__, rotVal);
+ //ALOGD("%s TV ROTATE = %d", __func__, rotVal);
Mutex::Autolock _l(mLock);
if ((hdmiCableInserted() == true) && (mSecHdmi.setUIRotation(rotVal, hwcLayer)) == false) {
- LOGE("%s::mSecHdmi.setUIRotation() fail", __func__);
+ ALOGE("%s::mSecHdmi.setUIRotation() fail", __func__);
return;
}
}
void SecTVOutService::setHdmiHwcLayer(uint32_t hwcLayer)
{
- //LOGD("%s TV HWCLAYER = %d", __func__, hwcLayer);
+ //ALOGD("%s TV HWCLAYER = %d", __func__, hwcLayer);
Mutex::Autolock _l(mLock);
mHwcLayer = hwcLayer;
@@ -301,15 +301,15 @@
#ifdef SUPPORT_G2D_UI_MODE
if (mHwcLayer == 0) {
if (mSecHdmi.clear(SecHdmi::HDMI_LAYER_VIDEO) == false)
- LOGE("%s::mSecHdmi.clear(%d) fail", __func__, SecHdmi::HDMI_LAYER_VIDEO);
+ ALOGE("%s::mSecHdmi.clear(%d) fail", __func__, SecHdmi::HDMI_LAYER_VIDEO);
if (mSecHdmi.clear(SecHdmi::HDMI_LAYER_GRAPHIC_0) == false)
- LOGE("%s::mSecHdmi.clear(%d) fail", __func__, SecHdmi::HDMI_LAYER_GRAPHIC_0);
+ ALOGE("%s::mSecHdmi.clear(%d) fail", __func__, SecHdmi::HDMI_LAYER_GRAPHIC_0);
}
#endif
if (mUILayerMode != hdmiLayer) {
if (mSecHdmi.clear(mUILayerMode) == false)
- LOGE("%s::mSecHdmi.clear(%d) fail", __func__, mUILayerMode);
+ ALOGE("%s::mSecHdmi.clear(%d) fail", __func__, mUILayerMode);
}
mUILayerMode = hdmiLayer;
@@ -324,10 +324,10 @@
#endif
if (mSecHdmi.flush(w, h, colorFormat, pPhyYAddr, pPhyCbAddr, pPhyCrAddr, dstX, dstY,
mUILayerMode, mHwcLayer) == false)
- LOGE("%s::mSecHdmi.flush() on HDMI_MODE_UI fail", __func__);
+ ALOGE("%s::mSecHdmi.flush() on HDMI_MODE_UI fail", __func__);
#ifdef CHECK_UI_TIME
end = systemTime();
- LOGD("[UI] mSecHdmi.flush[end-start] = %ld ms", long(ns2ms(end)) - long(ns2ms(start)));
+ ALOGD("[UI] mSecHdmi.flush[end-start] = %ld ms", long(ns2ms(end)) - long(ns2ms(start)));
#endif
}
#else
@@ -345,9 +345,9 @@
#if !defined(BOARD_USES_HDMI_SUBTITLES)
#ifdef SUPPORT_G2D_UI_MODE
if (mSecHdmi.clear(SecHdmi::HDMI_LAYER_GRAPHIC_0) == false)
- LOGE("%s::mSecHdmi.clear(%d) fail", __func__, SecHdmi::HDMI_LAYER_GRAPHIC_0);
+ ALOGE("%s::mSecHdmi.clear(%d) fail", __func__, SecHdmi::HDMI_LAYER_GRAPHIC_0);
if (mSecHdmi.clear(SecHdmi::HDMI_LAYER_GRAPHIC_1) == false)
- LOGE("%s::mSecHdmi.clear(%d) fail", __func__, SecHdmi::HDMI_LAYER_GRAPHIC_1);
+ ALOGE("%s::mSecHdmi.clear(%d) fail", __func__, SecHdmi::HDMI_LAYER_GRAPHIC_1);
#endif
#endif
@@ -357,10 +357,10 @@
#endif
if (mSecHdmi.flush(w, h, colorFormat, pPhyYAddr, pPhyCbAddr, pPhyCrAddr, dstX, dstY,
SecHdmi::HDMI_LAYER_VIDEO, mHwcLayer) == false)
- LOGE("%s::mSecHdmi.flush() on HDMI_MODE_VIDEO fail", __func__);
+ ALOGE("%s::mSecHdmi.flush() on HDMI_MODE_VIDEO fail", __func__);
#ifdef CHECK_VIDEO_TIME
end = systemTime();
- LOGD("[Video] mSecHdmi.flush[end-start] = %ld ms", long(ns2ms(end)) - long(ns2ms(start)));
+ ALOGD("[Video] mSecHdmi.flush[end-start] = %ld ms", long(ns2ms(end)) - long(ns2ms(start)));
#endif
#else
msg = new SecHdmiEventMsg(&mSecHdmi, w, h, colorFormat, pPhyYAddr, pPhyCbAddr, pPhyCrAddr,
@@ -372,7 +372,7 @@
break;
default:
- LOGE("unmatched HDMI_MODE : %d", hdmiMode);
+ ALOGE("unmatched HDMI_MODE : %d", hdmiMode);
break;
}
diff --git a/exynos4/hal/libhdmi/libhdmiservice/SecTVOutService.h b/exynos4/hal/libhdmi/libhdmiservice/SecTVOutService.h
index 1f5f251..b1048b5 100644
--- a/exynos4/hal/libhdmi/libhdmiservice/SecTVOutService.h
+++ b/exynos4/hal/libhdmi/libhdmiservice/SecTVOutService.h
@@ -139,12 +139,12 @@
#endif
if (pSecHdmi->flush(mSrcWidth, mSrcHeight, mSrcColorFormat, mSrcYAddr, mSrcCbAddr, mSrcCrAddr,
mDstX, mDstY, mHdmiLayer, mHwcLayer) == false) {
- LOGE("%s::pSecHdmi->flush() fail on HDMI_MODE_UI", __func__);
+ ALOGE("%s::pSecHdmi->flush() fail on HDMI_MODE_UI", __func__);
ret = false;
}
#ifdef CHECK_UI_TIME
end = systemTime();
- LOGD("[UI] pSecHdmi->flush[end-start] = %ld ms", long(ns2ms(end)) - long(ns2ms(start)));
+ ALOGD("[UI] pSecHdmi->flush[end-start] = %ld ms", long(ns2ms(end)) - long(ns2ms(start)));
#endif
break;
case HDMI_MODE_VIDEO:
@@ -153,16 +153,16 @@
#endif
if (pSecHdmi->flush(mSrcWidth, mSrcHeight, mSrcColorFormat, mSrcYAddr, mSrcCbAddr, mSrcCrAddr,
mDstX, mDstY, mHdmiLayer, mHwcLayer) == false) {
- LOGE("%s::pSecHdmi->flush() fail on HDMI_MODE_VIDEO", __func__);
+ ALOGE("%s::pSecHdmi->flush() fail on HDMI_MODE_VIDEO", __func__);
ret = false;
}
#ifdef CHECK_VIDEO_TIME
end = systemTime();
- LOGD("[VIDEO] pSecHdmi->flush[end-start] = %ld ms", long(ns2ms(end)) - long(ns2ms(start)));
+ ALOGD("[VIDEO] pSecHdmi->flush[end-start] = %ld ms", long(ns2ms(end)) - long(ns2ms(start)));
#endif
break;
default:
- LOGE("Undefined HDMI_MODE");
+ ALOGE("Undefined HDMI_MODE");
ret = false;
break;
}
diff --git a/exynos4/hal/libhdmi/libsForhdmi/libcec/libcec.c b/exynos4/hal/libhdmi/libsForhdmi/libcec/libcec.c
index e688051..e088346 100644
--- a/exynos4/hal/libhdmi/libsForhdmi/libcec/libcec.c
+++ b/exynos4/hal/libhdmi/libsForhdmi/libcec/libcec.c
@@ -74,7 +74,7 @@
CECClose();
if ((fd = open(CEC_DEVICE_NAME, O_RDWR)) < 0) {
- LOGE("Can't open %s!\n", CEC_DEVICE_NAME);
+ ALOGE("Can't open %s!\n", CEC_DEVICE_NAME);
res = 0;
}
@@ -92,7 +92,7 @@
if (fd != -1) {
if (close(fd) != 0) {
- LOGE("close() failed!\n");
+ ALOGE("close() failed!\n");
res = 0;
}
fd = -1;
@@ -115,12 +115,12 @@
int i = 0;
if (fd == -1) {
- LOGE("open device first!\n");
+ ALOGE("open device first!\n");
return 0;
}
if (CECSetLogicalAddr(laddr) < 0) {
- LOGE("CECSetLogicalAddr() failed!\n");
+ ALOGE("CECSetLogicalAddr() failed!\n");
return 0;
}
@@ -141,12 +141,12 @@
}
if (laddr == CEC_LADDR_UNREGISTERED) {
- LOGE("All LA addresses in use!!!\n");
+ ALOGE("All LA addresses in use!!!\n");
return CEC_LADDR_UNREGISTERED;
}
if (CECSetLogicalAddr(laddr) < 0) {
- LOGE("CECSetLogicalAddr() failed!\n");
+ ALOGE("CECSetLogicalAddr() failed!\n");
return 0;
}
@@ -159,7 +159,7 @@
buffer[4] = devtype;
if (CECSendMessage(buffer, 5) != 5) {
- LOGE("CECSendMessage() failed!\n");
+ ALOGE("CECSendMessage() failed!\n");
return 0;
}
@@ -177,17 +177,17 @@
int CECSendMessage(unsigned char *buffer, int size)
{
if (fd == -1) {
- LOGE("open device first!\n");
+ ALOGE("open device first!\n");
return 0;
}
if (size > CEC_MAX_FRAME_SIZE) {
- LOGE("size should not exceed %d\n", CEC_MAX_FRAME_SIZE);
+ ALOGE("size should not exceed %d\n", CEC_MAX_FRAME_SIZE);
return 0;
}
#if CEC_DEBUG
- LOGI("CECSendMessage() : ");
+ ALOGI("CECSendMessage() : ");
CECPrintFrame(buffer, size);
#endif
@@ -211,7 +211,7 @@
int retval;
if (fd == -1) {
- LOGE("open device first!\n");
+ ALOGE("open device first!\n");
return 0;
}
@@ -228,7 +228,7 @@
} else if (retval) {
bytes = read(fd, buffer, size);
#if CEC_DEBUG
- LOGI("CECReceiveMessage() : size(%d)", bytes);
+ ALOGI("CECReceiveMessage() : size(%d)", bytes);
if(bytes > 0)
CECPrintFrame(buffer, bytes);
#endif
@@ -245,7 +245,7 @@
int CECSetLogicalAddr(unsigned int laddr)
{
if (ioctl(fd, CEC_IOC_SETLADDR, &laddr)) {
- LOGE("ioctl(CEC_IOC_SETLA) failed!\n");
+ ALOGE("ioctl(CEC_IOC_SETLA) failed!\n");
return 0;
}
@@ -260,12 +260,12 @@
{
if (size > 0) {
int i;
- LOGI("fsize: %d ", size);
- LOGI("frame: ");
+ ALOGI("fsize: %d ", size);
+ ALOGI("frame: ");
for (i = 0; i < size; i++)
- LOGI("0x%02x ", buffer[i]);
+ ALOGI("0x%02x ", buffer[i]);
- LOGI("\n");
+ ALOGI("\n");
}
}
#endif
diff --git a/exynos4/hal/libhdmi/libsForhdmi/libddc/libddc.c b/exynos4/hal/libhdmi/libsForhdmi/libddc/libddc.c
index 12910fb..d283b6a 100644
--- a/exynos4/hal/libhdmi/libsForhdmi/libddc/libddc.c
+++ b/exynos4/hal/libhdmi/libsForhdmi/libddc/libddc.c
@@ -83,7 +83,7 @@
// open
if ((ddc_fd = open(DEV_NAME,O_RDWR)) < 0) {
- LOGE("%s: Cannot open I2C_DDC : %s",__func__, DEV_NAME);
+ ALOGE("%s: Cannot open I2C_DDC : %s",__func__, DEV_NAME);
ret = 0;
}
@@ -102,7 +102,7 @@
// check if fd is available
if (ref_cnt == 0) {
#if DDC_DEBUG
- LOGE("%s: I2C_DDC is not available!!!!", __func__);
+ ALOGE("%s: I2C_DDC is not available!!!!", __func__);
#endif
return 1;
}
@@ -115,7 +115,7 @@
if (close(ddc_fd) < 0) {
#if DDC_DEBUG
- LOGE("%s: Cannot close I2C_DDC : %s",__func__,DEV_NAME);
+ ALOGE("%s: Cannot close I2C_DDC : %s",__func__,DEV_NAME);
#endif
ret = 0;
}
@@ -143,7 +143,7 @@
if (!DDCFileAvailable()) {
#if DDC_DEBUG
- LOGE("%s: I2C_DDC is not available!!!!", __func__);
+ ALOGE("%s: I2C_DDC is not available!!!!", __func__);
#endif
return 0;
}
@@ -193,7 +193,7 @@
if (!DDCFileAvailable()) {
#if DDC_DEBUG
- LOGE("%s: I2C_DDC is not available!!!!", __func__);
+ ALOGE("%s: I2C_DDC is not available!!!!", __func__);
#endif
return 0;
}
@@ -227,7 +227,7 @@
// eddc read
if (ioctl(ddc_fd, I2C_RDWR, &msgset) < 0) {
#if DDC_DEBUG
- LOGE("%s: ioctl(I2C_RDWR) failed!!!", __func__);
+ ALOGE("%s: ioctl(I2C_RDWR) failed!!!", __func__);
#endif
ret = 0;
}
@@ -251,7 +251,7 @@
// allocate temporary buffer
temp = (unsigned char*) malloc((size+1)*sizeof(unsigned char));
if (!temp) {
- LOGE("%s: not enough resources at %s", __FUNCTION__);
+ ALOGE("%s: not enough resources at %s", __FUNCTION__);
goto exit;
}
@@ -259,18 +259,18 @@
memcpy(temp+1,buffer,size);
if (!DDCFileAvailable()) {
- LOGE("%s: I2C_DDC is not available!!!!", __func__);
+ ALOGE("%s: I2C_DDC is not available!!!!", __func__);
goto exit;
}
if (ioctl(ddc_fd, I2C_SLAVE, addr>>1) < 0) {
- LOGE("%s: cannot set slave address 0x%02x", __func__,addr);
+ ALOGE("%s: cannot set slave address 0x%02x", __func__,addr);
goto exit;
}
// write temp buffer
if ((bytes = write(ddc_fd,temp,size+1)) != (size+1)) {
- LOGE("%s: fail to write %d bytes, only write %d bytes",__func__, size, bytes);
+ ALOGE("%s: fail to write %d bytes, only write %d bytes",__func__, size, bytes);
goto exit;
}
diff --git a/exynos4/hal/libhdmi/libsForhdmi/libedid/libedid.c b/exynos4/hal/libhdmi/libsForhdmi/libedid/libedid.c
index c4af587..7a81913 100644
--- a/exynos4/hal/libhdmi/libsForhdmi/libedid/libedid.c
+++ b/exynos4/hal/libhdmi/libsForhdmi/libedid/libedid.c
@@ -27,7 +27,7 @@
//#define EDID_DEBUG 1
#ifdef EDID_DEBUG
-#define DPRINTF(args...) LOGI(args)
+#define DPRINTF(args...) ALOGI(args)
#else
#define DPRINTF(args...)
#endif
@@ -219,11 +219,11 @@
#ifdef EDID_DEBUG
offset = 0;
do {
- LOGI("0x%02X", outBuffer[offset++]);
+ ALOGI("0x%02X", outBuffer[offset++]);
if (offset % 16)
- LOGI(" ");
+ ALOGI(" ");
else
- LOGI("\n");
+ ALOGI("\n");
} while (SIZEOFEDIDBLOCK > offset);
#endif // EDID_DEBUG
return 1;