diff options
| author | andy.hu <andy.hu@starfivetech.com> | 2023-08-30 13:08:37 +0300 |
|---|---|---|
| committer | andy.hu <andy.hu@starfivetech.com> | 2023-08-30 13:08:37 +0300 |
| commit | 0c67b48d9ba71dc1d3e595da3d12d653cded1f45 (patch) | |
| tree | b1a838f65bb2eccde8ea0fb89bb4a42394d68268 | |
| parent | faa5d0d935bd49af3cc4535105db9d81d0cd41bd (diff) | |
| parent | 7b6961a385039a9177dcc4ce00b6435404b3c394 (diff) | |
| download | linux-0c67b48d9ba71dc1d3e595da3d12d653cded1f45.tar.xz | |
Merge branch 'CR_7268_wave5_v4l2_Som.Qin' into 'jh7110-5.15.y-devel'
CR 7268 Media:Wave5: Allocate more linear buffer to avoid block in gst-play
See merge request sdk/linux!950
| -rw-r--r-- | drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c index fda9090315a6..e97b3b022055 100644 --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c @@ -345,11 +345,7 @@ static void wave5_vpu_dec_finish_decode(struct vpu_instance *inst) ((stride / 2) * (height / 2))); } - if (inst->timestamp) { - dst_buf->vb2_buf.timestamp = inst->timestamp; - } else { - dst_buf->vb2_buf.timestamp = inst->timestamp_cnt++ * inst->codec_info->dec_info.initial_info.ns_per_frame; - } + dst_buf->vb2_buf.timestamp = inst->timestamp_cnt++ * inst->codec_info->dec_info.initial_info.ns_per_frame; dst_buf->field = V4L2_FIELD_NONE; v4l2_m2m_buf_done(dst_buf, VB2_BUF_STATE_DONE); @@ -897,6 +893,7 @@ static int wave5_vpu_dec_queue_setup(struct vb2_queue *q, unsigned int *num_buff //if (*num_buffers > inst->min_dst_buf_count && // *num_buffers < WAVE5_MAX_FBS) // inst->dst_buf_count = *num_buffers; + inst->dst_buf_count += 2; *num_buffers = inst->dst_buf_count; non_linear_num = inst->dst_buf_count; |