comparison vdpau.c @ 8919:2dc78db4de26 libavcodec

Place spaces consistently in pointer types in vdpau.c
author reimar
date Sun, 15 Feb 2009 12:31:01 +0000
parents 92bd4156f0f1
children 07b5c9735954
comparison
equal deleted inserted replaced
8918:b27254b4f633 8919:2dc78db4de26
39 */ 39 */
40 40
41 void ff_vdpau_h264_set_reference_frames(MpegEncContext *s) 41 void ff_vdpau_h264_set_reference_frames(MpegEncContext *s)
42 { 42 {
43 H264Context *h = s->avctx->priv_data; 43 H264Context *h = s->avctx->priv_data;
44 struct vdpau_render_state * render, * render_ref; 44 struct vdpau_render_state *render, *render_ref;
45 VdpReferenceFrameH264 * rf, * rf2; 45 VdpReferenceFrameH264 *rf, *rf2;
46 Picture * pic; 46 Picture *pic;
47 int i, list, pic_frame_idx; 47 int i, list, pic_frame_idx;
48 48
49 render = (struct vdpau_render_state*)s->current_picture_ptr->data[0]; 49 render = (struct vdpau_render_state *)s->current_picture_ptr->data[0];
50 assert(render); 50 assert(render);
51 51
52 rf = &render->info.h264.referenceFrames[0]; 52 rf = &render->info.h264.referenceFrames[0];
53 #define H264_RF_COUNT FF_ARRAY_ELEMS(render->info.h264.referenceFrames) 53 #define H264_RF_COUNT FF_ARRAY_ELEMS(render->info.h264.referenceFrames)
54 54
60 pic = lp[i]; 60 pic = lp[i];
61 if (!pic || !pic->reference) 61 if (!pic || !pic->reference)
62 continue; 62 continue;
63 pic_frame_idx = pic->long_ref ? pic->pic_id : pic->frame_num; 63 pic_frame_idx = pic->long_ref ? pic->pic_id : pic->frame_num;
64 64
65 render_ref = (struct vdpau_render_state*)pic->data[0]; 65 render_ref = (struct vdpau_render_state *)pic->data[0];
66 assert(render_ref); 66 assert(render_ref);
67 67
68 rf2 = &render->info.h264.referenceFrames[0]; 68 rf2 = &render->info.h264.referenceFrames[0];
69 while (rf2 != rf) { 69 while (rf2 != rf) {
70 if ( 70 if (
108 } 108 }
109 109
110 void ff_vdpau_add_data_chunk(MpegEncContext *s, 110 void ff_vdpau_add_data_chunk(MpegEncContext *s,
111 const uint8_t *buf, int buf_size) 111 const uint8_t *buf, int buf_size)
112 { 112 {
113 struct vdpau_render_state * render; 113 struct vdpau_render_state *render;
114 114
115 render = (struct vdpau_render_state*)s->current_picture_ptr->data[0]; 115 render = (struct vdpau_render_state *)s->current_picture_ptr->data[0];
116 assert(render); 116 assert(render);
117 117
118 render->bitstream_buffers= av_fast_realloc( 118 render->bitstream_buffers= av_fast_realloc(
119 render->bitstream_buffers, 119 render->bitstream_buffers,
120 &render->bitstream_buffers_allocated, 120 &render->bitstream_buffers_allocated,
128 } 128 }
129 129
130 void ff_vdpau_h264_picture_complete(MpegEncContext *s) 130 void ff_vdpau_h264_picture_complete(MpegEncContext *s)
131 { 131 {
132 H264Context *h = s->avctx->priv_data; 132 H264Context *h = s->avctx->priv_data;
133 struct vdpau_render_state * render; 133 struct vdpau_render_state *render;
134 134
135 render = (struct vdpau_render_state*)s->current_picture_ptr->data[0]; 135 render = (struct vdpau_render_state *)s->current_picture_ptr->data[0];
136 assert(render); 136 assert(render);
137 137
138 render->info.h264.slice_count = h->slice_num; 138 render->info.h264.slice_count = h->slice_num;
139 if (render->info.h264.slice_count < 1) 139 if (render->info.h264.slice_count < 1)
140 return; 140 return;
179 } 179 }
180 180
181 void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf, 181 void ff_vdpau_mpeg_picture_complete(MpegEncContext *s, const uint8_t *buf,
182 int buf_size, int slice_count) 182 int buf_size, int slice_count)
183 { 183 {
184 struct vdpau_render_state * render, * last, * next; 184 struct vdpau_render_state *render, *last, *next;
185 int i; 185 int i;
186 186
187 render = (struct vdpau_render_state*)s->current_picture_ptr->data[0]; 187 render = (struct vdpau_render_state *)s->current_picture_ptr->data[0];
188 assert(render); 188 assert(render);
189 189
190 /* fill VdpPictureInfoMPEG1Or2 struct */ 190 /* fill VdpPictureInfoMPEG1Or2 struct */
191 render->info.mpeg.picture_structure = s->picture_structure; 191 render->info.mpeg.picture_structure = s->picture_structure;
192 render->info.mpeg.picture_coding_type = s->pict_type; 192 render->info.mpeg.picture_coding_type = s->pict_type;
211 render->info.mpeg.forward_reference = VDP_INVALID_HANDLE; 211 render->info.mpeg.forward_reference = VDP_INVALID_HANDLE;
212 render->info.mpeg.backward_reference = VDP_INVALID_HANDLE; 212 render->info.mpeg.backward_reference = VDP_INVALID_HANDLE;
213 213
214 switch(s->pict_type){ 214 switch(s->pict_type){
215 case FF_B_TYPE: 215 case FF_B_TYPE:
216 next = (struct vdpau_render_state*)s->next_picture.data[0]; 216 next = (struct vdpau_render_state *)s->next_picture.data[0];
217 assert(next); 217 assert(next);
218 render->info.mpeg.backward_reference = next->surface; 218 render->info.mpeg.backward_reference = next->surface;
219 // no return here, going to set forward prediction 219 // no return here, going to set forward prediction
220 case FF_P_TYPE: 220 case FF_P_TYPE:
221 last = (struct vdpau_render_state*)s->last_picture.data[0]; 221 last = (struct vdpau_render_state *)s->last_picture.data[0];
222 if (!last) // FIXME: Does this test make sense? 222 if (!last) // FIXME: Does this test make sense?
223 last = render; // predict second field from the first 223 last = render; // predict second field from the first
224 render->info.mpeg.forward_reference = last->surface; 224 render->info.mpeg.forward_reference = last->surface;
225 } 225 }
226 226
235 235
236 void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf, 236 void ff_vdpau_vc1_decode_picture(MpegEncContext *s, const uint8_t *buf,
237 int buf_size) 237 int buf_size)
238 { 238 {
239 VC1Context *v = s->avctx->priv_data; 239 VC1Context *v = s->avctx->priv_data;
240 struct vdpau_render_state * render, * last, * next; 240 struct vdpau_render_state *render, *last, *next;
241 241
242 render = (struct vdpau_render_state*)s->current_picture.data[0]; 242 render = (struct vdpau_render_state *)s->current_picture.data[0];
243 assert(render); 243 assert(render);
244 244
245 /* fill LvPictureInfoVC1 struct */ 245 /* fill LvPictureInfoVC1 struct */
246 render->info.vc1.frame_coding_mode = v->fcm; 246 render->info.vc1.frame_coding_mode = v->fcm;
247 render->info.vc1.postprocflag = v->postprocflag; 247 render->info.vc1.postprocflag = v->postprocflag;
281 else 281 else
282 render->info.vc1.picture_type = s->pict_type - 1 + s->pict_type / 3; 282 render->info.vc1.picture_type = s->pict_type - 1 + s->pict_type / 3;
283 283
284 switch(s->pict_type){ 284 switch(s->pict_type){
285 case FF_B_TYPE: 285 case FF_B_TYPE:
286 next = (struct vdpau_render_state*)s->next_picture.data[0]; 286 next = (struct vdpau_render_state *)s->next_picture.data[0];
287 assert(next); 287 assert(next);
288 render->info.vc1.backward_reference = next->surface; 288 render->info.vc1.backward_reference = next->surface;
289 // no break here, going to set forward prediction 289 // no break here, going to set forward prediction
290 case FF_P_TYPE: 290 case FF_P_TYPE:
291 last = (struct vdpau_render_state*)s->last_picture.data[0]; 291 last = (struct vdpau_render_state *)s->last_picture.data[0];
292 if (!last) // FIXME: Does this test make sense? 292 if (!last) // FIXME: Does this test make sense?
293 last = render; // predict second field from the first 293 last = render; // predict second field from the first
294 render->info.vc1.forward_reference = last->surface; 294 render->info.vc1.forward_reference = last->surface;
295 } 295 }
296 296