| Message ID | 20230322094617.19410-6-yunfei.dong@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: mediatek: vcodec: Add debugfs file for decode and encode | expand |
Il 22/03/23 10:46, Yunfei Dong ha scritto: > Adding echo command to get capture and output queue format > type:'echo -format > vdec' > > Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com> > --- > .../mediatek/vcodec/mtk_vcodec_dbgfs.c | 48 +++++++++++++++++++ > .../mediatek/vcodec/mtk_vcodec_dbgfs.h | 1 + > 2 files changed, 49 insertions(+) > > diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > index 19a1dc068efd..1b1b4301a83d 100644 > --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > @@ -10,6 +10,48 @@ > #include "mtk_vcodec_drv.h" > #include "mtk_vcodec_util.h" > > +static void mtk_vdec_dbgfs_get_format_type(struct mtk_vcodec_ctx *ctx, char *buf, > + int *used, int total) > +{ > + int curr_len; > + > + switch (ctx->current_codec) { > + case V4L2_PIX_FMT_H264_SLICE: > + curr_len = snprintf(buf + *used, total - *used, > + "\toutput format: h264 slice\n"); Isn't this the same information that's also given by the VIDIOC_ENUM_FMT ioctl? Check functions v4l_enum_fmt(), v4l_fill_fmtdesc(). Regards, Angelo
Hi AngeloGioacchino Thanks for your suggestion. On Wed, 2023-03-22 at 13:12 +0100, AngeloGioacchino Del Regno wrote: > External email : Please do not click links or open attachments until > you have verified the sender or the content. > > > Il 22/03/23 10:46, Yunfei Dong ha scritto: > > Adding echo command to get capture and output queue format > > type:'echo -format > vdec' > > > > Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com> > > --- > > .../mediatek/vcodec/mtk_vcodec_dbgfs.c | 48 > > +++++++++++++++++++ > > .../mediatek/vcodec/mtk_vcodec_dbgfs.h | 1 + > > 2 files changed, 49 insertions(+) > > > > diff --git > > a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > > b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > > index 19a1dc068efd..1b1b4301a83d 100644 > > --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > > +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c > > @@ -10,6 +10,48 @@ > > #include "mtk_vcodec_drv.h" > > #include "mtk_vcodec_util.h" > > > > +static void mtk_vdec_dbgfs_get_format_type(struct mtk_vcodec_ctx > > *ctx, char *buf, > > + int *used, int total) > > +{ > > + int curr_len; > > + > > + switch (ctx->current_codec) { > > + case V4L2_PIX_FMT_H264_SLICE: > > + curr_len = snprintf(buf + *used, total - *used, > > + "\toutput format: h264 slice\n"); > > Isn't this the same information that's also given by the > VIDIOC_ENUM_FMT ioctl? > > Check functions v4l_enum_fmt(), v4l_fill_fmtdesc(). > This patch used to get output and capture format for each instance. Maybe 2 ~ 49 instance to paly video at the same time. Need to know the format type for each instance. > Regards, > Angelo > Best Regards, Yunfei Dong >
diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c index 19a1dc068efd..1b1b4301a83d 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.c @@ -10,6 +10,48 @@ #include "mtk_vcodec_drv.h" #include "mtk_vcodec_util.h" +static void mtk_vdec_dbgfs_get_format_type(struct mtk_vcodec_ctx *ctx, char *buf, + int *used, int total) +{ + int curr_len; + + switch (ctx->current_codec) { + case V4L2_PIX_FMT_H264_SLICE: + curr_len = snprintf(buf + *used, total - *used, + "\toutput format: h264 slice\n"); + break; + case V4L2_PIX_FMT_VP8_FRAME: + curr_len = snprintf(buf + *used, total - *used, + "\toutput format: vp8 slice\n"); + break; + case V4L2_PIX_FMT_VP9_FRAME: + curr_len = snprintf(buf + *used, total - *used, + "\toutput format: vp9 slice\n"); + break; + default: + curr_len = snprintf(buf + *used, total - *used, + "\tunsupported output format: 0x%x\n", + ctx->current_codec); + } + *used += curr_len; + + switch (ctx->capture_fourcc) { + case V4L2_PIX_FMT_MM21: + curr_len = snprintf(buf + *used, total - *used, + "\tcapture format MM21\n"); + break; + case V4L2_PIX_FMT_MT21C: + curr_len = snprintf(buf + *used, total - *used, + "\tcapture format MT21C\n"); + break; + default: + curr_len = snprintf(buf + *used, total - *used, + "\tunsupported capture format: 0x%x\n", + ctx->capture_fourcc); + } + *used += curr_len; +} + static ssize_t mtk_vdec_dbgfs_write(struct file *filp, const char __user *ubuf, size_t count, loff_t *ppos) { @@ -45,6 +87,9 @@ static ssize_t mtk_vdec_dbgfs_read(struct file *filp, char __user *ubuf, if (strstr(dbgfs->dbgfs_buf, "-picinfo")) dbgfs_index[MTK_VDEC_DBGFS_PICINFO] = true; + if (strstr(dbgfs->dbgfs_buf, "-format")) + dbgfs_index[MTK_VDEC_DBGFS_FORMAT] = true; + mutex_lock(&dbgfs->dbgfs_lock); list_for_each_entry(dbgfs_inst, &dbgfs->dbgfs_head, node) { ctx = dbgfs_inst->vcodec_ctx; @@ -60,6 +105,9 @@ static ssize_t mtk_vdec_dbgfs_read(struct file *filp, char __user *ubuf, ctx->picinfo.buf_w, ctx->picinfo.buf_h); used_len += curr_len; } + + if (dbgfs_index[MTK_VDEC_DBGFS_FORMAT]) + mtk_vdec_dbgfs_get_format_type(ctx, buf, &used_len, total_len); } mutex_unlock(&dbgfs->dbgfs_lock); diff --git a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.h b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.h index de886d79ad01..9e586889717b 100644 --- a/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.h +++ b/drivers/media/platform/mediatek/vcodec/mtk_vcodec_dbgfs.h @@ -15,6 +15,7 @@ struct mtk_vcodec_ctx; */ enum mtk_vdec_dbgfs_log_index { MTK_VDEC_DBGFS_PICINFO, + MTK_VDEC_DBGFS_FORMAT, MTK_VDEC_DBGFS_MAX, };
Adding echo command to get capture and output queue format type:'echo -format > vdec' Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com> --- .../mediatek/vcodec/mtk_vcodec_dbgfs.c | 48 +++++++++++++++++++ .../mediatek/vcodec/mtk_vcodec_dbgfs.h | 1 + 2 files changed, 49 insertions(+)