Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: mediatek: vcodec: Fix multiple typos

Correct multiple different typos found in comments or function names.

Signed-off-by: Sebastian Fricke <sebastian.fricke@collabora.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>

authored by

Sebastian Fricke and committed by
Hans Verkuil
64a2ade8 ed7276ed

+41 -41
+1 -1
drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec.c
··· 262 262 int tmp_w, tmp_h; 263 263 264 264 /* 265 - * Find next closer width align 64, heign align 64, size align 265 + * Find next closer width align 64, height align 64, size align 266 266 * 64 rectangle 267 267 * Note: This only get default value, the real HW needed value 268 268 * only available when ctx in MTK_STATE_HEADER state
+2 -2
drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h
··· 67 67 * @pic_w: picture width 68 68 * @pic_h: picture height 69 69 * @buf_w: picture buffer width (64 aligned up from pic_w) 70 - * @buf_h: picture buffer heiht (64 aligned up from pic_h) 70 + * @buf_h: picture buffer height (64 aligned up from pic_h) 71 71 * @fb_sz: bitstream size of each plane 72 72 * E.g. suppose picture size is 176x144, 73 73 * buffer size will be aligned to 176x160. 74 - * @cap_fourcc: fourcc number(may changed when resolution change) 74 + * @cap_fourcc: fourcc number(may change on a resolution change) 75 75 * @reserved: align struct to 64-bit in order to adjust 32-bit and 64-bit os. 76 76 */ 77 77 struct vdec_pic_info {
+10 -10
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_av1_req_lat_if.c
··· 326 326 * @use_lr: whether to use loop restoration 327 327 * @use_chroma_lr: whether to use chroma loop restoration 328 328 * @frame_restoration_type: specifies the type of restoration used for each plane 329 - * @loop_restoration_size: pecifies the size of loop restoration units in units 329 + * @loop_restoration_size: specifies the size of loop restoration units in units 330 330 * of samples in the current plane 331 331 */ 332 332 struct vdec_av1_slice_lr { ··· 347 347 * and loop_filter_sharpness together determine when 348 348 * a block edge is filtered, and by how much the 349 349 * filtering can change the sample values 350 - * @loop_filter_delta_enabled: filetr level depends on the mode and reference 350 + * @loop_filter_delta_enabled: filter level depends on the mode and reference 351 351 * frame used to predict a block 352 352 */ 353 353 struct vdec_av1_slice_loop_filter { ··· 392 392 /** 393 393 * struct vdec_av1_slice_tile - AV1 Tile info 394 394 * @tile_cols: specifies the number of tiles across the frame 395 - * @tile_rows: pecifies the number of tiles down the frame 395 + * @tile_rows: specifies the number of tiles down the frame 396 396 * @mi_col_starts: an array specifying the start column 397 397 * @mi_row_starts: an array specifying the start row 398 398 * @context_update_tile_id: specifies which tile to use for the CDF update ··· 423 423 * or the tile sizes are coded 424 424 * @interpolation_filter: specifies the filter selection used for performing inter prediction 425 425 * @allow_warped_motion: motion_mode may be present or not 426 - * @is_motion_mode_switchable : euqlt to 0 specifies that only the SIMPLE motion mode will be used 426 + * @is_motion_mode_switchable : equal to 0 specifies that only the SIMPLE motion mode will be used 427 427 * @reference_mode : frame reference mode selected 428 428 * @allow_high_precision_mv: specifies that motion vectors are specified to 429 429 * quarter pel precision or to eighth pel precision 430 - * @allow_intra_bc: ubducates that intra block copy may be used in this frame 430 + * @allow_intra_bc: allows that intra block copy may be used in this frame 431 431 * @force_integer_mv: specifies motion vectors will always be integers or 432 432 * can contain fractional bits 433 433 * @allow_screen_content_tools: intra blocks may use palette encoding 434 - * @error_resilient_mode: error resislent mode is enable/disable 434 + * @error_resilient_mode: error resilient mode is enable/disable 435 435 * @frame_type: specifies the AV1 frame type 436 436 * @primary_ref_frame: specifies which reference frame contains the CDF values 437 437 * and other state that should be loaded at the start of the frame ··· 440 440 * @disable_cdf_update: specified whether the CDF update in the symbol 441 441 * decoding process should be disables 442 442 * @skip_mode: av1 skip mode parameters 443 - * @seg: av1 segmentaon parameters 444 - * @delta_q_lf: av1 delta loop fileter 443 + * @seg: av1 segmentation parameters 444 + * @delta_q_lf: av1 delta loop filter 445 445 * @quant: av1 Quantization params 446 446 * @lr: av1 Loop Restauration parameters 447 447 * @superres_denom: the denominator for the upscaling ratio ··· 450 450 * @mfmv: av1 mfmv parameters 451 451 * @tile: av1 Tile info 452 452 * @frame_is_intra: intra frame 453 - * @loss_less_array: loss less array 454 - * @coded_loss_less: coded lsss less 453 + * @loss_less_array: lossless array 454 + * @coded_loss_less: coded lossless 455 455 * @mi_rows: size of mi unit in rows 456 456 * @mi_cols: size of mi unit in cols 457 457 */
+6 -6
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_if.c
··· 94 94 * AP-W/R : AP is writer/reader on this item 95 95 * VPU-W/R: VPU is write/reader on this item 96 96 * @hdr_buf : Header parsing buffer (AP-W, VPU-R) 97 - * @pred_buf_dma : HW working predication buffer dma address (AP-W, VPU-R) 97 + * @pred_buf_dma : HW working prediction buffer dma address (AP-W, VPU-R) 98 98 * @mv_buf_dma : HW working motion vector buffer dma address (AP-W, VPU-R) 99 99 * @list_free : free frame buffer ring list (AP-W/R, VPU-W) 100 100 * @list_disp : display frame buffer ring list (AP-R, VPU-W) ··· 117 117 * struct vdec_h264_inst - h264 decoder instance 118 118 * @num_nalu : how many nalus be decoded 119 119 * @ctx : point to mtk_vcodec_dec_ctx 120 - * @pred_buf : HW working predication buffer 120 + * @pred_buf : HW working prediction buffer 121 121 * @mv_buf : HW working motion vector buffer 122 122 * @vpu : VPU instance 123 123 * @vsi : VPU shared information ··· 136 136 return HW_MB_STORE_SZ * (width/MB_UNIT_LEN) * (height/MB_UNIT_LEN); 137 137 } 138 138 139 - static int allocate_predication_buf(struct vdec_h264_inst *inst) 139 + static int allocate_prediction_buf(struct vdec_h264_inst *inst) 140 140 { 141 141 int err = 0; 142 142 ··· 151 151 return 0; 152 152 } 153 153 154 - static void free_predication_buf(struct vdec_h264_inst *inst) 154 + static void free_prediction_buf(struct vdec_h264_inst *inst) 155 155 { 156 156 struct mtk_vcodec_mem *mem = NULL; 157 157 ··· 286 286 } 287 287 288 288 inst->vsi = (struct vdec_h264_vsi *)inst->vpu.vsi; 289 - err = allocate_predication_buf(inst); 289 + err = allocate_prediction_buf(inst); 290 290 if (err) 291 291 goto error_deinit; 292 292 ··· 308 308 struct vdec_h264_inst *inst = (struct vdec_h264_inst *)h_vdec; 309 309 310 310 vpu_dec_deinit(&inst->vpu); 311 - free_predication_buf(inst); 311 + free_prediction_buf(inst); 312 312 free_mv_buf(inst); 313 313 314 314 kfree(inst);
+2 -2
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_common.h
··· 175 175 int num_valid); 176 176 177 177 /** 178 - * mtk_vdec_h264_get_ctrl_ptr - get each CID contrl address. 178 + * mtk_vdec_h264_get_ctrl_ptr - get each CID control address. 179 179 * 180 180 * @ctx: v4l2 ctx 181 181 * @id: CID control ID ··· 246 246 const struct v4l2_h264_dpb_entry dpb[V4L2_H264_NUM_DPB_ENTRIES]); 247 247 248 248 /** 249 - * mtk_vdec_h264_update_dpb - updata dpb list. 249 + * mtk_vdec_h264_update_dpb - update dpb list. 250 250 * 251 251 * @dec_param: v4l2 control decode params 252 252 * @dpb: dpb entry informaton
+6 -6
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_if.c
··· 54 54 * by VPU. 55 55 * AP-W/R : AP is writer/reader on this item 56 56 * VPU-W/R: VPU is write/reader on this item 57 - * @pred_buf_dma : HW working predication buffer dma address (AP-W, VPU-R) 57 + * @pred_buf_dma : HW working prediction buffer dma address (AP-W, VPU-R) 58 58 * @mv_buf_dma : HW working motion vector buffer dma address (AP-W, VPU-R) 59 59 * @dec : decode information (AP-R, VPU-W) 60 60 * @pic : picture information (AP-R, VPU-W) ··· 74 74 * struct vdec_h264_slice_inst - h264 decoder instance 75 75 * @num_nalu : how many nalus be decoded 76 76 * @ctx : point to mtk_vcodec_dec_ctx 77 - * @pred_buf : HW working predication buffer 77 + * @pred_buf : HW working prediction buffer 78 78 * @mv_buf : HW working motion vector buffer 79 79 * @vpu : VPU instance 80 80 * @vsi_ctx : Local VSI data for this decoding context ··· 154 154 return 0; 155 155 } 156 156 157 - static int allocate_predication_buf(struct vdec_h264_slice_inst *inst) 157 + static int allocate_prediction_buf(struct vdec_h264_slice_inst *inst) 158 158 { 159 159 int err; 160 160 ··· 169 169 return 0; 170 170 } 171 171 172 - static void free_predication_buf(struct vdec_h264_slice_inst *inst) 172 + static void free_prediction_buf(struct vdec_h264_slice_inst *inst) 173 173 { 174 174 struct mtk_vcodec_mem *mem = &inst->pred_buf; 175 175 ··· 292 292 inst->vsi_ctx.dec.resolution_changed = true; 293 293 inst->vsi_ctx.dec.realloc_mv_buf = true; 294 294 295 - err = allocate_predication_buf(inst); 295 + err = allocate_prediction_buf(inst); 296 296 if (err) 297 297 goto error_deinit; 298 298 ··· 320 320 struct vdec_h264_slice_inst *inst = h_vdec; 321 321 322 322 vpu_dec_deinit(&inst->vpu); 323 - free_predication_buf(inst); 323 + free_prediction_buf(inst); 324 324 free_mv_buf(inst); 325 325 326 326 kfree(inst);
+2 -2
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c
··· 51 51 * struct vdec_h264_slice_info - decode information 52 52 * 53 53 * @nal_info: nal info of current picture 54 - * @timeout: Decode timeout: 1 timeout, 0 no timeount 54 + * @timeout: Decode timeout: 1 timeout, 0 no timeout 55 55 * @bs_buf_size: bitstream size 56 56 * @bs_buf_addr: bitstream buffer dma address 57 57 * @y_fb_dma: Y frame buffer dma address ··· 133 133 * 134 134 * @slice_dec_num: how many picture be decoded 135 135 * @ctx: point to mtk_vcodec_dec_ctx 136 - * @pred_buf: HW working predication buffer 136 + * @pred_buf: HW working prediction buffer 137 137 * @mv_buf: HW working motion vector buffer 138 138 * @vpu: VPU instance 139 139 * @vsi: vsi used for lat
+1 -1
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_hevc_req_multi_if.c
··· 254 254 * struct vdec_hevc_slice_info - decode information 255 255 * 256 256 * @wdma_end_addr_offset: wdma end address offset 257 - * @timeout: Decode timeout: 1 timeout, 0 no timeount 257 + * @timeout: Decode timeout: 1 timeout, 0 no timeout 258 258 * @vdec_fb_va: VDEC frame buffer struct virtual address 259 259 * @crc: Used to check whether hardware's status is right 260 260 */
+2 -2
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_if.c
··· 56 56 * @cur_c_fb_dma : current plane C frame buffer dma address 57 57 * @bs_dma : bitstream dma address 58 58 * @bs_sz : bitstream size 59 - * @resolution_changed: resolution change flag 1 - changed, 0 - not change 59 + * @resolution_changed: resolution change flag 1 - changed, 0 - not changed 60 60 * @show_frame : display this frame or not 61 61 * @wait_key_frame : wait key frame coming 62 62 */ ··· 109 109 /** 110 110 * struct vdec_vp8_vpu_inst - VPU instance for VP8 decode 111 111 * @wq_hd : Wait queue to wait VPU message ack 112 - * @signaled : 1 - Host has received ack message from VPU, 0 - not receive 112 + * @signaled : 1 - Host has received ack message from VPU, 0 - not received 113 113 * @failure : VPU execution result status 0 - success, others - fail 114 114 * @inst_addr : VPU decoder instance address 115 115 */
+1 -1
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c
··· 35 35 * @cur_c_fb_dma: current plane C frame buffer dma address 36 36 * @bs_dma: bitstream dma address 37 37 * @bs_sz: bitstream size 38 - * @resolution_changed:resolution change flag 1 - changed, 0 - not change 38 + * @resolution_changed:resolution change flag 1 - changed, 0 - not changed 39 39 * @frame_header_type: current frame header type 40 40 * @crc: used to check whether hardware's status is right 41 41 * @reserved: reserved, currently unused
+2 -2
drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_if.c
··· 41 41 42 42 /** 43 43 * struct vp9_fb_info - contains frame buffer info 44 - * @fb : frmae buffer 44 + * @fb : frame buffer 45 45 * @reserved : reserved field used by vpu 46 46 */ 47 47 struct vp9_fb_info { ··· 89 89 * AP-W/R : AP is writer/reader on this item 90 90 * VPU-W/R: VPU is write/reader on this item 91 91 * @sf_bs_buf : super frame backup buffer (AP-W, VPU-R) 92 - * @sf_ref_fb : record supoer frame reference buffer information 92 + * @sf_ref_fb : record super frame reference buffer information 93 93 * (AP-R/W, VPU-R/W) 94 94 * @sf_next_ref_fb_idx : next available super frame (AP-W, VPU-R) 95 95 * @sf_frm_cnt : super frame count, filled by vpu (AP-R, VPU-W)
+2 -2
drivers/media/platform/mediatek/vcodec/decoder/vdec_msg_queue.h
··· 158 158 struct vdec_lat_buf *vdec_msg_queue_dqbuf(struct vdec_msg_queue_ctx *ctx); 159 159 160 160 /** 161 - * vdec_msg_queue_update_ube_rptr - used to updata the ube read point. 161 + * vdec_msg_queue_update_ube_rptr - used to update the ube read point. 162 162 * @msg_queue: used to store the lat buffer information 163 163 * @ube_rptr: current ube read point 164 164 */ 165 165 void vdec_msg_queue_update_ube_rptr(struct vdec_msg_queue *msg_queue, uint64_t ube_rptr); 166 166 167 167 /** 168 - * vdec_msg_queue_update_ube_wptr - used to updata the ube write point. 168 + * vdec_msg_queue_update_ube_wptr - used to update the ube write point. 169 169 * @msg_queue: used to store the lat buffer information 170 170 * @ube_wptr: current ube write point 171 171 */
+2 -2
drivers/media/platform/mediatek/vcodec/decoder/vdec_vpu_if.h
··· 81 81 82 82 /** 83 83 * vpu_dec_reset - reset decoder, use for flush decoder when end of stream or 84 - * seek. Remainig non displayed frame will be pushed to display. 84 + * seek. Remaining non displayed frame will be pushed to display. 85 85 * 86 86 * @vpu: instance for vdec_vpu_inst 87 87 */ ··· 98 98 /** 99 99 * vpu_dec_core_end - core end decoding, basically the function will be invoked once 100 100 * when core HW decoding done and receive interrupt successfully. The 101 - * decoder in VPU will updata hardware information and deinit hardware 101 + * decoder in VPU will update hardware information and deinit hardware 102 102 * and check if there is a new decoded frame available to display. 103 103 * 104 104 * @vpu : instance for vdec_vpu_inst
+1 -1
drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c
··· 311 311 pix_fmt_mp->height = clamp(pix_fmt_mp->height, MTK_VENC_MIN_H, max_height); 312 312 pix_fmt_mp->width = clamp(pix_fmt_mp->width, MTK_VENC_MIN_W, max_width); 313 313 314 - /* find next closer width align 16, heign align 32, size align 314 + /* find next closer width align 16, height align 32, size align 315 315 * 64 rectangle 316 316 */ 317 317 tmp_w = pix_fmt_mp->width;
+1 -1
drivers/media/platform/mediatek/vcodec/encoder/venc_drv_if.h
··· 156 156 * @ctx: device context 157 157 * @opt: encode frame option 158 158 * @frm_buf: input frame buffer information 159 - * @bs_buf: output bitstream buffer infomraiton 159 + * @bs_buf: output bitstream buffer information 160 160 * @result: encode result 161 161 * Return: 0 if encoding frame successfully, otherwise it is failed. 162 162 */