summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.mk0
-rw-r--r--mm-core/omxcore/src/common/qc_omx_core.c6
-rw-r--r--mm-video/vidc/vdec/src/omx_vdec.cpp23
-rw-r--r--mm-video/vidc/vdec/test/decoder_driver_test.c4
-rw-r--r--mm-video/vidc/vdec/test/omx_vdec_test.cpp5
-rw-r--r--mm-video/vidc/venc/src/omx_video_base.cpp26
-rw-r--r--mm-video/vidc/venc/test/venc_test.cpp2
-rw-r--r--mm-video/vidc/venc/test/video_encoder_test.c4
8 files changed, 41 insertions, 29 deletions
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index e69de29..0000000
--- a/Android.mk
+++ /dev/null
diff --git a/mm-core/omxcore/src/common/qc_omx_core.c b/mm-core/omxcore/src/common/qc_omx_core.c
index 95493a0..fdc6dd3 100644
--- a/mm-core/omxcore/src/common/qc_omx_core.c
+++ b/mm-core/omxcore/src/common/qc_omx_core.c
@@ -47,6 +47,10 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "qc_omx_core.h"
#include "omx_core_cmp.h"
+#define DEBUG_PRINT_ERROR printf
+#define DEBUG_PRINT printf
+#define DEBUG_DETAIL printf
+
extern omx_core_cb_type core[];
extern const unsigned int SIZE_OF_CORE;
@@ -426,7 +430,7 @@ OMX_GetHandle(OMX_OUT OMX_HANDLETYPE* handle,
struct stat sd;
*handle = NULL;
- if(stat("/dev/pmem_adsp",&sd) != 0)
+ if(stat("/dev/pmem",&sd) != 0)
return OMX_ErrorInsufficientResources;
cmp_index = get_cmp_index(componentName);
diff --git a/mm-video/vidc/vdec/src/omx_vdec.cpp b/mm-video/vidc/vdec/src/omx_vdec.cpp
index ff82ad0..8847c73 100644
--- a/mm-video/vidc/vdec/src/omx_vdec.cpp
+++ b/mm-video/vidc/vdec/src/omx_vdec.cpp
@@ -82,6 +82,11 @@ char filename [] = "/data/input-bitstream.m4v";
}
#endif//_ANDROID_
+#define DEBUG_PRINT(...) printf(__VA_ARGS__)
+#define DEBUG_PRINT_ERROR(...) printf(__VA_ARGS__)
+#define DEBUG_PRINT_LOW(...) printf(__VA_ARGS__)
+
+
void* async_message_thread (void *input)
{
struct vdec_ioctl_msg ioctl_msg;
@@ -229,7 +234,7 @@ void *get_omx_component_factory_fn(void)
VideoHeap::VideoHeap(int fd, size_t size, void* base)
{
// dup file descriptor, map once, use pmem
- init(dup(fd), base, size, 0 , "/dev/pmem_adsp");
+ init(dup(fd), base, size, 0 , "/dev/pmem");
}
#endif // _ANDROID_
@@ -3056,7 +3061,7 @@ OMX_ERRORTYPE omx_vdec::use_input_buffer(
if(i < m_inp_buf_count)
{
- pmem_fd = open ("/dev/pmem_adsp",O_RDWR);
+ pmem_fd = open ("/dev/pmem",O_RDWR | O_SYNC);
if (pmem_fd < 0)
{
@@ -3065,7 +3070,7 @@ OMX_ERRORTYPE omx_vdec::use_input_buffer(
if(pmem_fd == 0)
{
- pmem_fd = open ("/dev/pmem_adsp",O_RDWR);
+ pmem_fd = open ("/dev/pmem",O_RDWR | O_SYNC);
if (pmem_fd < 0)
{
return OMX_ErrorInsufficientResources;
@@ -3296,7 +3301,7 @@ OMX_ERRORTYPE omx_vdec::use_output_buffer(
if(i < m_out_buf_count)
{
driver_context.ptr_outputbuffer[i].pmem_fd = \
- open ("/dev/pmem_adsp",O_RDWR);
+ open ("/dev/pmem", O_RDWR | O_SYNC);
if (driver_context.ptr_outputbuffer[i].pmem_fd < 0)
{
@@ -3306,7 +3311,7 @@ OMX_ERRORTYPE omx_vdec::use_output_buffer(
if(driver_context.ptr_outputbuffer[i].pmem_fd == 0)
{
driver_context.ptr_outputbuffer[i].pmem_fd = \
- open ("/dev/pmem_adsp",O_RDWR);
+ open ("/dev/pmem", O_RDWR | O_SYNC);
if (driver_context.ptr_outputbuffer[i].pmem_fd < 0)
{
@@ -3708,7 +3713,7 @@ OMX_ERRORTYPE omx_vdec::allocate_input_buffer(
if(i < m_inp_buf_count)
{
DEBUG_PRINT_LOW("\n Allocate input Buffer");
- pmem_fd = open ("/dev/pmem_adsp",O_RDWR);
+ pmem_fd = open ("/dev/pmem", O_RDWR, O_SYNC);
if (pmem_fd < 0)
{
@@ -3718,7 +3723,7 @@ OMX_ERRORTYPE omx_vdec::allocate_input_buffer(
if (pmem_fd == 0)
{
- pmem_fd = open ("/dev/pmem_adsp",O_RDWR);
+ pmem_fd = open ("/dev/pmem", O_RDWR | O_SYNC);
if (pmem_fd < 0)
{
@@ -3843,7 +3848,7 @@ OMX_ERRORTYPE omx_vdec::allocate_output_buffer(
DEBUG_PRINT_LOW("PE %d OutputBuffer Count %d \n",nPlatformEntrySize,
m_out_buf_count);
- pmem_fd = open ("/dev/pmem_adsp",O_RDWR);
+ pmem_fd = open ("/dev/pmem", O_RDWR | O_SYNC);
if (pmem_fd < 0)
{
@@ -3853,7 +3858,7 @@ OMX_ERRORTYPE omx_vdec::allocate_output_buffer(
if(pmem_fd == 0)
{
- pmem_fd = open ("/dev/pmem_adsp",O_RDWR);
+ pmem_fd = open ("/dev/pmem", O_RDWR | O_SYNC);
if (pmem_fd < 0)
{
diff --git a/mm-video/vidc/vdec/test/decoder_driver_test.c b/mm-video/vidc/vdec/test/decoder_driver_test.c
index c4c424f..e12b0ae 100644
--- a/mm-video/vidc/vdec/test/decoder_driver_test.c
+++ b/mm-video/vidc/vdec/test/decoder_driver_test.c
@@ -551,11 +551,11 @@ int allocate_buffer ( enum vdec_buffer buffer_dir,
for (i=0; i< buffercount; i++)
{
- ptemp [i]->pmem_fd = open ("/dev/pmem_adsp",O_RDWR);
+ ptemp [i]->pmem_fd = open ("/dev/pmem", O_RDWR | O_SYNC);
if (ptemp [i]->pmem_fd < 0)
{
- DEBUG_PRINT ("\nallocate_buffer: open pmem_adsp failed");
+ DEBUG_PRINT ("\nallocate_buffer: open pmem failed");
return -1;
}
diff --git a/mm-video/vidc/vdec/test/omx_vdec_test.cpp b/mm-video/vidc/vdec/test/omx_vdec_test.cpp
index 2c45f27..b528fbc 100644
--- a/mm-video/vidc/vdec/test/omx_vdec_test.cpp
+++ b/mm-video/vidc/vdec/test/omx_vdec_test.cpp
@@ -70,6 +70,9 @@ extern "C" {
#include <linux/fb.h>
//#include "qutility.h"
+#define DEBUG_PRINT(...) printf(__VA_ARGS__)
+#define DEBUG_PRINT_ERROR(...) printf(__VA_ARGS__)
+#define DEBUG_PRINT_LOW(...) printf(__VA_ARGS__)
/************************************************************************/
/* #DEFINES */
@@ -2240,7 +2243,7 @@ static int open_video_file ()
}
if (takeYuvLog) {
- strncpy(outputfilename, "yuvframes.yuv", 14);
+ strcpy(outputfilename, "/data/misc/yuv");
outputBufferFile = fopen (outputfilename, "ab");
if (outputBufferFile == NULL)
{
diff --git a/mm-video/vidc/venc/src/omx_video_base.cpp b/mm-video/vidc/venc/src/omx_video_base.cpp
index a785895..731c88d 100644
--- a/mm-video/vidc/venc/src/omx_video_base.cpp
+++ b/mm-video/vidc/venc/src/omx_video_base.cpp
@@ -190,7 +190,7 @@ unsigned omx_video::omx_cmd_queue::get_q_msg_type()
VideoHeap::VideoHeap(int fd, size_t size, void* base)
{
// dup file descriptor, map once, use pmem
- init(dup(fd), base, size, 0 , "/dev/pmem_adsp");
+ init(dup(fd), base, size, 0 , "/dev/pmem");
}
#endif // _ANDROID_
@@ -1932,15 +1932,15 @@ OMX_ERRORTYPE omx_video::use_input_buffer(
if(!m_use_input_pmem)
{
- m_pInput_pmem[i].fd = open ("/dev/pmem_adsp",O_RDWR);
+ m_pInput_pmem[i].fd = open ("/dev/pmem", O_RDWR | O_SYNC);
if(m_pInput_pmem[i].fd == 0)
{
- m_pInput_pmem[i].fd = open ("/dev/pmem_adsp",O_RDWR);
+ m_pInput_pmem[i].fd = open ("/dev/pmem", O_RDWR | O_SYNC);
}
if(m_pInput_pmem[i] .fd < 0)
{
- DEBUG_PRINT_ERROR("\nERROR: /dev/pmem_adsp open() Failed");
+ DEBUG_PRINT_ERROR("\nERROR: /dev/pmem open() Failed");
return OMX_ErrorInsufficientResources;
}
m_pInput_pmem[i].size = m_sInPortDef.nBufferSize;
@@ -2103,16 +2103,16 @@ OMX_ERRORTYPE omx_video::use_output_buffer(
if(!m_use_output_pmem)
{
- m_pOutput_pmem[i].fd = open ("/dev/pmem_adsp",O_RDWR);
+ m_pOutput_pmem[i].fd = open ("/dev/pmem", O_RDWR | O_SYNC);
if(m_pOutput_pmem[i].fd == 0)
{
- m_pOutput_pmem[i].fd = open ("/dev/pmem_adsp",O_RDWR);
+ m_pOutput_pmem[i].fd = open ("/dev/pmem", O_RDWR | O_SYNC);
}
if(m_pOutput_pmem[i].fd < 0)
{
- DEBUG_PRINT_ERROR("\nERROR: /dev/pmem_adsp open() Failed");
+ DEBUG_PRINT_ERROR("\nERROR: /dev/pmem open() Failed");
return OMX_ErrorInsufficientResources;
}
m_pOutput_pmem[i].size = m_sOutPortDef.nBufferSize;
@@ -2414,16 +2414,16 @@ OMX_ERRORTYPE omx_video::allocate_input_buffer(
(*bufferHdr)->pAppPrivate = appData;
(*bufferHdr)->nInputPortIndex = PORT_INDEX_IN;
- m_pInput_pmem[i].fd = open ("/dev/pmem_adsp",O_RDWR);
+ m_pInput_pmem[i].fd = open ("/dev/pmem", O_RDWR | O_SYNC);
if(m_pInput_pmem[i].fd == 0)
{
- m_pInput_pmem[i].fd = open ("/dev/pmem_adsp",O_RDWR);
+ m_pInput_pmem[i].fd = open ("/dev/pmem", O_RDWR | O_SYNC);
}
if(m_pInput_pmem[i].fd < 0)
{
- DEBUG_PRINT_ERROR("\nERROR: /dev/pmem_adsp open() Failed\n");
+ DEBUG_PRINT_ERROR("\nERROR: /dev/pmem open() Failed\n");
return OMX_ErrorInsufficientResources;
}
m_pInput_pmem[i].size = m_sInPortDef.nBufferSize;
@@ -2539,15 +2539,15 @@ OMX_ERRORTYPE omx_video::allocate_output_buffer(
{
if(i < m_sOutPortDef.nBufferCountActual)
{
- m_pOutput_pmem[i].fd = open ("/dev/pmem_adsp",O_RDWR);
+ m_pOutput_pmem[i].fd = open ("/dev/pmem", O_RDWR | O_SYNC);
if(m_pOutput_pmem[i].fd == 0)
{
- m_pOutput_pmem[i].fd = open ("/dev/pmem_adsp",O_RDWR);
+ m_pOutput_pmem[i].fd = open ("/dev/pmem",O_RDWR | O_SYNC);
}
if(m_pOutput_pmem[i].fd < 0)
{
- DEBUG_PRINT_ERROR("\nERROR: /dev/pmem_adsp open() failed");
+ DEBUG_PRINT_ERROR("\nERROR: /dev/pmem open() failed");
return OMX_ErrorInsufficientResources;
}
m_pOutput_pmem[i].size = m_sOutPortDef.nBufferSize;
diff --git a/mm-video/vidc/venc/test/venc_test.cpp b/mm-video/vidc/venc/test/venc_test.cpp
index 550ca2e..c30c7aa 100644
--- a/mm-video/vidc/venc/test/venc_test.cpp
+++ b/mm-video/vidc/venc/test/venc_test.cpp
@@ -277,7 +277,7 @@ void* PmemMalloc(OMX_QCOM_PLATFORM_PRIVATE_PMEM_INFO* pMem, int nSize)
if (!pMem)
return NULL;
- pMem->pmem_fd = open("/dev/pmem_adsp", O_RDWR);
+ pMem->pmem_fd = open("/dev/pmem", O_RDWR | O_SYNC);
if ((int)(pMem->pmem_fd) < 0)
return NULL;
nSize = (nSize + 4095) & (~4095);
diff --git a/mm-video/vidc/venc/test/video_encoder_test.c b/mm-video/vidc/venc/test/video_encoder_test.c
index b612d9b..8fa97aa 100644
--- a/mm-video/vidc/venc/test/video_encoder_test.c
+++ b/mm-video/vidc/venc/test/video_encoder_test.c
@@ -571,11 +571,11 @@ int allocate_buffer ( unsigned int buffer_dir,
for (i=0; i< buffercount; i++)
{
- ptemp [i]->fd = open ("/dev/pmem_adsp",O_RDWR);
+ ptemp [i]->fd = open ("/dev/pmem", O_RDWR | O_SYNC);
if (ptemp [i]->fd < 0)
{
- DEBUG_PRINT ("\nallocate_buffer: open pmem_adsp failed");
+ DEBUG_PRINT ("\nallocate_buffer: open pmem failed");
return -1;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 23:08:22 +0000