diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-10 15:23:53 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-11-10 15:23:53 -0800 |
| commit | 78773f8e96f40185b587246e5b6fb2ed9e879cce (patch) | |
| tree | 00a607208e3011714666c7855ce1ae574ef91d73 /omx | |
| parent | d5cf09fb6e53cda5ce8796eb01230bfecdb917ff (diff) | |
| parent | d8b67d87f24cb14a2550934992536d7840008276 (diff) | |
| download | omap3-78773f8e96f40185b587246e5b6fb2ed9e879cce.tar.gz | |
Merge change I739c2125 into eclair
* changes:
Jpeg encoder: remove pplib support
Diffstat (limited to 'omx')
| -rw-r--r-- | omx/image/src/openmax_il/jpeg_enc/inc/OMX_JpegEnc_Utils.h | 4 | ||||
| -rw-r--r-- | omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Utils.c | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/omx/image/src/openmax_il/jpeg_enc/inc/OMX_JpegEnc_Utils.h b/omx/image/src/openmax_il/jpeg_enc/inc/OMX_JpegEnc_Utils.h index 8b17988..636d3ee 100644 --- a/omx/image/src/openmax_il/jpeg_enc/inc/OMX_JpegEnc_Utils.h +++ b/omx/image/src/openmax_il/jpeg_enc/inc/OMX_JpegEnc_Utils.h @@ -241,8 +241,8 @@ typedef struct IDMJPGE_TIGEM_DynamicParams { IDMJPGE_TIGEM_CustomQuantTables *quantTable; } IDMJPGE_TIGEM_DynamicParams; - -#define __JPEG_OMX_PPLIB_ENABLED__ +/* PPLIB not needed if the the input to jpeg encoder is yuv. Uncomment the next line if PPLIB is needed */ +/* #define __JPEG_OMX_PPLIB_ENABLED__ */ #ifdef __JPEG_OMX_PPLIB_ENABLED__ #define OMX_JPEGENC_NUM_DLLS (5) diff --git a/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Utils.c b/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Utils.c index 74dc522..b01aff7 100644 --- a/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Utils.c +++ b/omx/image/src/openmax_il/jpeg_enc/src/OMX_JpegEnc_Utils.c @@ -591,6 +591,7 @@ OMX_ERRORTYPE Fill_JpegEncLCMLInitParams(LCML_DSP *lcml_dsp, OMX_U16 arr[], OMX_ lcml_dsp->Alignment = 0; lcml_dsp->Priority = 5; +#ifdef __JPEG_OMX_PPLIB_ENABLED__ if ((pPortDefIn->format.image.nFrameHeight * pPortDefIn->format.image.nFrameWidth) <= (352*288)) { lcml_dsp->ProfileID = 2 ; } @@ -621,6 +622,10 @@ OMX_ERRORTYPE Fill_JpegEncLCMLInitParams(LCML_DSP *lcml_dsp, OMX_U16 arr[], OMX_ else { lcml_dsp->ProfileID = 10; } +#else + lcml_dsp->ProfileID = 1; +#endif + /* CrPhArgs for JpegEnc */ ptCreateString[0] = JPGENC_SNTEST_STRMCNT; |