summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEspen Fjellvær Olsen <espen@mrfjo.org>2012-03-29 22:02:35 +0200
committerEspen Fjellvær Olsen <espen@mrfjo.org>2012-03-29 22:02:35 +0200
commit9a5f75abbf436284b78dceb2825c7f3fce706c31 (patch)
treece7b248c7e42da1f5ecb84867022374d58730682
parent47c6ea990552b20c24ede4bcf8e8978dae619c7b (diff)
downloadandroid_hardware_samsung-9a5f75abbf436284b78dceb2825c7f3fce706c31.tar.gz
android_hardware_samsung-9a5f75abbf436284b78dceb2825c7f3fce706c31.tar.bz2
android_hardware_samsung-9a5f75abbf436284b78dceb2825c7f3fce706c31.zip
Remove in_output_mode missing from the kernel part. Thanks to Zlodo from XDA
Change-Id: I07106e2af67a1565827bd71954868b7132473a5d
-rw-r--r--exynos4/multimedia/codecs/sec_codecs/video/exynos4/mfc/enc/src/SsbSipMfcEncAPI.c3
-rw-r--r--exynos4/multimedia/codecs/sec_codecs/video/exynos4/mfc/include/mfc_interface.h1
2 files changed, 0 insertions, 4 deletions
diff --git a/exynos4/multimedia/codecs/sec_codecs/video/exynos4/mfc/enc/src/SsbSipMfcEncAPI.c b/exynos4/multimedia/codecs/sec_codecs/video/exynos4/mfc/enc/src/SsbSipMfcEncAPI.c
index 4b9df6c..797baad 100644
--- a/exynos4/multimedia/codecs/sec_codecs/video/exynos4/mfc/enc/src/SsbSipMfcEncAPI.c
+++ b/exynos4/multimedia/codecs/sec_codecs/video/exynos4/mfc/enc/src/SsbSipMfcEncAPI.c
@@ -257,7 +257,6 @@ SSBSIP_MFC_ERROR_CODE SsbSipMfcEncInit(void *openHandle, void *param)
EncArg.args.enc_init.cmn.in_ms_mode = mpeg4_arg->SliceMode;
EncArg.args.enc_init.cmn.in_ms_arg = mpeg4_arg->SliceArgument;
- EncArg.args.enc_init.cmn.in_output_mode = mpeg4_arg->OutputMode;
EncArg.args.enc_init.cmn.in_mb_refresh = mpeg4_arg->RandomIntraMBRefresh;
@@ -326,7 +325,6 @@ SSBSIP_MFC_ERROR_CODE SsbSipMfcEncInit(void *openHandle, void *param)
EncArg.args.enc_init.cmn.in_ms_mode = h263_arg->SliceMode;
EncArg.args.enc_init.cmn.in_ms_arg = 0;
- EncArg.args.enc_init.cmn.in_output_mode = FRAME; /* not support to slice output mode */
EncArg.args.enc_init.cmn.in_mb_refresh = h263_arg->RandomIntraMBRefresh;
@@ -383,7 +381,6 @@ SSBSIP_MFC_ERROR_CODE SsbSipMfcEncInit(void *openHandle, void *param)
return MFC_RET_INVALID_PARAM;
}
EncArg.args.enc_init.cmn.in_ms_arg = h264_arg->SliceArgument;
- EncArg.args.enc_init.cmn.in_output_mode = h264_arg->OutputMode;
EncArg.args.enc_init.cmn.in_mb_refresh = h264_arg->RandomIntraMBRefresh;
/* pad control */
diff --git a/exynos4/multimedia/codecs/sec_codecs/video/exynos4/mfc/include/mfc_interface.h b/exynos4/multimedia/codecs/sec_codecs/video/exynos4/mfc/include/mfc_interface.h
index 5212dc1..968da44 100644
--- a/exynos4/multimedia/codecs/sec_codecs/video/exynos4/mfc/include/mfc_interface.h
+++ b/exynos4/multimedia/codecs/sec_codecs/video/exynos4/mfc/include/mfc_interface.h
@@ -129,7 +129,6 @@ struct mfc_enc_init_common_arg {
unsigned int in_pixelcache;
- SSBSIP_MFC_OUTSTRM_MODE_TYPE in_output_mode;
unsigned int in_mapped_addr;
struct mfc_strm_ref_buf_arg out_u_addr;