Mercurial > libavcodec.hg
comparison mpegvideo_xvmc.c @ 8845:aee8c48ff4b0 libavcodec
Give public #defines that are used by MPlayer an AV_ prefix.
author | diego |
---|---|
date | Sat, 14 Feb 2009 17:12:25 +0000 |
parents | 9ea7195b2ed4 |
children | 6ce8ebfc9d86 |
comparison
equal
deleted
inserted
replaced
8844:9ea7195b2ed4 | 8845:aee8c48ff4b0 |
---|---|
39 void XVMC_init_block(MpegEncContext *s) | 39 void XVMC_init_block(MpegEncContext *s) |
40 { | 40 { |
41 struct xvmc_render_state * render; | 41 struct xvmc_render_state * render; |
42 render = (struct xvmc_render_state*)s->current_picture.data[2]; | 42 render = (struct xvmc_render_state*)s->current_picture.data[2]; |
43 assert(render); | 43 assert(render); |
44 if (!render || (render->magic != MP_XVMC_RENDER_MAGIC)) { | 44 if (!render || (render->magic != AV_XVMC_RENDER_MAGIC)) { |
45 assert(0); | 45 assert(0); |
46 return;//make sure that this is a render packet | 46 return;//make sure that this is a render packet |
47 } | 47 } |
48 s->block = (DCTELEM *)(render->data_blocks+(render->next_free_data_block_num)*64); | 48 s->block = (DCTELEM *)(render->data_blocks+(render->next_free_data_block_num)*64); |
49 } | 49 } |
73 | 73 |
74 assert(avctx); | 74 assert(avctx); |
75 | 75 |
76 render = (struct xvmc_render_state*)s->current_picture.data[2]; | 76 render = (struct xvmc_render_state*)s->current_picture.data[2]; |
77 assert(render); | 77 assert(render); |
78 if (!render || (render->magic != MP_XVMC_RENDER_MAGIC)) | 78 if (!render || (render->magic != AV_XVMC_RENDER_MAGIC)) |
79 return -1;//make sure that this is render packet | 79 return -1;//make sure that this is render packet |
80 | 80 |
81 render->picture_structure = s->picture_structure; | 81 render->picture_structure = s->picture_structure; |
82 render->flags = (s->first_field) ? 0 : XVMC_SECOND_FIELD; | 82 render->flags = (s->first_field) ? 0 : XVMC_SECOND_FIELD; |
83 | 83 |
93 case FF_B_TYPE: | 93 case FF_B_TYPE: |
94 next = (struct xvmc_render_state*)s->next_picture.data[2]; | 94 next = (struct xvmc_render_state*)s->next_picture.data[2]; |
95 assert(next); | 95 assert(next); |
96 if (!next) | 96 if (!next) |
97 return -1; | 97 return -1; |
98 if (next->magic != MP_XVMC_RENDER_MAGIC) | 98 if (next->magic != AV_XVMC_RENDER_MAGIC) |
99 return -1; | 99 return -1; |
100 render->p_future_surface = next->p_surface; | 100 render->p_future_surface = next->p_surface; |
101 //no return here, going to set forward prediction | 101 //no return here, going to set forward prediction |
102 case FF_P_TYPE: | 102 case FF_P_TYPE: |
103 last = (struct xvmc_render_state*)s->last_picture.data[2]; | 103 last = (struct xvmc_render_state*)s->last_picture.data[2]; |
104 if (!last)// && !s->first_field) | 104 if (!last)// && !s->first_field) |
105 last = render;//predict second field from the first | 105 last = render;//predict second field from the first |
106 if (last->magic != MP_XVMC_RENDER_MAGIC) | 106 if (last->magic != AV_XVMC_RENDER_MAGIC) |
107 return -1; | 107 return -1; |
108 render->p_past_surface = last->p_surface; | 108 render->p_past_surface = last->p_surface; |
109 return 0; | 109 return 0; |
110 } | 110 } |
111 | 111 |
153 s->current_picture.qscale_table[mb_xy] = s->qscale; | 153 s->current_picture.qscale_table[mb_xy] = s->qscale; |
154 | 154 |
155 //START OF XVMC specific code | 155 //START OF XVMC specific code |
156 render = (struct xvmc_render_state*)s->current_picture.data[2]; | 156 render = (struct xvmc_render_state*)s->current_picture.data[2]; |
157 assert(render); | 157 assert(render); |
158 assert(render->magic==MP_XVMC_RENDER_MAGIC); | 158 assert(render->magic==AV_XVMC_RENDER_MAGIC); |
159 assert(render->mv_blocks); | 159 assert(render->mv_blocks); |
160 | 160 |
161 //take the next free macroblock | 161 //take the next free macroblock |
162 mv_block = &render->mv_blocks[render->start_mv_blocks_num + | 162 mv_block = &render->mv_blocks[render->start_mv_blocks_num + |
163 render->filled_mv_blocks_num ]; | 163 render->filled_mv_blocks_num ]; |