Mercurial > libavcodec.hg
annotate mpegvideo_xvmc.c @ 8926:b8da7a21372c libavcodec
Document all functions in mpegvideo_xvmc.
author | iive |
---|---|
date | Sun, 15 Feb 2009 18:30:39 +0000 |
parents | 23051e3e9d25 |
children | b978ca882917 |
rev | line source |
---|---|
8831 | 1 /* |
2 * XVideo Motion Compensation | |
3 * Copyright (c) 2003 Ivan Kalvachev | |
4 * | |
5 * This file is part of FFmpeg. | |
6 * | |
7 * FFmpeg is free software; you can redistribute it and/or | |
8 * modify it under the terms of the GNU Lesser General Public | |
9 * License as published by the Free Software Foundation; either | |
10 * version 2.1 of the License, or (at your option) any later version. | |
11 * | |
12 * FFmpeg is distributed in the hope that it will be useful, | |
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
15 * Lesser General Public License for more details. | |
16 * | |
17 * You should have received a copy of the GNU Lesser General Public | |
18 * License along with FFmpeg; if not, write to the Free Software | |
19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA | |
20 */ | |
21 | |
22 #include <limits.h> | |
23 | |
24 #include "avcodec.h" | |
25 #include "dsputil.h" | |
26 #include "mpegvideo.h" | |
27 | |
28 #undef NDEBUG | |
29 #include <assert.h> | |
30 | |
31 #include "xvmc.h" | |
8881
f8042554d4c8
Add xvmc_internal.h that contains all internal xvmc function declarations.
diego
parents:
8880
diff
changeset
|
32 #include "xvmc_internal.h" |
8831 | 33 |
8902
aa49d3e97b70
Doxygen comment/explanation for ff_xvmc_init_block().
diego
parents:
8897
diff
changeset
|
34 /** |
aa49d3e97b70
Doxygen comment/explanation for ff_xvmc_init_block().
diego
parents:
8897
diff
changeset
|
35 * Initializes the block field of the MpegEncContext pointer passed as |
aa49d3e97b70
Doxygen comment/explanation for ff_xvmc_init_block().
diego
parents:
8897
diff
changeset
|
36 * parameter after making sure that the data is not corrupted. |
8926 | 37 * In order to implement something like direct rendering instead of decodeing |
38 * coefficients in s->blocks and then copy them, do that directly | |
39 * into the data_blocks array provided by xvmc. | |
8902
aa49d3e97b70
Doxygen comment/explanation for ff_xvmc_init_block().
diego
parents:
8897
diff
changeset
|
40 */ |
8855 | 41 void ff_xvmc_init_block(MpegEncContext *s) |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
42 { |
8925
23051e3e9d25
Rename xvmc_pixfmt_render structure to xvmc_pix_fmt.
diego
parents:
8924
diff
changeset
|
43 struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.data[2]; |
8924 | 44 assert(render && render->unique_id == AV_XVMC_RENDER_MAGIC); |
8916
bd643af669df
Check all critical xvmc struct fields in ff_xvmc_field_start()
iive
parents:
8915
diff
changeset
|
45 |
8860 | 46 s->block = (DCTELEM *)(render->data_blocks + render->next_free_data_block_num * 64); |
8831 | 47 } |
48 | |
8926 | 49 /** |
50 * Fill individual block pointers, so there are no gaps in the data_block array | |
51 * in case not all blocks in MB are coded. | |
52 */ | |
8855 | 53 void ff_xvmc_pack_pblocks(MpegEncContext *s, int cbp) |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
54 { |
8889 | 55 int i, j = 0; |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
56 const int mb_block_count = 4 + (1 << s->chroma_format); |
8831 | 57 |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
58 cbp <<= 12-mb_block_count; |
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
59 for (i = 0; i < mb_block_count; i++) { |
8861
da23b389e856
cosmetics: Consistently format all if/else statements in K&R style
diego
parents:
8860
diff
changeset
|
60 if (cbp & (1 << 11)) |
8856 | 61 s->pblocks[i] = (short *)(&s->block[j++]); |
8861
da23b389e856
cosmetics: Consistently format all if/else statements in K&R style
diego
parents:
8860
diff
changeset
|
62 else |
8834 | 63 s->pblocks[i] = NULL; |
8831 | 64 cbp+=cbp; |
65 } | |
66 } | |
67 | |
8893 | 68 /** |
8926 | 69 * Find and store the surfaces that are used as reference frames. |
8893 | 70 * This function should be called for every new field and/or frame. |
71 * It should be safe to call the function a few times for the same field. | |
72 */ | |
8855 | 73 int ff_xvmc_field_start(MpegEncContext*s, AVCodecContext *avctx) |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
74 { |
8925
23051e3e9d25
Rename xvmc_pixfmt_render structure to xvmc_pix_fmt.
diego
parents:
8924
diff
changeset
|
75 struct xvmc_pix_fmt *last, *next, *render = (struct xvmc_pix_fmt*)s->current_picture.data[2]; |
8916
bd643af669df
Check all critical xvmc struct fields in ff_xvmc_field_start()
iive
parents:
8915
diff
changeset
|
76 const int mb_block_count = 4 + (1 << s->chroma_format); |
8831 | 77 |
8844
9ea7195b2ed4
Replace all (x == NULL) or (x != NULL) in assert and if conditions by !x and x.
diego
parents:
8842
diff
changeset
|
78 assert(avctx); |
8924 | 79 if (!render || render->unique_id != AV_XVMC_RENDER_MAGIC || |
8923 | 80 !render->data_blocks || !render->mv_blocks) { |
8916
bd643af669df
Check all critical xvmc struct fields in ff_xvmc_field_start()
iive
parents:
8915
diff
changeset
|
81 av_log(avctx, AV_LOG_ERROR, |
bd643af669df
Check all critical xvmc struct fields in ff_xvmc_field_start()
iive
parents:
8915
diff
changeset
|
82 "Render token doesn't look as expected.\n"); |
8870
c5112df7f8b8
cosmetics: grammar/spelling/wording fixes in comments
diego
parents:
8869
diff
changeset
|
83 return -1; // make sure that this is a render packet |
8916
bd643af669df
Check all critical xvmc struct fields in ff_xvmc_field_start()
iive
parents:
8915
diff
changeset
|
84 } |
8831 | 85 |
8885 | 86 if (render->filled_mv_blocks_num) { |
8884 | 87 av_log(avctx, AV_LOG_ERROR, |
8916
bd643af669df
Check all critical xvmc struct fields in ff_xvmc_field_start()
iive
parents:
8915
diff
changeset
|
88 "Rendering surface contains %i unprocessed blocks.\n", |
8885 | 89 render->filled_mv_blocks_num); |
8888 | 90 return -1; |
8884 | 91 } |
8916
bd643af669df
Check all critical xvmc struct fields in ff_xvmc_field_start()
iive
parents:
8915
diff
changeset
|
92 if (render->total_number_of_mv_blocks < 1 || |
bd643af669df
Check all critical xvmc struct fields in ff_xvmc_field_start()
iive
parents:
8915
diff
changeset
|
93 render->total_number_of_data_blocks < mb_block_count) { |
bd643af669df
Check all critical xvmc struct fields in ff_xvmc_field_start()
iive
parents:
8915
diff
changeset
|
94 av_log(avctx, AV_LOG_ERROR, |
bd643af669df
Check all critical xvmc struct fields in ff_xvmc_field_start()
iive
parents:
8915
diff
changeset
|
95 "Rendering surface doesn't provide enough block structures to work with.\n"); |
bd643af669df
Check all critical xvmc struct fields in ff_xvmc_field_start()
iive
parents:
8915
diff
changeset
|
96 return -1; |
bd643af669df
Check all critical xvmc struct fields in ff_xvmc_field_start()
iive
parents:
8915
diff
changeset
|
97 } |
8831 | 98 |
8917 | 99 render->picture_structure = s->picture_structure; |
100 render->flags = s->first_field ? 0 : XVMC_SECOND_FIELD; | |
8918 | 101 render->p_future_surface = NULL; |
102 render->p_past_surface = NULL; | |
8831 | 103 |
8871 | 104 switch(s->pict_type) { |
8831 | 105 case FF_I_TYPE: |
8867
0694627caaea
whitespace cosmetics: consistently format all comments
diego
parents:
8866
diff
changeset
|
106 return 0; // no prediction from other frames |
8831 | 107 case FF_B_TYPE: |
8925
23051e3e9d25
Rename xvmc_pixfmt_render structure to xvmc_pix_fmt.
diego
parents:
8924
diff
changeset
|
108 next = (struct xvmc_pix_fmt*)s->next_picture.data[2]; |
8844
9ea7195b2ed4
Replace all (x == NULL) or (x != NULL) in assert and if conditions by !x and x.
diego
parents:
8842
diff
changeset
|
109 if (!next) |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
110 return -1; |
8924 | 111 if (next->unique_id != AV_XVMC_RENDER_MAGIC) |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
112 return -1; |
8831 | 113 render->p_future_surface = next->p_surface; |
8867
0694627caaea
whitespace cosmetics: consistently format all comments
diego
parents:
8866
diff
changeset
|
114 // no return here, going to set forward prediction |
8831 | 115 case FF_P_TYPE: |
8925
23051e3e9d25
Rename xvmc_pixfmt_render structure to xvmc_pix_fmt.
diego
parents:
8924
diff
changeset
|
116 last = (struct xvmc_pix_fmt*)s->last_picture.data[2]; |
8872 | 117 if (!last) |
8867
0694627caaea
whitespace cosmetics: consistently format all comments
diego
parents:
8866
diff
changeset
|
118 last = render; // predict second field from the first |
8924 | 119 if (last->unique_id != AV_XVMC_RENDER_MAGIC) |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
120 return -1; |
8831 | 121 render->p_past_surface = last->p_surface; |
122 return 0; | |
123 } | |
124 | |
125 return -1; | |
126 } | |
127 | |
8897
fa198e44b199
Add Doxygen comment similar to ff_xvmc_field_start() to ff_xvmc_field_end().
diego
parents:
8896
diff
changeset
|
128 /** |
8926 | 129 * Complete frame/field rendering by passing any remaining blocks. |
130 * Normally ff_draw_horiz_band() is called on each slice, however | |
131 * there may be some remaining blocks, for example put by error_resilience. | |
8897
fa198e44b199
Add Doxygen comment similar to ff_xvmc_field_start() to ff_xvmc_field_end().
diego
parents:
8896
diff
changeset
|
132 * It should be safe to call the function a few times for the same field. |
fa198e44b199
Add Doxygen comment similar to ff_xvmc_field_start() to ff_xvmc_field_end().
diego
parents:
8896
diff
changeset
|
133 */ |
8855 | 134 void ff_xvmc_field_end(MpegEncContext *s) |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
135 { |
8925
23051e3e9d25
Rename xvmc_pixfmt_render structure to xvmc_pix_fmt.
diego
parents:
8924
diff
changeset
|
136 struct xvmc_pix_fmt *render = (struct xvmc_pix_fmt*)s->current_picture.data[2]; |
8844
9ea7195b2ed4
Replace all (x == NULL) or (x != NULL) in assert and if conditions by !x and x.
diego
parents:
8842
diff
changeset
|
137 assert(render); |
8831 | 138 |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
139 if (render->filled_mv_blocks_num > 0) |
8877 | 140 ff_draw_horiz_band(s, 0, 0); |
8831 | 141 } |
142 | |
8926 | 143 /** |
144 * Synthesize the data needed by XvMC to render one macroblock of data. | |
145 * Fill all relevent fields, if necessery do IDCT. | |
146 */ | |
8855 | 147 void ff_xvmc_decode_mb(MpegEncContext *s) |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
148 { |
8871 | 149 XvMCMacroBlock *mv_block; |
8925
23051e3e9d25
Rename xvmc_pixfmt_render structure to xvmc_pix_fmt.
diego
parents:
8924
diff
changeset
|
150 struct xvmc_pix_fmt *render; |
8871 | 151 int i, cbp, blocks_per_mb; |
8831 | 152 |
8834 | 153 const int mb_xy = s->mb_y * s->mb_stride + s->mb_x; |
8831 | 154 |
155 | |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
156 if (s->encoding) { |
8831 | 157 av_log(s->avctx, AV_LOG_ERROR, "XVMC doesn't support encoding!!!\n"); |
158 return; | |
159 } | |
160 | |
8867
0694627caaea
whitespace cosmetics: consistently format all comments
diego
parents:
8866
diff
changeset
|
161 // from MPV_decode_mb(), update DC predictors for P macroblocks |
8831 | 162 if (!s->mb_intra) { |
163 s->last_dc[0] = | |
164 s->last_dc[1] = | |
165 s->last_dc[2] = 128 << s->intra_dc_precision; | |
166 } | |
167 | |
8867
0694627caaea
whitespace cosmetics: consistently format all comments
diego
parents:
8866
diff
changeset
|
168 // MC doesn't skip blocks |
8831 | 169 s->mb_skipped = 0; |
170 | |
171 | |
8866
09d0ff5cdc81
whitespace cosmetics: Correctly indent all comments.
diego
parents:
8865
diff
changeset
|
172 // Do I need to export quant when I could not perform postprocessing? |
09d0ff5cdc81
whitespace cosmetics: Correctly indent all comments.
diego
parents:
8865
diff
changeset
|
173 // Anyway, it doesn't hurt. |
8831 | 174 s->current_picture.qscale_table[mb_xy] = s->qscale; |
175 | |
8870
c5112df7f8b8
cosmetics: grammar/spelling/wording fixes in comments
diego
parents:
8869
diff
changeset
|
176 // start of XVMC-specific code |
8925
23051e3e9d25
Rename xvmc_pixfmt_render structure to xvmc_pix_fmt.
diego
parents:
8924
diff
changeset
|
177 render = (struct xvmc_pix_fmt*)s->current_picture.data[2]; |
8844
9ea7195b2ed4
Replace all (x == NULL) or (x != NULL) in assert and if conditions by !x and x.
diego
parents:
8842
diff
changeset
|
178 assert(render); |
8924 | 179 assert(render->unique_id == AV_XVMC_RENDER_MAGIC); |
8831 | 180 assert(render->mv_blocks); |
181 | |
8867
0694627caaea
whitespace cosmetics: consistently format all comments
diego
parents:
8866
diff
changeset
|
182 // take the next free macroblock |
8831 | 183 mv_block = &render->mv_blocks[render->start_mv_blocks_num + |
8896 | 184 render->filled_mv_blocks_num]; |
8831 | 185 |
8837 | 186 mv_block->x = s->mb_x; |
187 mv_block->y = s->mb_y; | |
8867
0694627caaea
whitespace cosmetics: consistently format all comments
diego
parents:
8866
diff
changeset
|
188 mv_block->dct_type = s->interlaced_dct; // XVMC_DCT_TYPE_FRAME/FIELD; |
8861
da23b389e856
cosmetics: Consistently format all if/else statements in K&R style
diego
parents:
8860
diff
changeset
|
189 if (s->mb_intra) { |
8867
0694627caaea
whitespace cosmetics: consistently format all comments
diego
parents:
8866
diff
changeset
|
190 mv_block->macroblock_type = XVMC_MB_TYPE_INTRA; // no MC, all done |
8861
da23b389e856
cosmetics: Consistently format all if/else statements in K&R style
diego
parents:
8860
diff
changeset
|
191 } else { |
8831 | 192 mv_block->macroblock_type = XVMC_MB_TYPE_PATTERN; |
193 | |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
194 if (s->mv_dir & MV_DIR_FORWARD) { |
8836
4c175e9d492e
whitespace cosmetics: another round of formatting consistency fixes
diego
parents:
8835
diff
changeset
|
195 mv_block->macroblock_type |= XVMC_MB_TYPE_MOTION_FORWARD; |
8873
02c59b74ba71
Make one comment slightly clearer and more readable.
diego
parents:
8872
diff
changeset
|
196 // PMV[n][dir][xy] = mv[dir][n][xy] |
8831 | 197 mv_block->PMV[0][0][0] = s->mv[0][0][0]; |
198 mv_block->PMV[0][0][1] = s->mv[0][0][1]; | |
199 mv_block->PMV[1][0][0] = s->mv[0][1][0]; | |
200 mv_block->PMV[1][0][1] = s->mv[0][1][1]; | |
201 } | |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
202 if (s->mv_dir & MV_DIR_BACKWARD) { |
8836
4c175e9d492e
whitespace cosmetics: another round of formatting consistency fixes
diego
parents:
8835
diff
changeset
|
203 mv_block->macroblock_type |= XVMC_MB_TYPE_MOTION_BACKWARD; |
8831 | 204 mv_block->PMV[0][1][0] = s->mv[1][0][0]; |
205 mv_block->PMV[0][1][1] = s->mv[1][0][1]; | |
206 mv_block->PMV[1][1][0] = s->mv[1][1][0]; | |
207 mv_block->PMV[1][1][1] = s->mv[1][1][1]; | |
208 } | |
209 | |
8877 | 210 switch(s->mv_type) { |
8831 | 211 case MV_TYPE_16X16: |
212 mv_block->motion_type = XVMC_PREDICTION_FRAME; | |
213 break; | |
214 case MV_TYPE_16X8: | |
215 mv_block->motion_type = XVMC_PREDICTION_16x8; | |
216 break; | |
217 case MV_TYPE_FIELD: | |
218 mv_block->motion_type = XVMC_PREDICTION_FIELD; | |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
219 if (s->picture_structure == PICT_FRAME) { |
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
220 mv_block->PMV[0][0][1] <<= 1; |
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
221 mv_block->PMV[1][0][1] <<= 1; |
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
222 mv_block->PMV[0][1][1] <<= 1; |
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
223 mv_block->PMV[1][1][1] <<= 1; |
8831 | 224 } |
225 break; | |
226 case MV_TYPE_DMV: | |
227 mv_block->motion_type = XVMC_PREDICTION_DUAL_PRIME; | |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
228 if (s->picture_structure == PICT_FRAME) { |
8831 | 229 |
8876 | 230 mv_block->PMV[0][0][0] = s->mv[0][0][0]; // top from top |
8875
266bd7d64985
whitespace cosmetics: Put some spaces around operators for better readability.
diego
parents:
8874
diff
changeset
|
231 mv_block->PMV[0][0][1] = s->mv[0][0][1] << 1; |
8831 | 232 |
8876 | 233 mv_block->PMV[0][1][0] = s->mv[0][0][0]; // bottom from bottom |
8875
266bd7d64985
whitespace cosmetics: Put some spaces around operators for better readability.
diego
parents:
8874
diff
changeset
|
234 mv_block->PMV[0][1][1] = s->mv[0][0][1] << 1; |
8831 | 235 |
8876 | 236 mv_block->PMV[1][0][0] = s->mv[0][2][0]; // dmv00, top from bottom |
8875
266bd7d64985
whitespace cosmetics: Put some spaces around operators for better readability.
diego
parents:
8874
diff
changeset
|
237 mv_block->PMV[1][0][1] = s->mv[0][2][1] << 1; // dmv01 |
8831 | 238 |
8876 | 239 mv_block->PMV[1][1][0] = s->mv[0][3][0]; // dmv10, bottom from top |
8875
266bd7d64985
whitespace cosmetics: Put some spaces around operators for better readability.
diego
parents:
8874
diff
changeset
|
240 mv_block->PMV[1][1][1] = s->mv[0][3][1] << 1; // dmv11 |
8831 | 241 |
8861
da23b389e856
cosmetics: Consistently format all if/else statements in K&R style
diego
parents:
8860
diff
changeset
|
242 } else { |
8876 | 243 mv_block->PMV[0][1][0] = s->mv[0][2][0]; // dmv00 |
244 mv_block->PMV[0][1][1] = s->mv[0][2][1]; // dmv01 | |
8831 | 245 } |
246 break; | |
247 default: | |
248 assert(0); | |
249 } | |
250 | |
251 mv_block->motion_vertical_field_select = 0; | |
252 | |
8867
0694627caaea
whitespace cosmetics: consistently format all comments
diego
parents:
8866
diff
changeset
|
253 // set correct field references |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
254 if (s->mv_type == MV_TYPE_FIELD || s->mv_type == MV_TYPE_16X8) { |
8862 | 255 mv_block->motion_vertical_field_select |= s->field_select[0][0]; |
8871 | 256 mv_block->motion_vertical_field_select |= s->field_select[1][0] << 1; |
257 mv_block->motion_vertical_field_select |= s->field_select[0][1] << 2; | |
258 mv_block->motion_vertical_field_select |= s->field_select[1][1] << 3; | |
8831 | 259 } |
8867
0694627caaea
whitespace cosmetics: consistently format all comments
diego
parents:
8866
diff
changeset
|
260 } // !intra |
8870
c5112df7f8b8
cosmetics: grammar/spelling/wording fixes in comments
diego
parents:
8869
diff
changeset
|
261 // time to handle data blocks |
8831 | 262 mv_block->index = render->next_free_data_block_num; |
263 | |
264 blocks_per_mb = 6; | |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
265 if (s->chroma_format >= 2) { |
8856 | 266 blocks_per_mb = 4 + (1 << s->chroma_format); |
8831 | 267 } |
268 | |
8867
0694627caaea
whitespace cosmetics: consistently format all comments
diego
parents:
8866
diff
changeset
|
269 // calculate cbp |
8831 | 270 cbp = 0; |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
271 for (i = 0; i < blocks_per_mb; i++) { |
8836
4c175e9d492e
whitespace cosmetics: another round of formatting consistency fixes
diego
parents:
8835
diff
changeset
|
272 cbp += cbp; |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
273 if (s->block_last_index[i] >= 0) |
8831 | 274 cbp++; |
275 } | |
276 | |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
277 if (s->flags & CODEC_FLAG_GRAY) { |
8876 | 278 if (s->mb_intra) { // intra frames are always full chroma blocks |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
279 for (i = 4; i < blocks_per_mb; i++) { |
8886 | 280 memset(s->pblocks[i], 0, sizeof(short)*64); // so we need to clear them |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
281 if (!render->unsigned_intra) |
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
282 s->pblocks[i][0] = 1 << 10; |
8831 | 283 } |
8861
da23b389e856
cosmetics: Consistently format all if/else statements in K&R style
diego
parents:
8860
diff
changeset
|
284 } else { |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
285 cbp &= 0xf << (blocks_per_mb - 4); |
8876 | 286 blocks_per_mb = 4; // luminance blocks only |
8831 | 287 } |
288 } | |
289 mv_block->coded_block_pattern = cbp; | |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
290 if (cbp == 0) |
8831 | 291 mv_block->macroblock_type &= ~XVMC_MB_TYPE_PATTERN; |
292 | |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
293 for (i = 0; i < blocks_per_mb; i++) { |
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
294 if (s->block_last_index[i] >= 0) { |
8831 | 295 // I do not have unsigned_intra MOCO to test, hope it is OK. |
8868
2534e44a9472
Restore one set of parentheses to avoid the warning:
diego
parents:
8867
diff
changeset
|
296 if (s->mb_intra && (render->idct || (!render->idct && !render->unsigned_intra))) |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
297 s->pblocks[i][0] -= 1 << 10; |
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
298 if (!render->idct) { |
8831 | 299 s->dsp.idct(s->pblocks[i]); |
8870
c5112df7f8b8
cosmetics: grammar/spelling/wording fixes in comments
diego
parents:
8869
diff
changeset
|
300 /* It is unclear if MC hardware requires pixel diff values to be |
c5112df7f8b8
cosmetics: grammar/spelling/wording fixes in comments
diego
parents:
8869
diff
changeset
|
301 * in the range [-255;255]. TODO: Clipping if such hardware is |
c5112df7f8b8
cosmetics: grammar/spelling/wording fixes in comments
diego
parents:
8869
diff
changeset
|
302 * ever found. As of now it would only be an unnecessary |
c5112df7f8b8
cosmetics: grammar/spelling/wording fixes in comments
diego
parents:
8869
diff
changeset
|
303 * slowdown. */ |
8831 | 304 } |
8867
0694627caaea
whitespace cosmetics: consistently format all comments
diego
parents:
8866
diff
changeset
|
305 // copy blocks only if the codec doesn't support pblocks reordering |
8835
8c11ebbca9b3
whitespace cosmetics: consistent (more or less) K&R style
diego
parents:
8834
diff
changeset
|
306 if (s->avctx->xvmc_acceleration == 1) { |
8856 | 307 memcpy(&render->data_blocks[render->next_free_data_block_num*64], |
8880 | 308 s->pblocks[i], sizeof(short)*64); |
8831 | 309 } |
310 render->next_free_data_block_num++; | |
311 } | |
312 } | |
313 render->filled_mv_blocks_num++; | |
314 | |
8912 | 315 assert(render->filled_mv_blocks_num <= render->total_number_of_mv_blocks); |
8831 | 316 assert(render->next_free_data_block_num <= render->total_number_of_data_blocks); |
8912 | 317 /* The above conditions should not be able to fail as long as this function |
8887 | 318 * is used and the following 'if ()' automatically calls a callback to free |
319 * blocks. */ | |
8831 | 320 |
321 | |
8915 | 322 if (render->filled_mv_blocks_num == render->total_number_of_mv_blocks) |
8871 | 323 ff_draw_horiz_band(s, 0, 0); |
8831 | 324 } |