diff options
author | Xiang, Haihao <haihao.xiang@intel.com> | 2013-03-08 10:59:48 +0800 |
---|---|---|
committer | Xiang, Haihao <haihao.xiang@intel.com> | 2013-03-15 15:45:28 +0800 |
commit | 149f7699243e417034b2cbc72f132e0b098fcaf0 (patch) | |
tree | 39194efb8481ea08cb56d33fee49d1c077773256 | |
parent | 0e29103373dbadb30bab189722f19c3f9447a306 (diff) |
Return the status when running the pipeline
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
-rwxr-xr-x | src/gen6_mfd.c | 4 | ||||
-rw-r--r-- | src/gen75_mfd.c | 4 | ||||
-rw-r--r-- | src/gen75_picture_process.c | 4 | ||||
-rwxr-xr-x | src/gen7_mfd.c | 4 | ||||
-rwxr-xr-x | src/i965_drv_video.c | 4 | ||||
-rw-r--r-- | src/i965_drv_video.h | 8 | ||||
-rw-r--r-- | src/i965_encoder.c | 3 | ||||
-rw-r--r-- | src/i965_media.c | 4 | ||||
-rwxr-xr-x | src/i965_post_processing.c | 4 |
9 files changed, 25 insertions, 14 deletions
diff --git a/src/gen6_mfd.c b/src/gen6_mfd.c index 130fec1..7513dda 100755 --- a/src/gen6_mfd.c +++ b/src/gen6_mfd.c @@ -1978,7 +1978,7 @@ gen6_mfd_vc1_decode_picture(VADriverContextP ctx, intel_batchbuffer_flush(batch); } -static void +static VAStatus gen6_mfd_decode_picture(VADriverContextP ctx, VAProfile profile, union codec_state *codec_state, @@ -2012,6 +2012,8 @@ gen6_mfd_decode_picture(VADriverContextP ctx, assert(0); break; } + + return VA_STATUS_SUCCESS; } static void diff --git a/src/gen75_mfd.c b/src/gen75_mfd.c index 6a20ebf..37ca17f 100644 --- a/src/gen75_mfd.c +++ b/src/gen75_mfd.c @@ -3320,7 +3320,7 @@ gen75_mfd_jpeg_decode_picture(VADriverContextP ctx, intel_batchbuffer_flush(batch); } -static void +static VAStatus gen75_mfd_decode_picture(VADriverContextP ctx, VAProfile profile, union codec_state *codec_state, @@ -3360,6 +3360,8 @@ gen75_mfd_decode_picture(VADriverContextP ctx, assert(0); break; } + + return VA_STATUS_SUCCESS; } static void diff --git a/src/gen75_picture_process.c b/src/gen75_picture_process.c index 9b7284c..6e10de0 100644 --- a/src/gen75_picture_process.c +++ b/src/gen75_picture_process.c @@ -108,7 +108,7 @@ gen75_vpp_gpe(VADriverContextP ctx, return va_status; } -void +VAStatus gen75_proc_picture(VADriverContextP ctx, VAProfile profile, union codec_state *codec_state, @@ -175,6 +175,8 @@ gen75_proc_picture(VADriverContextP ctx, } gen75_vpp_vebox(ctx, proc_ctx); } + + return VA_STATUS_SUCCESS; } static void diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c index 0d583b5..477ca32 100755 --- a/src/gen7_mfd.c +++ b/src/gen7_mfd.c @@ -2749,7 +2749,7 @@ gen7_mfd_jpeg_decode_picture(VADriverContextP ctx, intel_batchbuffer_flush(batch); } -static void +static VAStatus gen7_mfd_decode_picture(VADriverContextP ctx, VAProfile profile, union codec_state *codec_state, @@ -2789,6 +2789,8 @@ gen7_mfd_decode_picture(VADriverContextP ctx, assert(0); break; } + + return VA_STATUS_SUCCESS; } static void diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c index fc659a2..7de8478 100755 --- a/src/i965_drv_video.c +++ b/src/i965_drv_video.c @@ -2007,9 +2007,7 @@ i965_EndPicture(VADriverContextP ctx, VAContextID context) } assert(obj_context->hw_context->run); - obj_context->hw_context->run(ctx, obj_config->profile, &obj_context->codec_state, obj_context->hw_context); - - return VA_STATUS_SUCCESS; + return obj_context->hw_context->run(ctx, obj_config->profile, &obj_context->codec_state, obj_context->hw_context); } VAStatus diff --git a/src/i965_drv_video.h b/src/i965_drv_video.h index 3798e9e..37f8697 100644 --- a/src/i965_drv_video.h +++ b/src/i965_drv_video.h @@ -154,10 +154,10 @@ union codec_state struct hw_context { - void (*run)(VADriverContextP ctx, - VAProfile profile, - union codec_state *codec_state, - struct hw_context *hw_context); + VAStatus (*run)(VADriverContextP ctx, + VAProfile profile, + union codec_state *codec_state, + struct hw_context *hw_context); void (*destroy)(void *); struct intel_batchbuffer *batch; }; diff --git a/src/i965_encoder.c b/src/i965_encoder.c index d6ffaa3..72ea548 100644 --- a/src/i965_encoder.c +++ b/src/i965_encoder.c @@ -121,7 +121,7 @@ intel_encoder_check_yuv_surface(VADriverContextP ctx, encoder_context->is_tmp_id = 1; } -static void +static VAStatus intel_encoder_end_picture(VADriverContextP ctx, VAProfile profile, union codec_state *codec_state, @@ -139,6 +139,7 @@ intel_encoder_end_picture(VADriverContextP ctx, if (vaStatus == VA_STATUS_SUCCESS) encoder_context->mfc_pipeline(ctx, profile, encode_state, encoder_context); + return VA_STATUS_SUCCESS; } static void diff --git a/src/i965_media.c b/src/i965_media.c index d1764c0..d0d0a24 100644 --- a/src/i965_media.c +++ b/src/i965_media.c @@ -268,7 +268,7 @@ i965_media_decode_init(VADriverContextP ctx, } } -static void +static VAStatus i965_media_decode_picture(VADriverContextP ctx, VAProfile profile, union codec_state *codec_state, @@ -282,6 +282,8 @@ i965_media_decode_picture(VADriverContextP ctx, media_context->media_states_setup(ctx, decode_state, media_context); i965_media_pipeline_setup(ctx, decode_state, media_context); intel_batchbuffer_flush(hw_context->batch); + + return VA_STATUS_SUCCESS; } static void diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c index 20f5562..0d5e4f5 100755 --- a/src/i965_post_processing.c +++ b/src/i965_post_processing.c @@ -5167,7 +5167,7 @@ static const int proc_frame_to_pp_frame[3] = { I965_SURFACE_FLAG_BOTTOME_FIELD_FIRST }; -void +VAStatus i965_proc_picture(VADriverContextP ctx, VAProfile profile, union codec_state *codec_state, @@ -5364,6 +5364,8 @@ i965_proc_picture(VADriverContextP ctx, num_tmp_surfaces); intel_batchbuffer_flush(hw_context->batch); + + return VA_STATUS_SUCCESS; } static void |