media: meson: vdec: Add compliant H264 support
Subsystems (4)
v3 cover media: meson: vdec: Add compliant H264 support
Hello,
This patch series aims to bring H.264 support as well as compliance update to the amlogic stateful video decoder driver.
The issue in the V1 patchset at [1] is solved by patch #1 following comments and requirements from hans. It moves the full draining & stopped state tracking and handling from vicodec to core v4l2-mem2mem.
With this, it passes v4l2-compliance with streaming on Amlogic G12A and Amlogic SM1 SoCs successfully.
This patchset depends on G12A and SM1 enablement series at [2] and [3].
The compliance log is:
# v4l2-compliance --stream-from-hdr test-25fps.h264.hdr -s v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bits
Compliance test for vicodec device /dev/video0:
Driver Info:
Driver name : vicodec Card type : vicodec Bus info : platform:vicodec Driver version : 5.5.0 Capabilities : 0x84208000
Video Memory-to-Memory
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04208000
Video Memory-to-Memory
Streaming
Extended Pix Format
Detected Stateful Encoder
Media Driver Info:
Driver name : vicodec Model : vicodec Serial : Bus info : platform:vicodec Media version : 5.5.0 Hardware revision: 0x00000000 (0) Driver version : 5.5.0 Interface Info: ID : 0x0300000c Type : V4L Video Entity Info: ID : 0x00000001 (1) Name : stateful-encoder-source Function : V4L2 I/O Pad 0x01000002 : 0: Source Link 0x02000008: to remote pad 0x1000005 of entity 'stateful-encoder-proc': Data, Enabled, Immutable
Required ioctls:
test MC information (see 'Media Driver Info' above): OK test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video0 open: OK
test VIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) test VIDIOC_LOG_STATUS: OK (Not Supported)
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) test VIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported)
Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 6 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) test VIDIOC_G_FBUF: OK (Not Supported) test VIDIOC_G_FMT: OK
test VIDIOC_TRY_FMT: OK
test VIDIOC_S_FMT: OK
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)
Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK
test VIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)
Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)
Test input 0:
Streaming ioctls:
test read/write: OK (Not Supported)
test blocking wait: OK
Video Capture: Captured 60 buffers
test MMAP (select): OK
Video Capture: Captured 60 buffers
test MMAP (epoll): OK
Video Capture: Captured 60 buffers
test USERPTR (select): OK
test DMABUF: Cannot test, specify --expbuf-device
Total for vicodec device /dev/video0: 50, Succeeded: 50, Failed: 0, Warnings: 0
Changes since v2 at [4]:
- Move full draining & stopped state tracking into core v4l2-mem2mem
- Adapt vicodec to use the core v4l2-mem2mem draining & stopped state tracking
Changes since v1 at [1]:
- fixed output_size is never used reported by hans
- rebased on G12A and SM1 patches
- added handling of qbuf after STREAMON and STOP before enought buffer queued
[1] https://lore.kernel.org/linux-media/[email protected]
[2] https://lore.kernel.org/linux-media/[email protected]
[3] https://lore.kernel.org/linux-media/[email protected]
[4] https://lore.kernel.org/linux-media/[email protected]
Maxime Jourdan (2):
media: meson: vdec: bring up to compliance
media: meson: vdec: add H.264 decoding support
Neil Armstrong (2):
media: v4l2-mem2mem: handle draining, stopped and next-buf-is-last
states
media: vicodec: use v4l2-mem2mem draining, stopped and
next-buf-is-last states handling
drivers/media/platform/vicodec/vicodec-core.c | 154 ++---- drivers/media/v4l2-core/v4l2-mem2mem.c | 174 ++++++- drivers/staging/media/meson/vdec/Makefile | 2 +- drivers/staging/media/meson/vdec/codec_h264.c | 482 ++++++++++++++++++ drivers/staging/media/meson/vdec/codec_h264.h | 14 + drivers/staging/media/meson/vdec/esparser.c | 58 +-- drivers/staging/media/meson/vdec/vdec.c | 92 ++-- drivers/staging/media/meson/vdec/vdec.h | 14 +- .../staging/media/meson/vdec/vdec_helpers.c | 85 ++- .../staging/media/meson/vdec/vdec_helpers.h | 6 +- .../staging/media/meson/vdec/vdec_platform.c | 71 +++ include/media/v4l2-mem2mem.h | 87 ++++ 12 files changed, 1009 insertions(+), 230 deletions(-) create mode 100644 drivers/staging/media/meson/vdec/codec_h264.c create mode 100644 drivers/staging/media/meson/vdec/codec_h264.h
Signature · 1 line
2.22.0
PATCH v3 1/4 media: v4l2-mem2mem: handle draining, stopped and next-buf-is-last states
Since the draining and stop phase of the HW decoder mem2mem bahaviour is now clearly defined, we can move handling of the following states to the common v4l2-mem2mem core code:
- draining
- stopped
- next-buf-is-last
By introducing the following v4l2-mem2mem APIS:
- v4l2_m2m_encoder_cmd/v4l2_m2m_ioctl_encoder_cmd to handle start/stop command
- v4l2_m2m_decoder_cmd/v4l2_m2m_ioctl_decoder_cmd to handle start/stop command
- v4l2_m2m_start_streaming to handle start of streaming of the de/encoder queue
- v4l2_m2m_stop_streaming to handle stop of streaming of the de/encoder queue
- v4l2_m2m_last_buffer_done to maek the current dest buffer as the last one
And inline helpers:
- v4l2_m2m_mark_stopped to mark the de/encoding process as stopped
- v4l2_m2m_dst_buf_is_last to detect the current dequeud dst_buf is the last
- v4l2_m2m_has_stopped to detect the de/encoding stopped state
- v4l2_m2m_is_last_draining_src_buf to detect the currect source buffer should be the last processing before stopping the de/encoding process
The special next-buf-is-last when min_buffers != 1 case is also handled in v4l2_m2m_qbuf() by reusing the other introduced APIs.
This state management has been stolen from the vicodec implementation, and is no-op for drivers not calling the v4l2_m2m_encoder_cmd or v4l2_m2m_decoder_cmd and v4l2_m2m_start_streaming/v4l2_m2m_stop_streaming.
The vicodec will be the first one to be converted as an example.
--- drivers/media/v4l2-core/v4l2-mem2mem.c | 174 ++++++++++++++++++++++++- include/media/v4l2-mem2mem.h | 87 +++++++++++++ 2 files changed, 259 insertions(+), 2 deletions(-)
drivers/media/v4l2-core/v4l2-mem2mem.c +172 -2
@@ -340,6 +340,11 @@ static void __v4l2_m2m_try_queue(struct v4l2_m2m_dev *m2m_dev, m2m_ctx->new_frame = !dst->vb2_buf.copied_timestamp || dst->vb2_buf.timestamp != src->vb2_buf.timestamp; +if (m2m_ctx->has_stopped) { +dprintk ("Device has stopped\n" ); + goto job_unlock; + } +if (m2m_dev->m2m_ops->job_ready && (!m2m_dev->m2m_ops->job_ready (m2m_ctx->priv))) {dprintk ("Driver not ready\n" );
@@ -556,6 +561,101 @@ int v4l2_m2m_querybuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, }EXPORT_SYMBOL_GPL (v4l2_m2m_querybuf); +void v4l2_m2m_last_buffer_done (struct v4l2_m2m_ctx *m2m_ctx, +struct vb2_v4l2_buffer *vbuf) +{ + vbuf->flags |=V4L2_BUF_FLAG_LAST ; +vb2_buffer_done (&vbuf->vb2_buf,VB2_BUF_STATE_DONE ); + +v4l2_m2m_mark_stopped (m2m_ctx); +} +EXPORT_SYMBOL_GPL (v4l2_m2m_last_buffer_done); + +static int v4l2_mark_last_buf (struct v4l2_m2m_ctx *m2m_ctx) +{ +struct vb2_v4l2_buffer *next_dst_buf; + +if (m2m_ctx->is_draining) +return -EBUSY ; + +if (m2m_ctx->has_stopped) +return 0 ; + + m2m_ctx->last_src_buf =v4l2_m2m_last_src_buf (m2m_ctx); + m2m_ctx->is_draining = true; + +if (m2m_ctx->last_src_buf) +return 0 ; + + next_dst_buf =v4l2_m2m_dst_buf_remove (m2m_ctx); +if (!next_dst_buf) { + m2m_ctx->next_buf_last = true; +return 0 ; + } + +v4l2_m2m_last_buffer_done (m2m_ctx, next_dst_buf); + +return 0 ; +} + +void v4l2_m2m_start_streaming (struct v4l2_m2m_ctx *m2m_ctx,struct vb2_queue *q) +{ +if (V4L2_TYPE_IS_OUTPUT (q->type)) + m2m_ctx->last_src_buf =NULL ; +} +EXPORT_SYMBOL_GPL (v4l2_m2m_start_streaming); + +void v4l2_m2m_stop_streaming (struct v4l2_m2m_ctx *m2m_ctx,struct vb2_queue *q) +{ +if (V4L2_TYPE_IS_OUTPUT (q->type)) { +if (m2m_ctx->is_draining) { +struct vb2_v4l2_buffer *next_dst_buf; + + m2m_ctx->last_src_buf =NULL ; + next_dst_buf =v4l2_m2m_dst_buf_remove (m2m_ctx); +if (!next_dst_buf) + m2m_ctx->next_buf_last = true; +else +v4l2_m2m_last_buffer_done (m2m_ctx, + next_dst_buf); + } + }else { + m2m_ctx->is_draining = false; + m2m_ctx->has_stopped = false; + m2m_ctx->next_buf_last = false; + } +} +EXPORT_SYMBOL_GPL (v4l2_m2m_stop_streaming); + +static void v4l2_m2m_force_last_buf_done (struct v4l2_m2m_ctx *m2m_ctx, +struct vb2_queue *q) +{ +struct vb2_buffer *vb; +struct vb2_v4l2_buffer *vbuf; +unsigned int i; + +if (WARN_ON (q->is_output)) +return ; +if (list_empty (&q->queued_list)) +return ; + + vb = list_first_entry(&q->queued_list, struct vb2_buffer, queued_entry); +for (i =0 ; i < vb->num_planes; i++) +vb2_set_plane_payload (vb, i,0 ); + +/* +* Since the buffer hasn't been queued to the ready queue, +* mark is active and owned before marking it LAST and DONE +*/ + vb->state =VB2_BUF_STATE_ACTIVE ; +atomic_inc (&q->owned_by_drv_count); + + vbuf =to_vb2_v4l2_buffer (vb); + vbuf->field =V4L2_FIELD_NONE ; + +v4l2_m2m_last_buffer_done (m2m_ctx, vbuf); +} +int v4l2_m2m_qbuf (struct file *file,struct v4l2_m2m_ctx *m2m_ctx,struct v4l2_buffer *buf) {
@@ -570,11 +670,25 @@ int v4l2_m2m_qbuf(struct file *file, struct v4l2_m2m_ctx *m2m_ctx, __func__);return -EPERM ; } + ret =vb2_qbuf (vq, vdev->v4l2_dev->mdev, buf); -if (!ret && !(buf->flags &V4L2_BUF_FLAG_IN_REQUEST )) +if (ret) +return ret; + +/* +* If the capture queue is streaming, but streaming hasn't started +* on the device, but was asked to stop, mark the previously queued +* buffer as DONE with LAST flag since it won't be queued on the +* device. +*/ +if (!V4L2_TYPE_IS_OUTPUT (vq->type) && +vb2_is_streaming (vq) && !vb2_start_streaming_called (vq) && +v4l2_m2m_dst_buf_is_last (m2m_ctx)) +v4l2_m2m_force_last_buf_done (m2m_ctx, vq); +else if ((buf->flags &V4L2_BUF_FLAG_IN_REQUEST ))v4l2_m2m_try_schedule (m2m_ctx); -return ret; +return 0 ; }EXPORT_SYMBOL_GPL (v4l2_m2m_qbuf);
@@ -1225,6 +1339,62 @@ int v4l2_m2m_ioctl_try_decoder_cmd(struct file *file, void *fh, }EXPORT_SYMBOL_GPL (v4l2_m2m_ioctl_try_decoder_cmd); +int v4l2_m2m_encoder_cmd (struct file *file,struct v4l2_m2m_ctx *m2m_ctx, +struct v4l2_encoder_cmd *ec) +{ +if (ec->cmd !=V4L2_ENC_CMD_STOP && ec->cmd !=V4L2_ENC_CMD_START ) +return -EINVAL ; + +if (ec->cmd ==V4L2_ENC_CMD_STOP ) +return v4l2_mark_last_buf (m2m_ctx); + +if (m2m_ctx->is_draining) +return -EBUSY ; + +if (m2m_ctx->has_stopped) + m2m_ctx->has_stopped = false; + +return 0 ; +} +EXPORT_SYMBOL_GPL (v4l2_m2m_encoder_cmd); + +int v4l2_m2m_decoder_cmd (struct file *file,struct v4l2_m2m_ctx *m2m_ctx, +struct v4l2_decoder_cmd *dc) +{ +if (dc->cmd !=V4L2_DEC_CMD_STOP && dc->cmd !=V4L2_DEC_CMD_START ) +return -EINVAL ; + +if (dc->cmd ==V4L2_DEC_CMD_STOP ) +return v4l2_mark_last_buf (m2m_ctx); + +if (m2m_ctx->is_draining) +return -EBUSY ; + +if (m2m_ctx->has_stopped) + m2m_ctx->has_stopped = false; + +return 0 ; +} +EXPORT_SYMBOL_GPL (v4l2_m2m_decoder_cmd); + +int v4l2_m2m_ioctl_encoder_cmd (struct file *file,void *priv, +struct v4l2_encoder_cmd *ec) +{ +struct v4l2_fh *fh = file->private_data; + +return v4l2_m2m_encoder_cmd (file, fh->m2m_ctx, ec); +} +EXPORT_SYMBOL_GPL (v4l2_m2m_ioctl_encoder_cmd); + +int v4l2_m2m_ioctl_decoder_cmd (struct file *file,void *priv, +struct v4l2_decoder_cmd *dc) +{ +struct v4l2_fh *fh = file->private_data; + +return v4l2_m2m_decoder_cmd (file, fh->m2m_ctx, dc); +} +EXPORT_SYMBOL_GPL (v4l2_m2m_ioctl_decoder_cmd); +int v4l2_m2m_ioctl_stateless_try_decoder_cmd (struct file *file,void *fh,struct v4l2_decoder_cmd *dc) {
include/media/v4l2-mem2mem.h +87 -0
117 lines not on this page · raw message
Signature · 1 line
2.22.0
PATCH v3 2/4 media: vicodec: use v4l2-mem2mem draining, stopped and next-buf-is-last states handling
In reply to Neil ArmstrongUse the previously introduced v4l2-mem2mem core APIs to handle the drainig, stopped and next-buf-is-last states.
With these changes, the v4l2-compliance still passes with the following commands :
# v4l2-ctl --stream-mmap --stream-out-mmap --stream-to-hdr out.comp --stream-from in.yuv
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
<><><><><><><><><><><><><><><><>< 15.53 fps
15.53 fps
Quoted 1 line
<><><><><><><><><><><><>< 13.99 fps
13.99 fps
Quoted 1 line
<><><><><><><><><><><>< 13.52 fps
13.52 fps
Quoted 1 line
<><><><><><><><><><><><>< 13.41 fps
13.41 fps
Quoted 1 line
<><><><><><><><><><><><>< 13.21 fps
13.21 fps
Quoted 1 line
<><><><><><><><><><><>< 13.09 fps
13.09 fps
Quoted 1 line
<><><><><><><
STOP ENCODER
<<<
EOS EVENT
# v4l2-compliance --stream-from in.yuv -s v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bits [...] Total for vicodec device /dev/video0: 50, Succeeded: 50, Failed: 0, Warnings: 0
The full output is available at [1]
# v4l2-compliance -d1 --stream-from-hdr out.comp -s v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bits [...] Total for vicodec device /dev/video1: 50, Succeeded: 50, Failed: 0, Warnings: 0
The full output is available at [2]
No functional changes should be noticed.
[1] https://termbin.com/25nn
[2] https://termbin.com/dza4
--- drivers/media/platform/vicodec/vicodec-core.c | 154 +++++------------- 1 file changed, 44 insertions(+), 110 deletions(-)
drivers/media/platform/vicodec/vicodec-core.c +44 -110
@@ -117,15 +117,10 @@ struct vicodec_ctx {struct vicodec_dev *dev;bool is_enc;bool is_stateless; -bool is_draining; -bool next_is_last; -bool has_stopped;spinlock_t *lock;struct v4l2_ctrl_handler hdl; -struct vb2_v4l2_buffer *last_src_buf; -/* Source and destination queue data */ struct vicodec_q_data q_data[2 ];struct v4l2_fwht_state state;
@@ -431,11 +426,11 @@ static void device_run(void *priv)v4l2_m2m_buf_copy_metadata (src_buf, dst_buf, false);spin_lock (ctx->lock); -if (!ctx->comp_has_next_frame && src_buf == ctx->last_src_buf) { +if (!ctx->comp_has_next_frame && +v4l2_m2m_is_last_draining_src_buf (ctx->fh.m2m_ctx, src_buf)) { dst_buf->flags |=V4L2_BUF_FLAG_LAST ;v4l2_event_queue_fh (&ctx->fh, &vicodec_eos_event); - ctx->is_draining = false; - ctx->has_stopped = true; +v4l2_m2m_mark_stopped (ctx->fh.m2m_ctx); }if (ctx->is_enc || ctx->is_stateless) { src_buf->sequence = q_src->sequence++;
@@ -586,8 +581,6 @@ static int job_ready(void *priv)unsigned int max_to_copy;unsigned int comp_frame_size; -if (ctx->has_stopped) -return 0 ;if (ctx->source_changed)return 0 ;if (ctx->is_stateless || ctx->is_enc || ctx->comp_has_frame)
@@ -607,7 +600,8 @@ static int job_ready(void *priv)if (ctx->header_size <sizeof (struct fwht_cframe_hdr )) { state =get_next_header (ctx, &p, p_src + sz - p);if (ctx->header_size <sizeof (struct fwht_cframe_hdr )) { -if (ctx->is_draining && src_buf == ctx->last_src_buf) +if (v4l2_m2m_is_last_draining_src_buf (ctx->fh.m2m_ctx, + src_buf))return 1 ;job_remove_src_buf (ctx, state); goto restart;
@@ -636,7 +630,8 @@ static int job_ready(void *priv) p += copy; ctx->comp_size += copy;if (ctx->comp_size < max_to_copy) { -if (ctx->is_draining && src_buf == ctx->last_src_buf) +if (v4l2_m2m_is_last_draining_src_buf (ctx->fh.m2m_ctx, + src_buf))return 1 ;job_remove_src_buf (ctx, state); goto restart;
@@ -1219,41 +1214,6 @@ static int vidioc_s_selection(struct file *file, void *priv,return 0 ; } -static int vicodec_mark_last_buf (struct vicodec_ctx *ctx) -{ -struct vb2_v4l2_buffer *next_dst_buf; -int ret =0 ; - -spin_lock (ctx->lock); -if (ctx->is_draining) { - ret = -EBUSY ; - goto unlock; - } -if (ctx->has_stopped) - goto unlock; - - ctx->last_src_buf =v4l2_m2m_last_src_buf (ctx->fh.m2m_ctx); - ctx->is_draining = true; -if (ctx->last_src_buf) - goto unlock; - - next_dst_buf =v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); -if (!next_dst_buf) { - ctx->next_is_last = true; - goto unlock; - } - - next_dst_buf->flags |=V4L2_BUF_FLAG_LAST ; -vb2_buffer_done (&next_dst_buf->vb2_buf,VB2_BUF_STATE_DONE ); - ctx->is_draining = false; - ctx->has_stopped = true; -v4l2_event_queue_fh (&ctx->fh, &vicodec_eos_event); - -unlock: -spin_unlock (ctx->lock); -return ret; -} -static int vicodec_encoder_cmd (struct file *file,void *fh,struct v4l2_encoder_cmd *ec) {
@@ -1268,18 +1228,15 @@ static int vicodec_encoder_cmd(struct file *file, void *fh, !vb2_is_streaming(&ctx->fh.m2m_ctx->out_q_ctx.q))return 0 ; -if (ec->cmd ==V4L2_ENC_CMD_STOP ) -return vicodec_mark_last_buf (ctx); - ret =0 ; -spin_lock (ctx->lock); -if (ctx->is_draining) { - ret = -EBUSY ; - }else if (ctx->has_stopped) { - ctx->has_stopped = false; + ret =v4l2_m2m_ioctl_encoder_cmd (file, fh, ec); +if (ret <0 ) +return ret; + +if (ec->cmd ==V4L2_ENC_CMD_START && +v4l2_m2m_has_stopped (ctx->fh.m2m_ctx))vb2_clear_last_buffer_dequeued (&ctx->fh.m2m_ctx->cap_q_ctx.q); - } -spin_unlock (ctx->lock); -return ret; + +return 0 ; } static int vicodec_decoder_cmd(struct file *file, void *fh,
@@ -1296,18 +1253,15 @@ static int vicodec_decoder_cmd(struct file *file, void *fh, !vb2_is_streaming(&ctx->fh.m2m_ctx->out_q_ctx.q))return 0 ; -if (dc->cmd ==V4L2_DEC_CMD_STOP ) -return vicodec_mark_last_buf (ctx); - ret =0 ; -spin_lock (ctx->lock); -if (ctx->is_draining) { - ret = -EBUSY ; - }else if (ctx->has_stopped) { - ctx->has_stopped = false; + ret =v4l2_m2m_ioctl_decoder_cmd (file, fh, dc); +if (ret <0 ) +return ret; + +if (dc->cmd ==V4L2_DEC_CMD_START && +v4l2_m2m_has_stopped (ctx->fh.m2m_ctx))vb2_clear_last_buffer_dequeued (&ctx->fh.m2m_ctx->cap_q_ctx.q); - } -spin_unlock (ctx->lock); -return ret; + +return 0 ; } static int vicodec_enum_framesizes(struct file *file, void *fh,
@@ -1480,23 +1434,21 @@ static void vicodec_buf_queue(struct vb2_buffer *vb) .u.src_change.changes = V4L2_EVENT_SRC_CH_RESOLUTION, }; -if (vb2_is_streaming (vq_cap)) { -if (!V4L2_TYPE_IS_OUTPUT (vb->vb2_queue->type) && - ctx->next_is_last) { -unsigned int i; +if (!V4L2_TYPE_IS_OUTPUT (vb->vb2_queue->type) && +vb2_is_streaming (vb->vb2_queue) && +v4l2_m2m_dst_buf_is_last (ctx->fh.m2m_ctx)) { +unsigned int i; -for (i =0 ; i < vb->num_planes; i++) - vb->planes[i].bytesused =0 ; - vbuf->flags =V4L2_BUF_FLAG_LAST ; - vbuf->field =V4L2_FIELD_NONE ; - vbuf->sequence =get_q_data (ctx, vb->vb2_queue->type)->sequence++; -vb2_buffer_done (vb,VB2_BUF_STATE_DONE ); - ctx->is_draining = false; - ctx->has_stopped = true; - ctx->next_is_last = false; -v4l2_event_queue_fh (&ctx->fh, &vicodec_eos_event); -return ; - } +for (i =0 ; i < vb->num_planes; i++) + vb->planes[i].bytesused =0 ; + + vbuf->field =V4L2_FIELD_NONE ; + vbuf->sequence = +get_q_data (ctx, vb->vb2_queue->type)->sequence++; + +v4l2_m2m_last_buffer_done (ctx->fh.m2m_ctx, vbuf); +v4l2_event_queue_fh (&ctx->fh, &vicodec_eos_event); +return ; }/* buf_queue handles only the first source change event */
@@ -1609,8 +1561,7 @@ static int vicodec_start_streaming(struct vb2_queue *q, chroma_div = info->width_div * info->height_div; q_data->sequence =0 ; -if (V4L2_TYPE_IS_OUTPUT (q->type)) - ctx->last_src_buf =NULL ; +v4l2_m2m_start_streaming (ctx->fh.m2m_ctx, q); state->gop_cnt =0 ;
@@ -1689,29 +1640,12 @@ static void vicodec_stop_streaming(struct vb2_queue *q)vicodec_return_bufs (q,VB2_BUF_STATE_ERROR ); -if (V4L2_TYPE_IS_OUTPUT (q->type)) { -if (ctx->is_draining) { -struct vb2_v4l2_buffer *next_dst_buf; - -spin_lock (ctx->lock); - ctx->last_src_buf =NULL ; - next_dst_buf =v4l2_m2m_dst_buf_remove (ctx->fh.m2m_ctx); -if (!next_dst_buf) { - ctx->next_is_last = true; - }else { - next_dst_buf->flags |=V4L2_BUF_FLAG_LAST ; -vb2_buffer_done (&next_dst_buf->vb2_buf,VB2_BUF_STATE_DONE ); - ctx->is_draining = false; - ctx->has_stopped = true; -v4l2_event_queue_fh (&ctx->fh, &vicodec_eos_event); - } -spin_unlock (ctx->lock); - } - }else { - ctx->is_draining = false; - ctx->has_stopped = false; - ctx->next_is_last = false; - } +v4l2_m2m_stop_streaming (ctx->fh.m2m_ctx, q); + +if (V4L2_TYPE_IS_OUTPUT (q->type) && +v4l2_m2m_has_stopped (ctx->fh.m2m_ctx)) +v4l2_event_queue_fh (&ctx->fh, &vicodec_eos_event); +if (!ctx->is_enc &&V4L2_TYPE_IS_OUTPUT (q->type)) ctx->first_source_change_sent = false;
Signature · 7 lines
2.22.0 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v3 2/4] media: vicodec: use v4l2-mem2mem draining, stopped and next-buf-is-last states handling
Quoted 30 lines · Neil Armstrong
Use the previously introduced v4l2-mem2mem core APIs to handle the drainig, stopped and next-buf-is-last states.
With these changes, the v4l2-compliance still passes with the following commands :
# v4l2-ctl --stream-mmap --stream-out-mmap --stream-to-hdr out.comp --stream-from in.yuvQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
<><><><><><><><><><><><><><><><>< 15.53 fps
15.53 fps
Quoted 1 line
<><><><><><><><><><><><>< 13.99 fps
13.99 fps
Quoted 1 line
<><><><><><><><><><><>< 13.52 fps
13.52 fps
Quoted 1 line
<><><><><><><><><><><><>< 13.41 fps
13.41 fps
Quoted 1 line
<><><><><><><><><><><><>< 13.21 fps
13.21 fps
Quoted 1 line
<><><><><><><><><><><>< 13.09 fps
13.09 fps
Quoted 1 line
<><><><><><><
STOP ENCODER
<<<
EOS EVENT# v4l2-compliance --stream-from in.yuv -s v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bits [...] Total for vicodec device /dev/video0: 50, Succeeded: 50, Failed: 0, Warnings: 0The full output is available at [1]
Quoted 8 lines
# v4l2-compliance -d1 --stream-from-hdr out.comp -s v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bits [...] Total for vicodec device /dev/video1: 50, Succeeded: 50, Failed: 0, Warnings: 0The full output is available at [2]
No functional changes should be noticed.
Ah, unfortunately there *are* functional changes.
There is a (much) more extensive test that is done in the test-media script.
In v4l-utils, go to contrib/test. Now run (as root): test-media vicodec
This test now fails on some tests for the stateful decoder:
Streaming ioctls:
test read/write: OK (Not Supported)
test blocking wait: OK
fail: v4l2-test-buffers.cpp(943): ret == 0
fail: v4l2-test-buffers.cpp(1353): captureBufs(node, node_m2m_cap, q, m2m_q, frame_count, pollmode, capture_count)
test MMAP (select): FAIL
fail: v4l2-test-buffers.cpp(951): ret == 0
fail: v4l2-test-buffers.cpp(1353): captureBufs(node, node_m2m_cap, q, m2m_q, frame_count, pollmode, capture_count)
test MMAP (epoll): FAIL
fail: v4l2-test-buffers.cpp(943): ret == 0
fail: v4l2-test-buffers.cpp(1607): captureBufs(node, node_m2m_cap, q, m2m_q, frame_count, pollmode, capture_count)
test USERPTR (select): FAIL
fail: v4l2-test-buffers.cpp(943): ret == 0
fail: v4l2-test-buffers.cpp(1761): captureBufs(node, node_m2m_cap, q, m2m_q, frame_count, pollmode, capture_count)
test DMABUF (select): FAIL
I also see this:
cmp: EOF on /tmp/tmp.7KAXKAIkVZ/raw.yu12.1280.24 after byte 23500800, in line 1
which shouldn't be there either.
I can recommend the test-media script: it can test all the virtual drivers and it is part of the daily build to check for regressions.
Regards,
Hans
Re: [PATCH v3 2/4] media: vicodec: use v4l2-mem2mem draining, stopped and next-buf-is-last states handling
Quoted 64 lines · Hans Verkuil
Quoted 30 lines · Neil Armstrong
Use the previously introduced v4l2-mem2mem core APIs to handle the drainig, stopped and next-buf-is-last states.
With these changes, the v4l2-compliance still passes with the following commands :
# v4l2-ctl --stream-mmap --stream-out-mmap --stream-to-hdr out.comp --stream-from in.yuvQuoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
<><><><><><><><><><><><><><><><>< 15.53 fps
15.53 fps
Quoted 1 line
<><><><><><><><><><><><>< 13.99 fps
13.99 fps
Quoted 1 line
<><><><><><><><><><><>< 13.52 fps
13.52 fps
Quoted 1 line
<><><><><><><><><><><><>< 13.41 fps
13.41 fps
Quoted 1 line
<><><><><><><><><><><><>< 13.21 fps
13.21 fps
Quoted 1 line
<><><><><><><><><><><>< 13.09 fps
13.09 fps
Quoted 1 line
<><><><><><><
STOP ENCODER
<<<
EOS EVENT# v4l2-compliance --stream-from in.yuv -s v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bits [...] Total for vicodec device /dev/video0: 50, Succeeded: 50, Failed: 0, Warnings: 0The full output is available at [1]
Quoted 8 lines
# v4l2-compliance -d1 --stream-from-hdr out.comp -s v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bits [...] Total for vicodec device /dev/video1: 50, Succeeded: 50, Failed: 0, Warnings: 0The full output is available at [2]
No functional changes should be noticed.
Ah, unfortunately there *are* functional changes.
There is a (much) more extensive test that is done in the test-media script.
In v4l-utils, go to contrib/test. Now run (as root): test-media vicodec
This test now fails on some tests for the stateful decoder:
Streaming ioctls:
test read/write: OK (Not Supported)
test blocking wait: OK
fail: v4l2-test-buffers.cpp(943): ret == 0
fail: v4l2-test-buffers.cpp(1353):captureBufs(node, node_m2m_cap, q, m2m_q, frame_count, pollmode, capture_count)
test MMAP (select): FAIL
fail: v4l2-test-buffers.cpp(951): ret == 0
fail: v4l2-test-buffers.cpp(1353):captureBufs(node, node_m2m_cap, q, m2m_q, frame_count, pollmode, capture_count)
test MMAP (epoll): FAIL
fail: v4l2-test-buffers.cpp(943): ret == 0
fail: v4l2-test-buffers.cpp(1607):captureBufs(node, node_m2m_cap, q, m2m_q, frame_count, pollmode, capture_count)
test USERPTR (select): FAIL
fail: v4l2-test-buffers.cpp(943): ret == 0
fail: v4l2-test-buffers.cpp(1761):captureBufs(node, node_m2m_cap, q, m2m_q, frame_count, pollmode, capture_count)
test DMABUF (select): FAIL
Quoted 8 lines
I also see this:
cmp: EOF on
/tmp/tmp.7KAXKAIkVZ/raw.yu12.1280.24after byte 23500800, in line 1which shouldn't be there either.
I can recommend the test-media script: it can test all the virtual drivers and it is part of the daily build to check for regressions.
Thx for the pointer, I'll analyze the failures.
Quoted 5 lines
Regards,
Hans
PATCH v3 3/4 media: meson: vdec: bring up to compliance
In reply to Neil ArmstrongFrom: Maxime Jourdan <[email protected]>
Add all the necessary bits to pass v4l2-compliance in stateful decoding mode.
Mostly includes tracking the state of the decoder, allowing the OUTPUT queue to stream while the CAPTURE queue is inactive, handling resolution change events, draining with V4L2_DEC_CMD_STOP, copying more metadata from the src buffers to the dst buffers, etc.
--- drivers/staging/media/meson/vdec/esparser.c | 58 +++++------- drivers/staging/media/meson/vdec/vdec.c | 92 ++++++++++++------- drivers/staging/media/meson/vdec/vdec.h | 14 ++- .../staging/media/meson/vdec/vdec_helpers.c | 85 ++++++++--------- .../staging/media/meson/vdec/vdec_helpers.h | 6 +- .../staging/media/meson/vdec/vdec_platform.c | 10 ++ 6 files changed, 148 insertions(+), 117 deletions(-)
drivers/staging/media/meson/vdec/esparser.c +24 -34
@@ -79,22 +79,28 @@ static irqreturn_t esparser_isr(int irq, void *dev)* Also append a start code 000001ff at the end to trigger * the ESPARSER interrupt. */ -static u32 esparser_pad_start_code (struct vb2_buffer *vb) +static u32 esparser_pad_start_code (struct amvdec_core *core,struct vb2_buffer *vb) {u32 payload_size =vb2_get_plane_payload (vb,0 );u32 pad_size =0 ; -u8 *vaddr =vb2_plane_vaddr (vb,0 ) + payload_size; +u8 *vaddr =vb2_plane_vaddr (vb,0 );if (payload_size <ESPARSER_MIN_PACKET_SIZE ) { pad_size =ESPARSER_MIN_PACKET_SIZE - payload_size; -memset (vaddr,0 , pad_size); +memset (vaddr + payload_size,0 , pad_size); } -memset (vaddr + pad_size,0 ,SEARCH_PATTERN_LEN ); - vaddr[pad_size] =0x00 ; - vaddr[pad_size +1 ] =0x00 ; - vaddr[pad_size +2 ] =0x01 ; - vaddr[pad_size +3 ] =0xff ; +if ((payload_size + pad_size +SEARCH_PATTERN_LEN ) > +vb2_plane_size (vb,0 )) { +dev_warn (core->dev,"%s: unable to pad start code\n" , __func__); +return pad_size; + } + +memset (vaddr + payload_size + pad_size,0 ,SEARCH_PATTERN_LEN ); + vaddr[payload_size + pad_size] =0x00 ; + vaddr[payload_size + pad_size +1 ] =0x00 ; + vaddr[payload_size + pad_size +2 ] =0x01 ; + vaddr[payload_size + pad_size +3 ] =0xff ;return pad_size; }
@@ -180,31 +186,27 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf)int ret;struct vb2_buffer *vb = &vbuf->vb2_buf;struct amvdec_core *core = sess->core; -struct amvdec_codec_ops *codec_ops = sess->fmt_out->codec_ops; -u32 num_dst_bufs =0 ;u32 payload_size =vb2_get_plane_payload (vb,0 );dma_addr_t phy =vb2_dma_contig_plane_dma_addr (vb,0 );u32 offset;u32 pad_size; -if (codec_ops->num_pending_bufs) - num_dst_bufs = codec_ops->num_pending_bufs (sess); - - num_dst_bufs +=v4l2_m2m_num_dst_bufs_ready (sess->m2m_ctx); - -if (esparser_vififo_get_free_space (sess) < payload_size || -atomic_read (&sess->esparser_queued_bufs) >= num_dst_bufs) +if (esparser_vififo_get_free_space (sess) < payload_size)return -EAGAIN ;v4l2_m2m_src_buf_remove_by_buf (sess->m2m_ctx, vbuf); offset =esparser_get_offset (sess); -amvdec_add_ts_reorder (sess, vb->timestamp, offset); -dev_dbg (core->dev,"esparser: ts = %llu pld_size = %u offset = %08X\n" , - vb->timestamp, payload_size, offset); +amvdec_add_ts (sess, vb->timestamp, vbuf->timecode, offset, vbuf->flags); +dev_dbg (core->dev,"esparser: ts = %llu pld_size = %u offset = %08X flags = %08X\n" , + vb->timestamp, payload_size, offset, vbuf->flags); + + vbuf->flags =0 ; + vbuf->field =V4L2_FIELD_NONE ; + vbuf->sequence = sess->sequence_out++; - pad_size =esparser_pad_start_code (vb); + pad_size =esparser_pad_start_code (core, vb); ret =esparser_write_data (core, phy, payload_size + pad_size);if (ret <=0 ) {
@@ -216,19 +218,7 @@ esparser_queue(struct amvdec_session *sess, struct vb2_v4l2_buffer *vbuf)return 0 ; } -/* We need to wait until we parse the first keyframe. -* All buffers prior to the first keyframe must be dropped. -*/ -if (!sess->keyframe_found) -usleep_range (1000 ,2000 ); - -if (sess->keyframe_found) -atomic_inc (&sess->esparser_queued_bufs); -else -amvdec_remove_ts (sess, vb->timestamp); - - vbuf->flags =0 ; - vbuf->field =V4L2_FIELD_NONE ; +atomic_inc (&sess->esparser_queued_bufs);v4l2_m2m_buf_done (vbuf,VB2_BUF_STATE_DONE );return 0 ;
drivers/staging/media/meson/vdec/vdec.c +58 -34
235 lines not on this page · raw message
drivers/staging/media/meson/vdec/vdec.h +12 -2
@@ -29,13 +29,19 @@ struct amvdec_buffer {* struct amvdec_timestamp - stores a src timestamp along with a VIFIFO offset * * @list: used to make lists out of this struct -* @ts: timestamp +* @tc: timecode from the v4l2 buffer +* @ts: timestamp from the VB2 buffer * @offset: offset in the VIFIFO where the associated packet was written +* @flags: flags from the v4l2 buffer +* @used_count: times this timestamp was checked for a match with a dst buffer */ struct amvdec_timestamp {struct list_head list; +struct v4l2_timecode tc;u64 ts;u32 offset; +u32 flags; +u32 used_count; };struct amvdec_session ;
@@ -165,6 +171,7 @@ struct amvdec_format {enum amvdec_status {STATUS_STOPPED , +STATUS_INIT ,STATUS_RUNNING ,STATUS_NEEDS_RESUME , };
@@ -180,6 +187,7 @@ enum amvdec_status {* @ctrl_min_buf_capture: V4L2 control V4L2_CID_MIN_BUFFERS_FOR_CAPTURE * @fmt_out: vdec pixel format for the OUTPUT queue * @pixfmt_cap: V4L2 pixel format for the CAPTURE queue +* @src_buffer_size: size in bytes of the OUTPUT buffers' only plane * @width: current picture width * @height: current picture height * @colorspace: current colorspace
@@ -221,6 +229,7 @@ struct amvdec_session {const struct amvdec_format *fmt_out;u32 pixfmt_cap; +u32 src_buffer_size;u32 width;u32 height;
@@ -235,10 +244,11 @@ struct amvdec_session {struct work_struct esparser_queue_work;unsigned int streamon_cap, streamon_out; -unsigned int sequence_cap; +unsigned int sequence_cap, sequence_out;unsigned int should_stop;unsigned int keyframe_found;unsigned int num_dst_bufs; +unsigned int changed_format;u8 canvas_alloc[MAX_CANVAS ];u32 canvas_num;
drivers/staging/media/meson/vdec/vdec_helpers.c +40 -45
179 lines not on this page · raw message
drivers/staging/media/meson/vdec/vdec_helpers.h +4 -2
@@ -44,13 +44,15 @@ void amvdec_dst_buf_done_offset(struct amvdec_session *sess, u32 offset, u32 field, bool allow_drop);/** -* amvdec_add_ts_reorder() - Add a timestamp to the list in chronological order +* amvdec_add_ts() - Add a timestamp to the list * * @sess: current session * @ts: timestamp to add * @offset: offset in the VIFIFO where the associated packet was written +* @flags the vb2_v4l2_buffer flags */ -void amvdec_add_ts_reorder (struct amvdec_session *sess,u64 ts,u32 offset); +void amvdec_add_ts (struct amvdec_session *sess,u64 ts, +struct v4l2_timecode tc,u32 offset,u32 flags);void amvdec_remove_ts (struct amvdec_session *sess,u64 ts);/**
drivers/staging/media/meson/vdec/vdec_platform.c +10 -0
@@ -21,6 +21,7 @@ static const struct amvdec_format vdec_formats_gxbb[] = { .codec_ops = &codec_mpeg12_ops, .firmware_path = "meson/vdec/gxl_mpeg12.bin", .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, + .flags = V4L2_FMT_FLAG_COMPRESSED, }, { .pixfmt =V4L2_PIX_FMT_MPEG2 , .min_buffers = 8,
@@ -31,6 +32,7 @@ static const struct amvdec_format vdec_formats_gxbb[] = { .codec_ops = &codec_mpeg12_ops, .firmware_path = "meson/vdec/gxl_mpeg12.bin", .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, + .flags = V4L2_FMT_FLAG_COMPRESSED, }, };
@@ -45,6 +47,7 @@ static const struct amvdec_format vdec_formats_gxl[] = { .codec_ops = &codec_mpeg12_ops, .firmware_path = "meson/vdec/gxl_mpeg12.bin", .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, + .flags = V4L2_FMT_FLAG_COMPRESSED, }, { .pixfmt =V4L2_PIX_FMT_MPEG2 , .min_buffers = 8,
@@ -55,6 +58,7 @@ static const struct amvdec_format vdec_formats_gxl[] = { .codec_ops = &codec_mpeg12_ops, .firmware_path = "meson/vdec/gxl_mpeg12.bin", .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, + .flags = V4L2_FMT_FLAG_COMPRESSED, }, };
@@ -69,6 +73,7 @@ static const struct amvdec_format vdec_formats_gxm[] = { .codec_ops = &codec_mpeg12_ops, .firmware_path = "meson/vdec/gxl_mpeg12.bin", .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, + .flags = V4L2_FMT_FLAG_COMPRESSED, }, { .pixfmt =V4L2_PIX_FMT_MPEG2 , .min_buffers = 8,
@@ -79,6 +84,7 @@ static const struct amvdec_format vdec_formats_gxm[] = { .codec_ops = &codec_mpeg12_ops, .firmware_path = "meson/vdec/gxl_mpeg12.bin", .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, + .flags = V4L2_FMT_FLAG_COMPRESSED, }, };
@@ -93,6 +99,7 @@ static const struct amvdec_format vdec_formats_g12a[] = { .codec_ops = &codec_mpeg12_ops, .firmware_path = "meson/vdec/gxl_mpeg12.bin", .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, + .flags = V4L2_FMT_FLAG_COMPRESSED, }, { .pixfmt =V4L2_PIX_FMT_MPEG2 , .min_buffers = 8,
@@ -103,6 +110,7 @@ static const struct amvdec_format vdec_formats_g12a[] = { .codec_ops = &codec_mpeg12_ops, .firmware_path = "meson/vdec/gxl_mpeg12.bin", .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, + .flags = V4L2_FMT_FLAG_COMPRESSED, }, };
@@ -117,6 +125,7 @@ static const struct amvdec_format vdec_formats_sm1[] = { .codec_ops = &codec_mpeg12_ops, .firmware_path = "meson/vdec/gxl_mpeg12.bin", .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, + .flags = V4L2_FMT_FLAG_COMPRESSED, }, { .pixfmt =V4L2_PIX_FMT_MPEG2 , .min_buffers = 8,
@@ -127,6 +136,7 @@ static const struct amvdec_format vdec_formats_sm1[] = { .codec_ops = &codec_mpeg12_ops, .firmware_path = "meson/vdec/gxl_mpeg12.bin", .pixfmts_cap = { V4L2_PIX_FMT_NV12M, V4L2_PIX_FMT_YUV420M, 0 }, + .flags = V4L2_FMT_FLAG_COMPRESSED, }, };
Signature · 1 line
2.22.0
PATCH v3 4/4 media: meson: vdec: add H.264 decoding support
In reply to Neil ArmstrongFrom: Maxime Jourdan <[email protected]>
Add support for the H264 compressed format (V4L2_PIX_FMT_H264).
--- drivers/staging/media/meson/vdec/Makefile | 2 +- drivers/staging/media/meson/vdec/codec_h264.c | 482 ++++++++++++++++++ drivers/staging/media/meson/vdec/codec_h264.h | 14 + .../staging/media/meson/vdec/vdec_platform.c | 61 +++ 4 files changed, 558 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/media/meson/vdec/codec_h264.c create mode 100644 drivers/staging/media/meson/vdec/codec_h264.h
drivers/staging/media/meson/vdec/Makefile +1 -1
@@ -3,6 +3,6 @@ meson-vdec-objs = esparser.o vdec.o vdec_helpers.o vdec_platform.o meson-vdec-objs += vdec_1.o -meson-vdec-objs += codec_mpeg12.o +meson-vdec-objs += codec_mpeg12.o codec_h264.o obj-$(CONFIG_VIDEO_MESON_VDEC) += meson-vdec.o
drivers/staging/media/meson/vdec/codec_h264.c new file +482 -0
482 lines not on this page · raw message
drivers/staging/media/meson/vdec/codec_h264.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (C) 2019 BayLibre, SAS +* Author: Maxime Jourdan <[email protected]> +*/ + +#ifndef __MESON_VDEC_CODEC_H264_H_ +#define __MESON_VDEC_CODEC_H264_H_ + +#include "vdec.h" + +extern struct amvdec_codec_ops codec_h264_ops; + +#endif
drivers/staging/media/meson/vdec/vdec_platform.c +61 -0
94 lines not on this page · raw message
Signature · 1 line
2.22.0
Hi,
Quoted 4 lines · Neil Armstrong
Hello,
This patch series aims to bring H.264 support as well as compliance update to the amlogic stateful video decoder driver.
I have started testing this patchset on S905X. I'm not very far into it yet, but noticed this spam in the kernel logs:
[ 192.230935] meson-vdec c8820000.video-codec: VIFIFO usage (16777858) > VIFIFO size (16777216)
So far it seems to be printed once per frame while decoding bbb_sunflower_1080p_30fps_normal.mp4 from blender fondation. I'm don't think I have ever seen that one before.
Quoted 172 lines
The issue in the V1 patchset at [1] is solved by patch #1 following comments and requirements from hans. It moves the full draining & stopped state tracking and handling from vicodec to core v4l2-mem2mem.
With this, it passes v4l2-compliance with streaming on Amlogic G12A and Amlogic SM1 SoCs successfully.
This patchset depends on G12A and SM1 enablement series at [2] and [3].
The compliance log is:
# v4l2-compliance --stream-from-hdr test-25fps.h264.hdr -s v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bitsCompliance test for vicodec device
/dev/video0:Driver Info:
Driver name : vicodec Card type : vicodec Bus info : platform:vicodec Driver version : 5.5.0 Capabilities : 0x84208000Video Memory-to-Memory
Streaming
Extended Pix Format
Device Capabilities
Device Caps :0x04208000
Video Memory-to-Memory
Streaming
Extended Pix Format
Detected Stateful Encoder
Media Driver Info:Driver name : vicodec Model : vicodec Serial : Bus info : platform:vicodec Media version : 5.5.0 Hardware revision: 0x00000000 (0) Driver version : 5.5.0 Interface Info: ID : 0x0300000c Type : V4L Video Entity Info: ID : 0x00000001 (1) Name : stateful-encoder-source Function : V4L2 I/O Pad 0x01000002 : 0: Source Link 0x02000008: to remote pad 0x1000005 of entity 'stateful-encoder-proc': Data, Enabled, ImmutableRequired ioctls:
test MC information (see 'Media Driver Info' above): OK testVIDIOC_QUERYCAP: OKAllow for multiple opens:
test second/dev/video0open: OK
testVIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OKDebug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) testVIDIOC_LOG_STATUS: OK (Not Supported)Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) testVIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) testVIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) testVIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) testVIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported)Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK testVIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 6 Private Controls: 0Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) testVIDIOC_G_FBUF: OK (Not Supported) testVIDIOC_G_FMT: OK
testVIDIOC_TRY_FMT: OK
testVIDIOC_S_FMT: OK
testVIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK
testVIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK testVIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)Test input 0:
Streaming ioctls:
test read/write: OK (Not Supported)
test blocking wait: OK
Video Capture: Captured 60 buffers
test MMAP (select): OK
Video Capture: Captured 60 buffers
test MMAP (epoll): OK
Video Capture: Captured 60 buffers
test USERPTR (select): OK
test DMABUF: Cannot test, specify --expbuf-deviceTotal for vicodec device
/dev/video0: 50, Succeeded: 50, Failed: 0, Warnings: 0Changes since v2 at [4]:
- Move full draining & stopped state tracking into core v4l2-mem2mem
- Adapt vicodec to use the core v4l2-mem2mem draining & stopped state trackingChanges since v1 at [1]:
- fixedoutput_sizeis never used reported by hans
- rebased on G12A and SM1 patches
- added handling of qbuf after STREAMON and STOP before enought buffer queued[1] https://lore.kernel.org/linux-media/[email protected]
[2] https://lore.kernel.org/linux-media/[email protected]
[3] https://lore.kernel.org/linux-media/[email protected]
[4] https://lore.kernel.org/linux-media/[email protected]Maxime Jourdan (2):
media: meson: vdec: bring up to compliance
media: meson: vdec: add H.264 decoding supportNeil Armstrong (2):
media: v4l2-mem2mem: handle draining, stopped and next-buf-is-last
states
media: vicodec: use v4l2-mem2mem draining, stopped and
next-buf-is-last states handlingdrivers/media/platform/vicodec/vicodec-core.c | 154 ++---- drivers/media/v4l2-core/v4l2-mem2mem.c | 174 ++++++- drivers/staging/media/meson/vdec/Makefile | 2 +- drivers/staging/media/meson/vdec/codec_h264.c | 482 ++++++++++++++++++ drivers/staging/media/meson/vdec/codec_h264.h | 14 + drivers/staging/media/meson/vdec/esparser.c | 58 +-- drivers/staging/media/meson/vdec/vdec.c | 92 ++-- drivers/staging/media/meson/vdec/vdec.h | 14 +- .../staging/media/meson/vdec/vdec_helpers.c | 85 ++- .../staging/media/meson/vdec/vdec_helpers.h | 6 +- .../staging/media/meson/vdec/vdec_platform.c | 71 +++ include/media/v4l2-mem2mem.h | 87 ++++ 12 files changed, 1009 insertions(+), 230 deletions(-) create mode 100644 drivers/staging/media/meson/vdec/codec_h264.c create mode 100644 drivers/staging/media/meson/vdec/codec_h264.h
Hi,
Quoted 8 lines · Nicolas Dufresne
Hi,
Quoted 4 lines · Neil Armstrong
Hello,
This patch series aims to bring H.264 support as well as compliance update to the amlogic stateful video decoder driver.
Quoted 8 lines
I have started testing this patchset on S905X. I'm not very far into it yet, but noticed this spam in the kernel logs:
[ 192.230935] meson-vdec c8820000.video-codec: VIFIFO usage (16777858) > VIFIFO size (16777216)So far it seems to be printed once per frame while decoding bbb_sunflower_1080p_30fps_normal.mp4 from blender fondation. I'm don't think I have ever seen that one before.
Will check.
Neil
Quoted 174 lines
Quoted 173 lines
The issue in the V1 patchset at [1] is solved by patch #1 following comments and requirements from hans. It moves the full draining & stopped state tracking and handling from vicodec to core v4l2-mem2mem.
With this, it passes v4l2-compliance with streaming on Amlogic G12A and Amlogic SM1 SoCs successfully.
This patchset depends on G12A and SM1 enablement series at [2] and [3].
The compliance log is:
# v4l2-compliance --stream-from-hdr test-25fps.h264.hdr -s v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bitsCompliance test for vicodec device
/dev/video0:Driver Info:
Driver name : vicodec Card type : vicodec Bus info : platform:vicodec Driver version : 5.5.0 Capabilities : 0x84208000Video Memory-to-Memory
Streaming
Extended Pix Format
Device Capabilities
Device Caps :0x04208000
Video Memory-to-Memory
Streaming
Extended Pix Format
Detected Stateful Encoder
Media Driver Info:Driver name : vicodec Model : vicodec Serial : Bus info : platform:vicodec Media version : 5.5.0 Hardware revision: 0x00000000 (0) Driver version : 5.5.0 Interface Info: ID : 0x0300000c Type : V4L Video Entity Info: ID : 0x00000001 (1) Name : stateful-encoder-source Function : V4L2 I/O Pad 0x01000002 : 0: Source Link 0x02000008: to remote pad 0x1000005 of entity 'stateful-encoder-proc': Data, Enabled, ImmutableRequired ioctls:
test MC information (see 'Media Driver Info' above): OK testVIDIOC_QUERYCAP: OKAllow for multiple opens:
test second/dev/video0open: OK
testVIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OKDebug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) testVIDIOC_LOG_STATUS: OK (Not Supported)Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) testVIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) testVIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) testVIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) testVIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported)Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK testVIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 6 Private Controls: 0Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) testVIDIOC_G_FBUF: OK (Not Supported) testVIDIOC_G_FMT: OK
testVIDIOC_TRY_FMT: OK
testVIDIOC_S_FMT: OK
testVIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK
testVIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK testVIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)Test input 0:
Streaming ioctls:
test read/write: OK (Not Supported)
test blocking wait: OK
Video Capture: Captured 60 buffers
test MMAP (select): OK
Video Capture: Captured 60 buffers
test MMAP (epoll): OK
Video Capture: Captured 60 buffers
test USERPTR (select): OK
test DMABUF: Cannot test, specify --expbuf-deviceTotal for vicodec device
/dev/video0: 50, Succeeded: 50, Failed: 0, Warnings: 0Changes since v2 at [4]:
- Move full draining & stopped state tracking into core v4l2-mem2mem
- Adapt vicodec to use the core v4l2-mem2mem draining & stopped state trackingChanges since v1 at [1]:
- fixedoutput_sizeis never used reported by hans
- rebased on G12A and SM1 patches
- added handling of qbuf after STREAMON and STOP before enought buffer queued[1] https://lore.kernel.org/linux-media/[email protected]
[2] https://lore.kernel.org/linux-media/[email protected]
[3] https://lore.kernel.org/linux-media/[email protected]
[4] https://lore.kernel.org/linux-media/[email protected]Maxime Jourdan (2):
media: meson: vdec: bring up to compliance
media: meson: vdec: add H.264 decoding supportNeil Armstrong (2):
media: v4l2-mem2mem: handle draining, stopped and next-buf-is-last
states
media: vicodec: use v4l2-mem2mem draining, stopped and
next-buf-is-last states handlingdrivers/media/platform/vicodec/vicodec-core.c | 154 ++---- drivers/media/v4l2-core/v4l2-mem2mem.c | 174 ++++++- drivers/staging/media/meson/vdec/Makefile | 2 +- drivers/staging/media/meson/vdec/codec_h264.c | 482 ++++++++++++++++++ drivers/staging/media/meson/vdec/codec_h264.h | 14 + drivers/staging/media/meson/vdec/esparser.c | 58 +-- drivers/staging/media/meson/vdec/vdec.c | 92 ++-- drivers/staging/media/meson/vdec/vdec.h | 14 +- .../staging/media/meson/vdec/vdec_helpers.c | 85 ++- .../staging/media/meson/vdec/vdec_helpers.h | 6 +- .../staging/media/meson/vdec/vdec_platform.c | 71 +++ include/media/v4l2-mem2mem.h | 87 ++++ 12 files changed, 1009 insertions(+), 230 deletions(-) create mode 100644 drivers/staging/media/meson/vdec/codec_h264.c create mode 100644 drivers/staging/media/meson/vdec/codec_h264.h
Quoted 160 lines · Neil Armstrong
Hello,
This patch series aims to bring H.264 support as well as compliance update to the amlogic stateful video decoder driver.
The issue in the V1 patchset at [1] is solved by patch #1 following comments and requirements from hans. It moves the full draining & stopped state tracking and handling from vicodec to core v4l2-mem2mem.
With this, it passes v4l2-compliance with streaming on Amlogic G12A and Amlogic SM1 SoCs successfully.
This patchset depends on G12A and SM1 enablement series at [2] and [3].
The compliance log is:
# v4l2-compliance --stream-from-hdr test-25fps.h264.hdr -s v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bitsCompliance test for vicodec device
/dev/video0:Driver Info:
Driver name : vicodec Card type : vicodec Bus info : platform:vicodec Driver version : 5.5.0 Capabilities : 0x84208000Video Memory-to-Memory
Streaming
Extended Pix Format
Device Capabilities
Device Caps :0x04208000
Video Memory-to-Memory
Streaming
Extended Pix Format
Detected Stateful Encoder
Media Driver Info:Driver name : vicodec Model : vicodec Serial : Bus info : platform:vicodec Media version : 5.5.0 Hardware revision: 0x00000000 (0) Driver version : 5.5.0 Interface Info: ID : 0x0300000c Type : V4L Video Entity Info: ID : 0x00000001 (1) Name : stateful-encoder-source Function : V4L2 I/O Pad 0x01000002 : 0: Source Link 0x02000008: to remote pad 0x1000005 of entity 'stateful-encoder-proc': Data, Enabled, ImmutableRequired ioctls:
test MC information (see 'Media Driver Info' above): OK testVIDIOC_QUERYCAP: OKAllow for multiple opens:
test second/dev/video0open: OK
testVIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OKDebug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported) testVIDIOC_LOG_STATUS: OK (Not Supported)Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) testVIDIOC_S_HW_FREQ_SEEK: OK (Not Supported) testVIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported) test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported) test VIDIOC_G/S_FREQUENCY: OK (Not Supported) testVIDIOC_ENUMAUDOUT: OK (Not Supported) test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported) test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported) test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported) testVIDIOC_DV_TIMINGS_CAP: OK (Not Supported) test VIDIOC_G/S_EDID: OK (Not Supported)Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK testVIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) Standard Controls: 6 Private Controls: 0Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK test VIDIOC_G/S_PARM: OK (Not Supported) testVIDIOC_G_FBUF: OK (Not Supported) testVIDIOC_G_FMT: OK
testVIDIOC_TRY_FMT: OK
testVIDIOC_S_FMT: OK
testVIDIOC_G_SLICED_VBI_CAP: OK (Not Supported) test Cropping: OK
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK
testVIDIOC_G_ENC_INDEX: OK (Not Supported) test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK testVIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)Test input 0:
Streaming ioctls:
test read/write: OK (Not Supported)
test blocking wait: OK
Video Capture: Captured 60 buffers
test MMAP (select): OK
Video Capture: Captured 60 buffers
test MMAP (epoll): OK
Video Capture: Captured 60 buffers
test USERPTR (select): OK
test DMABUF: Cannot test, specify --expbuf-deviceTotal for vicodec device
/dev/video0: 50, Succeeded: 50, Failed: 0, Warnings: 0Changes since v2 at [4]:
- Move full draining & stopped state tracking into core v4l2-mem2mem
- Adapt vicodec to use the core v4l2-mem2mem draining & stopped state trackingChanges since v1 at [1]:
- fixedoutput_sizeis never used reported by hans
- rebased on G12A and SM1 patches
- added handling of qbuf after STREAMON and STOP before enought buffer queued[1] https://lore.kernel.org/linux-media/[email protected]
[2] https://lore.kernel.org/linux-media/[email protected]
[3] https://lore.kernel.org/linux-media/[email protected]
[4] https://lore.kernel.org/linux-media/[email protected]Maxime Jourdan (2):
media: meson: vdec: bring up to compliance
media: meson: vdec: add H.264 decoding supportNeil Armstrong (2):
media: v4l2-mem2mem: handle draining, stopped and next-buf-is-last
states
media: vicodec: use v4l2-mem2mem draining, stopped and
next-buf-is-last states handling
Quoted 16 lines
drivers/media/platform/vicodec/vicodec-core.c | 154 ++---- drivers/media/v4l2-core/v4l2-mem2mem.c | 174 ++++++- drivers/staging/media/meson/vdec/Makefile | 2 +- drivers/staging/media/meson/vdec/codec_h264.c | 482 ++++++++++++++++++ drivers/staging/media/meson/vdec/codec_h264.h | 14 + drivers/staging/media/meson/vdec/esparser.c | 58 +-- drivers/staging/media/meson/vdec/vdec.c | 92 ++-- drivers/staging/media/meson/vdec/vdec.h | 14 +- .../staging/media/meson/vdec/vdec_helpers.c | 85 ++- .../staging/media/meson/vdec/vdec_helpers.h | 6 +- .../staging/media/meson/vdec/vdec_platform.c | 71 +++ include/media/v4l2-mem2mem.h | 87 ++++ 12 files changed, 1009 insertions(+), 230 deletions(-) create mode 100644 drivers/staging/media/meson/vdec/codec_h264.c create mode 100644 drivers/staging/media/meson/vdec/codec_h264.h
And it breaks VP9 compliance, will need to re-spin...
Neil