projects
/
platform
/
adaptation
/
ap_samsung
/
libomxil-e3250-v4l2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix build warning
[platform/adaptation/ap_samsung/libomxil-e3250-v4l2.git]
/
exynos4
/
libcodec
/
video
/
v4l2
/
dec
/
ExynosVideoDecoder.c
diff --git
a/exynos4/libcodec/video/v4l2/dec/ExynosVideoDecoder.c
b/exynos4/libcodec/video/v4l2/dec/ExynosVideoDecoder.c
index
31217df
..
24be448
100755
(executable)
--- a/
exynos4/libcodec/video/v4l2/dec/ExynosVideoDecoder.c
+++ b/
exynos4/libcodec/video/v4l2/dec/ExynosVideoDecoder.c
@@
-107,10
+107,10
@@
static unsigned int __ColorFormatType_To_V4L2PixelFormat(ExynosVideoColorFormatT
pixelformat = V4L2_PIX_FMT_NV21M;
break;
case VIDEO_COLORFORMAT_NV12:
pixelformat = V4L2_PIX_FMT_NV21M;
break;
case VIDEO_COLORFORMAT_NV12:
+#endif
default:
pixelformat = V4L2_PIX_FMT_NV12M;
break;
default:
pixelformat = V4L2_PIX_FMT_NV12M;
break;
-#endif
}
return pixelformat;
}
return pixelformat;
@@
-492,7
+492,7
@@
static ExynosVideoErrorType MFC_Decoder_Get_FramePackingInfo(
struct v4l2_ext_control ext_ctrl[FRAME_PACK_SEI_INFO_NUM];
struct v4l2_ext_controls ext_ctrls;
struct v4l2_ext_control ext_ctrl[FRAME_PACK_SEI_INFO_NUM];
struct v4l2_ext_controls ext_ctrls;
- int seiAvailable, seiInfo, seiGridPos
, i
;
+ int seiAvailable, seiInfo, seiGridPos;
unsigned int seiArgmtId;
unsigned int seiArgmtId;
@@
-571,8
+571,6
@@
EXIT:
}
/*
}
/*
-
-/*
* [Decoder Buffer OPS] Enable Cacheable (Input)
*/
static ExynosVideoErrorType MFC_Decoder_Enable_Cacheable_Inbuf(void *pHandle)
* [Decoder Buffer OPS] Enable Cacheable (Input)
*/
static ExynosVideoErrorType MFC_Decoder_Enable_Cacheable_Inbuf(void *pHandle)
@@
-1225,6
+1223,7
@@
EXIT:
return ret;
}
return ret;
}
+#if 0
/*
* [Decoder Buffer OPS] Wait (Input)
*/
/*
* [Decoder Buffer OPS] Wait (Input)
*/
@@
-1266,6
+1265,7
@@
static ExynosVideoErrorType MFC_Decoder_Wait_Inbuf(void *pHandle)
EXIT:
return ret;
}
EXIT:
return ret;
}
+#endif
static ExynosVideoErrorType MFC_Decoder_Register_Inbuf(
void *pHandle,
static ExynosVideoErrorType MFC_Decoder_Register_Inbuf(
void *pHandle,
@@
-1742,7
+1742,7
@@
static ExynosVideoBuffer *MFC_Decoder_Dequeue_Outbuf(void *pHandle)
}
#endif
switch (buf.flags & (0x7 << 3)) {
}
#endif
switch (buf.flags & (0x7 << 3)) {
- ALOGV("%s: frameType: %d", __func__, buf.flags & (0x7 << 3));
+
case V4L2_BUF_FLAG_KEYFRAME:
pOutbuf->frameType = VIDEO_FRAME_I;
break;
case V4L2_BUF_FLAG_KEYFRAME:
pOutbuf->frameType = VIDEO_FRAME_I;
break;