comparison mpegvideo_xvmc.c @ 8927:b978ca882917 libavcodec

Rename unique_id to the way michaelni likes it. (xvmc_id)
author iive
date Sun, 15 Feb 2009 18:45:22 +0000
parents b8da7a21372c
children 8987e082c09f
comparison
equal deleted inserted replaced
8926:b8da7a21372c 8927:b978ca882917
39 * into the data_blocks array provided by xvmc. 39 * into the data_blocks array provided by xvmc.
40 */ 40 */
41 void ff_xvmc_init_block(MpegEncContext *s) 41 void ff_xvmc_init_block(MpegEncContext *s)
42 { 42 {
43 struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.data[2]; 43 struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.data[2];
44 assert(render && render->unique_id == AV_XVMC_RENDER_MAGIC); 44 assert(render && render->xvmc_id == AV_XVMC_RENDER_MAGIC);
45 45
46 s->block = (DCTELEM *)(render->data_blocks + render->next_free_data_block_num * 64); 46 s->block = (DCTELEM *)(render->data_blocks + render->next_free_data_block_num * 64);
47 } 47 }
48 48
49 /** 49 /**
74 { 74 {
75 struct xvmc_pix_fmt *last, *next, *render = (struct xvmc_pix_fmt*)s->current_picture.data[2]; 75 struct xvmc_pix_fmt *last, *next, *render = (struct xvmc_pix_fmt*)s->current_picture.data[2];
76 const int mb_block_count = 4 + (1 << s->chroma_format); 76 const int mb_block_count = 4 + (1 << s->chroma_format);
77 77
78 assert(avctx); 78 assert(avctx);
79 if (!render || render->unique_id != AV_XVMC_RENDER_MAGIC || 79 if (!render || render->xvmc_id != AV_XVMC_RENDER_MAGIC ||
80 !render->data_blocks || !render->mv_blocks) { 80 !render->data_blocks || !render->mv_blocks) {
81 av_log(avctx, AV_LOG_ERROR, 81 av_log(avctx, AV_LOG_ERROR,
82 "Render token doesn't look as expected.\n"); 82 "Render token doesn't look as expected.\n");
83 return -1; // make sure that this is a render packet 83 return -1; // make sure that this is a render packet
84 } 84 }
106 return 0; // no prediction from other frames 106 return 0; // no prediction from other frames
107 case FF_B_TYPE: 107 case FF_B_TYPE:
108 next = (struct xvmc_pix_fmt*)s->next_picture.data[2]; 108 next = (struct xvmc_pix_fmt*)s->next_picture.data[2];
109 if (!next) 109 if (!next)
110 return -1; 110 return -1;
111 if (next->unique_id != AV_XVMC_RENDER_MAGIC) 111 if (next->xvmc_id != AV_XVMC_RENDER_MAGIC)
112 return -1; 112 return -1;
113 render->p_future_surface = next->p_surface; 113 render->p_future_surface = next->p_surface;
114 // no return here, going to set forward prediction 114 // no return here, going to set forward prediction
115 case FF_P_TYPE: 115 case FF_P_TYPE:
116 last = (struct xvmc_pix_fmt*)s->last_picture.data[2]; 116 last = (struct xvmc_pix_fmt*)s->last_picture.data[2];
117 if (!last) 117 if (!last)
118 last = render; // predict second field from the first 118 last = render; // predict second field from the first
119 if (last->unique_id != AV_XVMC_RENDER_MAGIC) 119 if (last->xvmc_id != AV_XVMC_RENDER_MAGIC)
120 return -1; 120 return -1;
121 render->p_past_surface = last->p_surface; 121 render->p_past_surface = last->p_surface;
122 return 0; 122 return 0;
123 } 123 }
124 124
174 s->current_picture.qscale_table[mb_xy] = s->qscale; 174 s->current_picture.qscale_table[mb_xy] = s->qscale;
175 175
176 // start of XVMC-specific code 176 // start of XVMC-specific code
177 render = (struct xvmc_pix_fmt*)s->current_picture.data[2]; 177 render = (struct xvmc_pix_fmt*)s->current_picture.data[2];
178 assert(render); 178 assert(render);
179 assert(render->unique_id == AV_XVMC_RENDER_MAGIC); 179 assert(render->xvmc_id == AV_XVMC_RENDER_MAGIC);
180 assert(render->mv_blocks); 180 assert(render->mv_blocks);
181 181
182 // take the next free macroblock 182 // take the next free macroblock
183 mv_block = &render->mv_blocks[render->start_mv_blocks_num + 183 mv_block = &render->mv_blocks[render->start_mv_blocks_num +
184 render->filled_mv_blocks_num]; 184 render->filled_mv_blocks_num];