Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

msm: vidc: Fix compilation errors

Browse source 
This change removes the compilation error in kernel
if ddl logs are enabled.

CRs-Fixed: 483776
Change-Id: Iffc37fcdd4e5ce7ddcd8560d432af5c3f3e6c433
Signed-off-by: Shobhit Pandey <cshopan@codeaurora.org>
This commit is contained in:
Shobhit Pandey 2013-05-06 19:18:42 +05:30 committed by Artem Borisov
parent 4dec300645
commit 687aa8293f
4 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_helper.c
View file

@ -1012,7 +1012,7 @@ void ddl_decoder_chroma_dpb_change(struct ddl_client_context *ddl)
u32 luma_size, i, dpb;
luma_size = decoder->dpb_buf_size.size_y;
dpb = decoder->dp_buf.no_of_dec_pic_buf;
DDL_MSG_HIGH("%s Decoder num DPB buffers = %u Luma Size = %u"
DDL_MSG_HIGH("%s Decoder num DPB buffers = %u Luma Size = %u",
__func__, dpb, luma_size);
if (dpb > DDL_MAX_BUFFER_COUNT)
dpb = DDL_MAX_BUFFER_COUNT;

19
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_interrupt_handler.c
View file

@ -1322,6 +1322,7 @@ static u32 ddl_decoder_output_done_callback(
DDL_MSG_LOW("%s y_cb_cr_size = %u "
"actual_output_buf_req.sz = %u"
"min_output_buf_req.sz = %u\n",
__func__,
decoder->y_cb_cr_size,
decoder->actual_output_buf_req.sz,
decoder->min_output_buf_req.sz);
@ -1837,11 +1838,11 @@ static void ddl_handle_slice_done_slice_batch(struct ddl_client_context *ddl)
stream_buffer_size);
output_frame = &(
encoder->batch_frame.output_frame[actual_idx].vcd_frm);
DDL_MSG_LOW("OutBfr: vcd_frm 0x%x frmbfr(virtual) 0x%x"
DDL_MSG_LOW("OutBfr: vcd_frm %p frmbfr(virtual) 0x%x"
"frmbfr(physical) 0x%x\n",
&output_frame,
output_frame.virtual_base_addr,
output_frame.physical_base_addr);
output_frame,
(u32)output_frame->virtual,
(u32)output_frame->physical);
vidc_1080p_get_encode_frame_info(&encoder->enc_frame_info);
vidc_sm_get_frame_tags(&ddl->shared_mem
[ddl->command_channel],
@ -1922,14 +1923,14 @@ static u32 ddl_handle_enc_frame_done_slice_mode(
DDL_MSG_LOW("Slice Info: OutBfrIndex %d SliceSize %d",
actual_idx,
slice_output->slice_info[start_bfr_idx+index]. \
stream_buffer_size, 0);
stream_buffer_size);
output_frame =
&(encoder->batch_frame.output_frame[actual_idx].vcd_frm);
DDL_MSG_LOW("OutBfr: vcd_frm 0x%x frmbfr(virtual) 0x%x"
DDL_MSG_LOW("OutBfr: vcd_frm %p frmbfr(virtual) 0x%x"
"frmbfr(physical) 0x%x",
&output_frame,
output_frame.virtual_base_addr,
output_frame.physical_base_addr);
output_frame,
(u32)output_frame->virtual,
(u32)output_frame->physical);
vidc_1080p_get_encode_frame_info(
&encoder->enc_frame_info);
vidc_sm_get_frame_tags(&ddl->shared_mem

6
drivers/video/msm/vidc/1080p/ddl/vcd_ddl_properties.c
View file

@ -996,8 +996,8 @@ static u32 ddl_set_enc_property(struct ddl_client_context *ddl,
align_virtual_addr =
recon_buffers->kernel_virtual_addr +
recon_buffers->ysize;
DDL_MSG_LOW("Y::KVirt: %p,KPhys: %p"
"UV::KVirt: %p,KPhys: %p\n",
DDL_MSG_LOW("Y::KVirt: %p, KPhys: %p "\
"UV::KVirt: %p, KPhys: %p\n",
encoder->hw_bufs.dpb_y[index_hw_bufs].
align_virtual_addr,
encoder->hw_bufs.dpb_y[index_hw_bufs].
@ -1007,7 +1007,7 @@ static u32 ddl_set_enc_property(struct ddl_client_context *ddl,
encoder->hw_bufs.dpb_c[index_hw_bufs].
align_physical_addr);
vcd_status = VCD_S_SUCCESS;
}
}
}
}
break;

6
drivers/video/msm/vidc/common/enc/venc.c
View file

@ -218,15 +218,15 @@ static void vid_enc_output_frame_done(struct video_client_ctx *client_ctx,
switch (event) {
case VCD_EVT_RESP_OUTPUT_DONE:
DBG("Send INPUT_DON message to client = %p\n",
DBG("Send OUTPUT_DON message to client = %p\n",
client_ctx);
break;
case VCD_EVT_RESP_OUTPUT_FLUSHED:
DBG("Send INPUT_FLUSHED message to client = %p\n",
DBG("Send OUTPUT_FLUSHED message to client = %p\n",
client_ctx);
break;
default:
ERR("QVD: vid_enc_output_frame_done invalid cmd type: %d\n", event);
ERR("vid_enc_output_frame_done invalid cmd type: %d\n", event);
venc_msg->venc_msg_info.statuscode = VEN_S_EFATAL;
break;
}