diff options
| author | Zhao Yakui <yakui.zhao@intel.com> | 2013-12-19 13:37:13 +0800 |
|---|---|---|
| committer | Yakui Zhao <yakui.zhao@intel.com> | 2013-12-19 13:37:13 +0800 |
| commit | 0befa4cf39e750a3b2e9042d8b219319846e7e83 (patch) | |
| tree | 26cc21493a1c95d593ee62cf555dcad35e6494ea | |
| parent | 7308757d97d377b0564f86971ecf525987e0e95a (diff) | |
| download | libva-intel-driver-0befa4cf39e750a3b2e9042d8b219319846e7e83.tar.gz libva-intel-driver-0befa4cf39e750a3b2e9042d8b219319846e7e83.tar.bz2 libva-intel-driver-0befa4cf39e750a3b2e9042d8b219319846e7e83.zip | |
Handle the aux_batchbuffer correctly for H264 encoding on Haswell
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
| -rw-r--r-- | src/gen75_mfc.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gen75_mfc.c b/src/gen75_mfc.c index c6a5ab5..7161acd 100644 --- a/src/gen75_mfc.c +++ b/src/gen75_mfc.c @@ -1621,6 +1621,8 @@ gen75_mfc_avc_batchbuffer_pipeline(VADriverContextP ctx, OUT_BCS_BATCH(slice_batch, 0); OUT_BCS_BATCH(slice_batch, MI_BATCH_BUFFER_END); ADVANCE_BCS_BATCH(slice_batch); + mfc_context->aux_batchbuffer = NULL; + intel_batchbuffer_free(slice_batch); } intel_batchbuffer_end_atomic(batch); intel_batchbuffer_flush(batch); @@ -1644,8 +1646,8 @@ gen75_mfc_avc_hardware_batchbuffer(VADriverContextP ctx, { struct gen6_mfc_context *mfc_context = encoder_context->mfc_context; - gen75_mfc_build_avc_batchbuffer(ctx, encode_state, encoder_context); dri_bo_reference(mfc_context->aux_batchbuffer_surface.bo); + gen75_mfc_build_avc_batchbuffer(ctx, encode_state, encoder_context); return mfc_context->aux_batchbuffer_surface.bo; } |