summaryrefslogtreecommitdiff
path: root/omx
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2009-11-12 23:09:37 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-12 23:09:37 -0800
commite13da13dec0c8eee13fe175d01b3dac341cd8cc7 (patch)
tree51647c4b8eda3c1e82e8a902a8c6d31e66f8ffda /omx
parent9d48be18b3da0f7601d0f3c1230425148bb21153 (diff)
parent4d888dbb93bf28964a5335b0210f5ef3bc49b2cd (diff)
downloadomap3-e13da13dec0c8eee13fe175d01b3dac341cd8cc7.tar.gz
am 4d888dbb: Increase output buffers for TI encoder component from 4 to 8 bug 2247143
Merge commit '4d888dbb93bf28964a5335b0210f5ef3bc49b2cd' into eclair-mr2 * commit '4d888dbb93bf28964a5335b0210f5ef3bc49b2cd': Increase output buffers for TI encoder component from 4 to 8
Diffstat (limited to 'omx')
-rw-r--r--omx/video/src/openmax_il/video_encode/inc/OMX_VideoEnc_Utils.h6
-rw-r--r--omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Utils.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/omx/video/src/openmax_il/video_encode/inc/OMX_VideoEnc_Utils.h b/omx/video/src/openmax_il/video_encode/inc/OMX_VideoEnc_Utils.h
index a4f3b9d..05c3acb 100644
--- a/omx/video/src/openmax_il/video_encode/inc/OMX_VideoEnc_Utils.h
+++ b/omx/video/src/openmax_il/video_encode/inc/OMX_VideoEnc_Utils.h
@@ -69,11 +69,11 @@
#include <utils/Log.h>
/* this is the max of VIDENC_MAX_NUM_OF_IN_BUFFERS and VIDENC_MAX_NUM_OF_OUT_BUFFERS */
-#define VIDENC_MAX_NUM_OF_BUFFERS 5
+#define VIDENC_MAX_NUM_OF_BUFFERS 8
#define VIDENC_MAX_NUM_OF_IN_BUFFERS 5
-#define VIDENC_MAX_NUM_OF_OUT_BUFFERS 4
+#define VIDENC_MAX_NUM_OF_OUT_BUFFERS 8
#define VIDENC_NUM_OF_IN_BUFFERS 4
-#define VIDENC_NUM_OF_OUT_BUFFERS 4
+#define VIDENC_NUM_OF_OUT_BUFFERS 8
#define VIDENC_NUM_OF_PORTS 2
diff --git a/omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Utils.c b/omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Utils.c
index 01741ab..826ebd8 100644
--- a/omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Utils.c
+++ b/omx/video/src/openmax_il/video_encode/src/OMX_VideoEnc_Utils.c
@@ -4077,7 +4077,7 @@ void CalculateBufferSize(OMX_PARAM_PORTDEFINITIONTYPE* pCompPort, VIDENC_COMPONE
pCompPort->format.video.nFrameHeight / 2;
}
pCompPort->nBufferSize += 256;
- OMX_ERROR5(pCompPrivate->dbg, "*The output buffer size is %lu. WIDTH=%lu HEIGHT=%lu FORMAT %d\n", pCompPort->nBufferSize, pCompPort->format.video.nFrameWidth, pCompPort->format.video.nFrameHeight, pCompPort->format.video.eCompressionFormat);
+ OMX_ERROR5(pCompPrivate->dbg, "*The output buffer size is %lu and number of buffer is %lu. WIDTH=%lu HEIGHT=%lu FORMAT %d\n", pCompPort->nBufferSize, pCompPort->nBufferCountActual, pCompPort->format.video.nFrameWidth, pCompPort->format.video.nFrameHeight, pCompPort->format.video.eCompressionFormat);
}
}