Commit 05e58c83 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab
Browse files

media: hantro: Simplify macroblock macros 



It seems all codecs are using a 16x16 size macroblock,
and so it's possible to have just one set of macroblock macros.

Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 5adff604

drivers/staging/media/hantro/hantro.h

+3 −15
Original line number Diff line number Diff line
@@ -26,21 +26,9 @@ 


#include "hantro_hw.h"



#define VP8_MB_DIM			16

#define VP8_MB_WIDTH(w)			DIV_ROUND_UP(w, VP8_MB_DIM)

#define VP8_MB_HEIGHT(h)		DIV_ROUND_UP(h, VP8_MB_DIM)



#define H264_MB_DIM			16

#define H264_MB_WIDTH(w)		DIV_ROUND_UP(w, H264_MB_DIM)

#define H264_MB_HEIGHT(h)		DIV_ROUND_UP(h, H264_MB_DIM)



#define MPEG2_MB_DIM			16

#define MPEG2_MB_WIDTH(w)		DIV_ROUND_UP(w, MPEG2_MB_DIM)

#define MPEG2_MB_HEIGHT(h)		DIV_ROUND_UP(h, MPEG2_MB_DIM)



#define JPEG_MB_DIM			16

#define JPEG_MB_WIDTH(w)		DIV_ROUND_UP(w, JPEG_MB_DIM)

#define JPEG_MB_HEIGHT(h)		DIV_ROUND_UP(h, JPEG_MB_DIM)

#define MB_DIM			16

#define MB_WIDTH(w)		DIV_ROUND_UP(w, MB_DIM)

#define MB_HEIGHT(h)		DIV_ROUND_UP(h, MB_DIM)



struct hantro_ctx;

struct hantro_codec_ops;

drivers/staging/media/hantro/hantro_g1_h264_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static void set_buffers(struct hantro_ctx *ctx) 
		size_t mv_offset = round_up(pic_size, 8);



		if (ctrls->slices[0].flags & V4L2_H264_SLICE_FLAG_BOTTOM_FIELD)

			mv_offset += 32 * H264_MB_WIDTH(ctx->dst_fmt.width);

			mv_offset += 32 * MB_WIDTH(ctx->dst_fmt.width);



		vdpu_write_relaxed(vpu, dst_dma + mv_offset,

				   G1_REG_ADDR_DIR_MV);

drivers/staging/media/hantro/hantro_g1_mpeg2_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ void hantro_g1_mpeg2_dec_run(struct hantro_ctx *ctx) 
	      G1_REG_DEC_AXI_WR_ID(0);

	vdpu_write_relaxed(vpu, reg, G1_SWREG(3));



	reg = G1_REG_PIC_MB_WIDTH(MPEG2_MB_WIDTH(ctx->dst_fmt.width)) |

	      G1_REG_PIC_MB_HEIGHT_P(MPEG2_MB_HEIGHT(ctx->dst_fmt.height)) |

	reg = G1_REG_PIC_MB_WIDTH(MB_WIDTH(ctx->dst_fmt.width)) |

	      G1_REG_PIC_MB_HEIGHT_P(MB_HEIGHT(ctx->dst_fmt.height)) |

	      G1_REG_ALT_SCAN_E(picture->alternate_scan) |

	      G1_REG_TOPFIELDFIRST_E(picture->top_field_first);

	vdpu_write_relaxed(vpu, reg, G1_SWREG(4));

drivers/staging/media/hantro/hantro_g1_vp8_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -470,8 +470,8 @@ void hantro_g1_vp8_dec_run(struct hantro_ctx *ctx) 
	vdpu_write_relaxed(vpu, reg, G1_REG_DEC_CTRL0);



	/* Frame dimensions */

	mb_width = VP8_MB_WIDTH(width);

	mb_height = VP8_MB_HEIGHT(height);

	mb_width = MB_WIDTH(width);

	mb_height = MB_HEIGHT(height);

	reg = G1_REG_DEC_CTRL1_PIC_MB_WIDTH(mb_width) |

	      G1_REG_DEC_CTRL1_PIC_MB_HEIGHT_P(mb_height) |

	      G1_REG_DEC_CTRL1_PIC_MB_W_EXT(mb_width >> 9) |

drivers/staging/media/hantro/hantro_h1_jpeg_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ void hantro_h1_jpeg_enc_run(struct hantro_ctx *ctx) 
	/* Make sure that all registers are written at this point. */

	vepu_write(vpu, reg, H1_REG_AXI_CTRL);



	reg = H1_REG_ENC_CTRL_WIDTH(JPEG_MB_WIDTH(ctx->src_fmt.width))

		| H1_REG_ENC_CTRL_HEIGHT(JPEG_MB_HEIGHT(ctx->src_fmt.height))

	reg = H1_REG_ENC_CTRL_WIDTH(MB_WIDTH(ctx->src_fmt.width))

		| H1_REG_ENC_CTRL_HEIGHT(MB_HEIGHT(ctx->src_fmt.height))

		| H1_REG_ENC_CTRL_ENC_MODE_JPEG

		| H1_REG_ENC_PIC_INTRA

		| H1_REG_ENC_CTRL_EN_BIT;