[COMMON] media: mfc: fix the g_crop fail

During the special parsing also, g_crop is possible.

Change-Id: Ia9ed5c085ecb0ba2911b539c1314c414c0b0665f
Signed-off-by: Ayoung Sim <a.sim@samsung.com>

diff --git a/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c b/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c
index 87a5e7c1dc565dab4ac5902964a0fddc0746db56..ee038b17240f272c9c36d5cb6c89698b94416ba5 100644 (file)
--- a/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c
+++ b/drivers/media/platform/exynos/mfc/mfc_dec_v4l2.c
@@ -1159,7 +1159,7 @@ static int mfc_dec_g_crop(struct file *file, void *priv,
        mfc_debug_enter();
 
        if (!ready_to_get_crop(ctx)) {
-               mfc_debug(2, "ready to get crop failed\n");
+               mfc_err_ctx("ready to get crop failed\n");
                return -EINVAL;
        }
 

diff --git a/drivers/media/platform/exynos/mfc/mfc_sync.h b/drivers/media/platform/exynos/mfc/mfc_sync.h
index d18cc2eccac2cf4a1214c1d9a45f8915c99f4e5f..e7a00c85a6cb06dc15308aea5febefa3058b1f93 100644 (file)
--- a/drivers/media/platform/exynos/mfc/mfc_sync.h
+++ b/drivers/media/platform/exynos/mfc/mfc_sync.h
@@ -32,9 +32,11 @@
 #define need_to_special_parsing_nal(ctx)       \
        (ctx->state == MFCINST_RUNNING)
 #define ready_to_get_crop(ctx)                 \
-       ((ctx->state == MFCINST_HEAD_PARSED) || \
-        (ctx->state == MFCINST_RUNNING) || \
-        (ctx->state == MFCINST_FINISHING))
+       ((ctx->state == MFCINST_HEAD_PARSED) ||         \
+       (ctx->state == MFCINST_RUNNING) ||              \
+       (ctx->state == MFCINST_SPECIAL_PARSING) ||      \
+       (ctx->state == MFCINST_SPECIAL_PARSING_NAL) ||  \
+       (ctx->state == MFCINST_FINISHING))
 
 int mfc_wait_for_done_dev(struct mfc_dev *dev, int command);
 int mfc_wait_for_done_ctx(struct mfc_ctx *ctx, int command);