media: v4l2-mem2mem: Rename v4l2_m2m_buf_copy_data to v4l2_m2m_buf_copy_metadata
PATCH 1/1 media: v4l2-mem2mem: Rename v4l2_m2m_buf_copy_data to v4l2_m2m_buf_copy_metadata
The v4l2_m2m_buf_copy_data helper is used to copy the buffer metadata, such as its timestamp and its flags.
Therefore, the v4l2_m2m_buf_copy_metadata name is more clear and avoids confusion with a payload data copy.
Signed-off-by Ezequiel Garcia <[email protected]>
--- drivers/media/platform/vicodec/vicodec-core.c | 4 ++-- drivers/media/platform/vim2m.c | 2 +- drivers/media/v4l2-core/v4l2-mem2mem.c | 8 ++++---- include/media/v4l2-mem2mem.h | 14 +++++++------- 4 files changed, 14 insertions(+), 14 deletions(-)
drivers/media/platform/vicodec/vicodec-core.c +2 -2
@@ -199,7 +199,7 @@ static int device_process(struct vicodec_ctx *ctx, dst_vb->sequence = q_dst->sequence++; dst_vb->flags &= ~V4L2_BUF_FLAG_LAST ; -v4l2_m2m_buf_copy_data (src_vb, dst_vb, !ctx->is_enc); +v4l2_m2m_buf_copy_metadata (src_vb, dst_vb, !ctx->is_enc);return 0 ; }
@@ -414,7 +414,7 @@ static void set_last_buffer(struct vb2_v4l2_buffer *dst_buf,vb2_set_plane_payload (&dst_buf->vb2_buf,0 ,0 ); dst_buf->sequence = q_dst->sequence++; -v4l2_m2m_buf_copy_data (src_buf, dst_buf, !ctx->is_enc); +v4l2_m2m_buf_copy_metadata (src_buf, dst_buf, !ctx->is_enc); dst_buf->flags |=V4L2_BUF_FLAG_LAST ;v4l2_m2m_buf_done (dst_buf,VB2_BUF_STATE_DONE ); }
drivers/media/platform/vim2m.c +1 -1
@@ -432,7 +432,7 @@ static int device_process(struct vim2m_ctx *ctx, out_vb->sequence =get_q_data (ctx,V4L2_BUF_TYPE_VIDEO_CAPTURE )->sequence++; in_vb->sequence = q_data_in->sequence++; -v4l2_m2m_buf_copy_data (in_vb, out_vb, true); +v4l2_m2m_buf_copy_metadata (in_vb, out_vb, true);if (ctx->mode &MEM2MEM_VFLIP ) { start = height -1 ;
drivers/media/v4l2-core/v4l2-mem2mem.c +4 -4
@@ -975,9 +975,9 @@ void v4l2_m2m_buf_queue(struct v4l2_m2m_ctx *m2m_ctx, }EXPORT_SYMBOL_GPL (v4l2_m2m_buf_queue); -void v4l2_m2m_buf_copy_data (const struct vb2_v4l2_buffer *out_vb, -struct vb2_v4l2_buffer *cap_vb, -bool copy_frame_flags) +void v4l2_m2m_buf_copy_metadata (const struct vb2_v4l2_buffer *out_vb, +struct vb2_v4l2_buffer *cap_vb, +bool copy_frame_flags) {u32 mask =V4L2_BUF_FLAG_TIMECODE |V4L2_BUF_FLAG_TSTAMP_SRC_MASK ;
@@ -993,7 +993,7 @@ void v4l2_m2m_buf_copy_data(const struct vb2_v4l2_buffer *out_vb, cap_vb->flags &= ~mask; cap_vb->flags |= out_vb->flags & mask; } -EXPORT_SYMBOL_GPL (v4l2_m2m_buf_copy_data); +EXPORT_SYMBOL_GPL (v4l2_m2m_buf_copy_metadata);void v4l2_m2m_request_queue (struct media_request *req) {
include/media/v4l2-mem2mem.h +7 -7
@@ -623,11 +623,11 @@ v4l2_m2m_dst_buf_remove_by_idx(struct v4l2_m2m_ctx *m2m_ctx, unsigned int idx) }/** -* v4l2_m2m_buf_copy_data() - copy buffer data from the output buffer to the -* capture buffer +* v4l2_m2m_buf_copy_metadata() - copy buffer metadata from +* the output buffer to the capture buffer * -* @out_vb: the output buffer that is the source of the data. -* @cap_vb: the capture buffer that will receive the data. +* @out_vb: the output buffer that is the source of the metadata. +* @cap_vb: the capture buffer that will receive the metadata. * @copy_frame_flags: copy the KEY/B/PFRAME flags as well. * * This helper function copies the timestamp, timecode (if the TIMECODE
@@ -638,9 +638,9 @@ v4l2_m2m_dst_buf_remove_by_idx(struct v4l2_m2m_ctx *m2m_ctx, unsigned int idx)* flags are not copied. This is typically needed for encoders that * set this bits explicitly. */ -void v4l2_m2m_buf_copy_data (const struct vb2_v4l2_buffer *out_vb, -struct vb2_v4l2_buffer *cap_vb, -bool copy_frame_flags); +void v4l2_m2m_buf_copy_metadata (const struct vb2_v4l2_buffer *out_vb, +struct vb2_v4l2_buffer *cap_vb, +bool copy_frame_flags);/* v4l2 request helper */
Signature · 1 line
2.20.1