comparison mpegvideo_xvmc.c @ 8941:42a048ecbba3 libavcodec

Give struct members more sensible names: total_number_of_mv_blocks --> allocated_mv_blocks total_number_of_data_blocks --> allocated_data_blocks
author diego
date Mon, 16 Feb 2009 00:21:16 +0000
parents a613cd6b6071
children 9dcb220e968c
comparison
equal deleted inserted replaced
8940:d9555e218ce3 8941:42a048ecbba3
87 av_log(avctx, AV_LOG_ERROR, 87 av_log(avctx, AV_LOG_ERROR,
88 "Rendering surface contains %i unprocessed blocks.\n", 88 "Rendering surface contains %i unprocessed blocks.\n",
89 render->filled_mv_blocks_num); 89 render->filled_mv_blocks_num);
90 return -1; 90 return -1;
91 } 91 }
92 if (render->total_number_of_mv_blocks < 1 || 92 if (render->allocated_mv_blocks < 1 ||
93 render->total_number_of_data_blocks < mb_block_count) { 93 render->allocated_data_blocks < mb_block_count) {
94 av_log(avctx, AV_LOG_ERROR, 94 av_log(avctx, AV_LOG_ERROR,
95 "Rendering surface doesn't provide enough block structures to work with.\n"); 95 "Rendering surface doesn't provide enough block structures to work with.\n");
96 return -1; 96 return -1;
97 } 97 }
98 98
310 render->next_free_data_block_num++; 310 render->next_free_data_block_num++;
311 } 311 }
312 } 312 }
313 render->filled_mv_blocks_num++; 313 render->filled_mv_blocks_num++;
314 314
315 assert(render->filled_mv_blocks_num <= render->total_number_of_mv_blocks); 315 assert(render->filled_mv_blocks_num <= render->allocated_mv_blocks);
316 assert(render->next_free_data_block_num <= render->total_number_of_data_blocks); 316 assert(render->next_free_data_block_num <= render->allocated_data_blocks);
317 /* The above conditions should not be able to fail as long as this function 317 /* The above conditions should not be able to fail as long as this function
318 * is used and the following 'if ()' automatically calls a callback to free 318 * is used and the following 'if ()' automatically calls a callback to free
319 * blocks. */ 319 * blocks. */
320 320
321 321
322 if (render->filled_mv_blocks_num == render->total_number_of_mv_blocks) 322 if (render->filled_mv_blocks_num == render->allocated_mv_blocks)
323 ff_draw_horiz_band(s, 0, 0); 323 ff_draw_horiz_band(s, 0, 0);
324 } 324 }