Mercurial > cgi-bin > hgwebdir.cgi > PR > Applications > VSs > VSs__H264__App

annotate libavcodec/h264_ompss.c @ 4:96e628866d41

find changesets by author, revision, files, or words in the commit message
naming some tasks to help debugging
author Nina Engelhardt <nengel@mailbox.tu-berlin.de>
date Wed, 19 Dec 2012 15:40:26 +0100
parents 0b056460c67d
children 808fe898c011
rev   line source
nengel@2 1 /*
nengel@2 2 * H.26L/H.264/AVC/JVT/14496-10/... encoder/decoder
nengel@2 3 * Copyright (c) 2003 Michael Niedermayer <michaelni@gmx.at>
nengel@2 4 *
nengel@2 5 * This file is part of FFmpeg.
nengel@2 6 *
nengel@2 7 * FFmpeg is free software; you can redistribute it and/or
nengel@2 8 * modify it under the terms of the GNU Lesser General Public
nengel@2 9 * License as published by the Free Software Foundation; either
nengel@2 10 * version 2.1 of the License, or (at your option) any later version.
nengel@2 11 *
nengel@2 12 * FFmpeg is distributed in the hope that it will be useful,
nengel@2 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
nengel@2 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
nengel@2 15 * Lesser General Public License for more details.
nengel@2 16 *
nengel@2 17 * You should have received a copy of the GNU Lesser General Public
nengel@2 18 * License along with FFmpeg; if not, write to the Free Software
nengel@2 19 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
nengel@2 20 */
nengel@2 21 #include "h264_types.h"
nengel@2 22 #include "h264_parser.h"
nengel@2 23 #include "h264_nal.h"
nengel@2 24 #include "h264_entropy.h"
nengel@2 25 #include "h264_rec.h"
nengel@2 26 #include "h264_pred_mode.h"
nengel@2 27 #include "h264_misc.h"
nengel@2 28 // #undef NDEBUG
nengel@2 29 #include <assert.h>
nengel@3 30 #include "VSs_impl/VSs.h"
nengel@2 31
nengel@3 32 typedef struct{
nengel@3 33 ParserContext *pc;
nengel@3 34 NalContext *nc;
nengel@3 35 SliceBufferEntry *sbe;
nengel@3 36 H264Context *h;
nengel@3 37 } parse_taskArgs;
nengel@3 38
nengel@3 39 int32 parse_taskArgTypes[4] = {INOUT, INOUT, OUTPUT, NONCTLD};
nengel@3 40 int32 parse_taskArgSizes[4] = {sizeof(ParserContext), sizeof(NalContext), sizeof(SliceBufferEntry), sizeof(H264Context)};
nengel@3 41
nengel@3 42 //#pragma omp task inout(*pc, *nc) output(*sbe)
nengel@3 43 static void parse_task(void *_data, SlaveVP *animatingSlv){
nengel@3 44 parse_taskArgs* args = (parse_taskArgs*) _data;
nengel@3 45 ParserContext *pc = args->pc;
nengel@3 46 NalContext *nc = args->nc;
nengel@3 47 SliceBufferEntry *sbe = args->sbe;
nengel@3 48 H264Context *h = args->h;
nengel@2 49 H264Slice *s;
nengel@2 50
nengel@2 51 if (!sbe->initialized){
nengel@2 52 init_sb_entry(h, sbe);
nengel@2 53 sbe->lines_total=h->mb_height;
nengel@2 54 }
nengel@2 55
nengel@2 56 av_read_frame_internal(pc, &sbe->gb);
nengel@2 57 s = &sbe->slice;
nengel@2 58
nengel@2 59 decode_nal_units(nc, s, &sbe->gb);
nengel@3 60
nengel@3 61 VSs__end_task( animatingSlv );
nengel@2 62 }
nengel@2 63
nengel@3 64 VSsTaskType parse_taskType = {
nengel@3 65 .fn = &parse_task,
nengel@3 66 .numCtldArgs = 3,
nengel@3 67 .numTotalArgs = 4,
nengel@3 68 .sizeOfArgs = sizeof(parse_taskArgs),
nengel@3 69 .argTypes = parse_taskArgTypes,
nengel@3 70 .argSizes = parse_taskArgSizes};
nengel@3 71
nengel@3 72
nengel@3 73 typedef struct{
nengel@3 74 EntropyContext *ec;
nengel@3 75 SliceBufferEntry *sbe;
nengel@3 76 H264Context *h;
nengel@3 77 } decode_slice_entropy_taskArgs;
nengel@3 78
nengel@3 79 int32 decode_slice_entropy_taskArgTypes[3] = {INOUT, INOUT, NONCTLD};
nengel@3 80 int32 decode_slice_entropy_taskArgSizes[3] = {sizeof(EntropyContext), sizeof(SliceBufferEntry), sizeof(H264Context)};
nengel@3 81
nengel@3 82 //#pragma omp task inout(*ec) inout(*sbe)
nengel@3 83 static void decode_slice_entropy_task(void *_data, SlaveVP *animatingSlv){
nengel@3 84 decode_slice_entropy_taskArgs* args = (decode_slice_entropy_taskArgs*) _data;
nengel@3 85 EntropyContext *ec = args->ec;
nengel@3 86 SliceBufferEntry *sbe = args->sbe;
nengel@3 87 H264Context *h = args->h;
nengel@2 88 int i,j;
nengel@2 89 H264Slice *s = &sbe->slice;
nengel@2 90 GetBitContext *gb = &sbe->gb;
nengel@2 91 H264Mb *mbs = sbe->mbs;
nengel@2 92 // GetBitContext *gb = s->gb;
nengel@2 93 CABACContext *c = &ec->c;
nengel@2 94
nengel@2 95 if( !s->pps.cabac ){
nengel@2 96 av_log(AV_LOG_ERROR, "Only cabac encoded streams are supported\n");
nengel@3 97 VSs__end_task( animatingSlv );
nengel@2 98 }
nengel@2 99
nengel@2 100 init_dequant_tables(s, ec);
nengel@2 101 ec->curr_qscale = s->qscale;
nengel@2 102 ec->last_qscale_diff = 0;
nengel@2 103 ec->chroma_qp[0] = get_chroma_qp((H264Slice *) s, 0, s->qscale);
nengel@2 104 ec->chroma_qp[1] = get_chroma_qp((H264Slice *) s, 1, s->qscale);
nengel@2 105
nengel@2 106 /* realign */
nengel@2 107 align_get_bits( gb );
nengel@2 108 /* init cabac */
nengel@2 109 ff_init_cabac_decoder( c, gb->buffer + get_bits_count(gb)/8, (get_bits_left(gb) + 7)/8);
nengel@2 110
nengel@2 111 ff_h264_init_cabac_states(ec, s, c);
nengel@2 112
nengel@2 113 for(j=0; j<ec->mb_height; j++){
nengel@2 114 init_entropy_buf(ec, s, j);
nengel@2 115 for(i=0; i<ec->mb_width; i++){
nengel@2 116 int eos,ret;
nengel@2 117 H264Mb *m = &mbs[i + j*ec->mb_width];
nengel@2 118 m->mb_x=i;
nengel@2 119 m->mb_y=j;
nengel@2 120 ec->m = m;
nengel@2 121
nengel@2 122 ret = ff_h264_decode_mb_cabac(ec, s, c);
nengel@2 123 eos = get_cabac_terminate( c);
nengel@2 124 (void) eos;
nengel@2 125 if( ret < 0 || c->bytestream > c->bytestream_end + 2) {
nengel@2 126 av_log(AV_LOG_ERROR, "error while decoding MB %d %d, bytestream (%td)\n", m->mb_x, m->mb_y, c->bytestream_end - c->bytestream);
nengel@3 127 VSs__end_task( animatingSlv );
nengel@2 128 }
nengel@2 129 }
nengel@2 130 }
nengel@3 131 VSs__end_task( animatingSlv );
nengel@2 132 }
nengel@2 133
nengel@3 134 VSsTaskType decode_slice_entropy_taskType = {
nengel@3 135 .fn = &decode_slice_entropy_task,
nengel@3 136 .numCtldArgs = 2,
nengel@3 137 .numTotalArgs = 3,
nengel@3 138 .sizeOfArgs = sizeof(decode_slice_entropy_taskArgs),
nengel@3 139 .argTypes = decode_slice_entropy_taskArgTypes,
nengel@3 140 .argSizes = decode_slice_entropy_taskArgSizes};
nengel@3 141
nengel@3 142
nengel@2 143 static void decode_super_mb_block(MBRecContext *d, H264Slice *s, SuperMBContext *smbc, H264Mb *mbs, int smb_x, int smb_y){
nengel@2 144 MBRecState mrs;
nengel@2 145 // memset(&mrs, 0, sizeof(MBRecState));
nengel@2 146
nengel@2 147 for (int k=0, i= smb_y; i< smb_y + smbc->smb_height; i++, k++){
nengel@2 148 init_mbrec_context(d, &mrs, s, i);
nengel@2 149 for (int j= smb_x -k ; j< smb_x - k + smbc->smb_width; j++){
nengel@2 150 if (i< d->mb_height && j >= 0 && j < d->mb_width){
nengel@2 151 h264_decode_mb_internal (d, &mrs, s, &mbs[i*d->mb_width+j]);
nengel@2 152 }
nengel@2 153 }
nengel@2 154 }
nengel@2 155 }
nengel@2 156
nengel@3 157 typedef struct{
nengel@3 158 MBRecContext *d;
nengel@3 159 SliceBufferEntry *sbe;
nengel@3 160 SuperMBTask *ml;
nengel@3 161 SuperMBTask *mur;
nengel@3 162 SuperMBTask *m;
nengel@3 163 SuperMBContext *smbc;
nengel@3 164 } decode_super_mb_taskArgs;
nengel@3 165
nengel@3 166 int32 decode_super_mb_taskArgTypes[6] = {IN, IN, IN, IN, INOUT, NONCTLD};
nengel@3 167 int32 decode_super_mb_taskArgSizes[6] = {sizeof(MBRecContext), sizeof(SliceBufferEntry), sizeof(SuperMBTask), sizeof(SuperMBTask), sizeof(SuperMBTask), sizeof(SuperMBContext)};
nengel@3 168
nengel@3 169 //#pragma omp task input(*d, *sbe, *ml, *mur) inout(*m)
nengel@3 170 static void decode_super_mb_task(void *_data, SlaveVP *animatingSlv){
nengel@3 171 decode_super_mb_taskArgs* args = (decode_super_mb_taskArgs*) _data;
nengel@3 172 MBRecContext *d = args->d;
nengel@3 173 SliceBufferEntry *sbe = args->sbe;
nengel@3 174 SuperMBTask *ml = args->ml;
nengel@3 175 SuperMBTask *mur = args->mur;
nengel@3 176 SuperMBTask *m = args->m;
nengel@3 177 SuperMBContext *smbc = args->smbc;
nengel@2 178 H264Slice *s = &sbe->slice;
nengel@2 179 H264Mb *mbs = sbe->mbs;
nengel@2 180 decode_super_mb_block(d, s, smbc, mbs, m->smb_x, m->smb_y);
nengel@3 181 VSs__end_task( animatingSlv );
nengel@2 182 }
nengel@2 183
nengel@3 184 VSsTaskType decode_super_mb_taskType = {
nengel@3 185 .fn = &decode_super_mb_task,
nengel@3 186 .numCtldArgs = 5,
nengel@3 187 .numTotalArgs = 6,
nengel@3 188 .sizeOfArgs = sizeof(decode_super_mb_taskArgs),
nengel@3 189 .argTypes = decode_super_mb_taskArgTypes,
nengel@3 190 .argSizes = decode_super_mb_taskArgSizes};
nengel@3 191
nengel@3 192
nengel@3 193
nengel@3 194 typedef struct{
nengel@3 195 MBRecContext *d;
nengel@3 196 SliceBufferEntry *sbe;
nengel@3 197 SuperMBTask *sm;
nengel@3 198 SuperMBContext *smbc;
nengel@3 199 int* line;
nengel@3 200 } draw_edges_taskArgs;
nengel@3 201
nengel@3 202 int32 draw_edges_taskArgTypes[5] = {IN, IN, INOUT, NONCTLD, NONCTLD};
nengel@3 203 int32 draw_edges_taskArgSizes[5] = {sizeof(MBRecContext), sizeof(SliceBufferEntry), sizeof(SuperMBTask),sizeof(SuperMBContext),sizeof(int)};
nengel@3 204
nengel@3 205 //#pragma omp task input(*d, *sbe) inout(*sm)
nengel@3 206 static void draw_edges_task(void *_data, SlaveVP *animatingSlv){
nengel@3 207 draw_edges_taskArgs* args = (draw_edges_taskArgs*) _data;
nengel@3 208 MBRecContext *d = args->d;
nengel@3 209 SliceBufferEntry *sbe = args->sbe;
nengel@3 210 SuperMBTask *sm = args->sm;
nengel@3 211 SuperMBContext *smbc = args->smbc;
nengel@3 212 int line = *(args->line);
nengel@2 213 H264Slice *s = &sbe->slice;
nengel@2 214 for (int i=line*smbc->smb_height; i< (line+1)*smbc->smb_height && i< d->mb_height; i++)
nengel@2 215 draw_edges(d, s, i);
nengel@3 216 VSs__end_task( animatingSlv );
nengel@2 217 }
nengel@3 218 VSsTaskType draw_edges_taskType = {
nengel@3 219 .fn = &draw_edges_task,
nengel@3 220 .numCtldArgs = 3,
nengel@3 221 .numTotalArgs = 5,
nengel@3 222 .sizeOfArgs = sizeof(draw_edges_taskArgs),
nengel@3 223 .argTypes = draw_edges_taskArgTypes,
nengel@3 224 .argSizes = draw_edges_taskArgSizes};
nengel@2 225
nengel@3 226
nengel@3 227 static void decode_mb_in_slice(H264Context *h, MBRecContext *d, SliceBufferEntry *sbe, SlaveVP* animSlv){
nengel@2 228 int i,j;
nengel@2 229
nengel@2 230 SuperMBContext *smbc = acquire_smbc(h);
nengel@2 231 int smb_height =smbc->nsmb_height, smb_width= smbc->nsmb_width;
nengel@2 232 SuperMBTask *smbs = smbc->smbs[0];
nengel@2 233
nengel@2 234 SuperMBTask *sm=NULL, *sml, *smur;
nengel@2 235 for(j=0; j< smb_height; j++){
nengel@2 236 for(i=0; i< smb_width; i++){
nengel@2 237 sm = smbs + j*smb_width + i;
nengel@2 238 sml = sm - ((i > 0) ? 1: 0);
nengel@2 239 smur = sm + (((i < smb_width-1) && (j >0)) ? -smb_width+1: 0);
nengel@3 240 decode_super_mb_taskArgs decode_super_mb_task_args;
nengel@3 241 decode_super_mb_task_args.d = d;
nengel@3 242 decode_super_mb_task_args.sbe = sbe;
nengel@3 243 decode_super_mb_task_args.smbc = smbc;
nengel@3 244 decode_super_mb_task_args.ml = sml;
nengel@3 245 decode_super_mb_task_args.mur = smur;
nengel@3 246 decode_super_mb_task_args.m = sm;
nengel@3 247 VSs__submit_task(&decode_super_mb_taskType, &decode_super_mb_task_args, animSlv);
nengel@2 248 }
nengel@3 249 draw_edges_taskArgs draw_edges_task_args;
nengel@3 250 draw_edges_task_args.d = d;
nengel@3 251 draw_edges_task_args.sbe = sbe;
nengel@3 252 draw_edges_task_args.sm = sm;
nengel@3 253 draw_edges_task_args.smbc = smbc;
nengel@3 254 draw_edges_task_args.line = VMS_App__malloc( sizeof(int) );
nengel@3 255 *(draw_edges_task_args.line) = j;
nengel@3 256 VSs__submit_task(&draw_edges_taskType, &draw_edges_task_args, animSlv);
nengel@2 257 }
nengel@3 258 VSs__taskwait_on(animSlv,sm);
nengel@3 259 //#pragma omp taskwait on(*sm)
nengel@2 260
nengel@2 261 release_smbc(h, smbc);
nengel@2 262 }
nengel@2 263
nengel@3 264 typedef struct{
nengel@3 265 MBRecContext *d;
nengel@3 266 SliceBufferEntry *sbe;
nengel@3 267 H264Context *h;
nengel@3 268 } decode_slice_mb_taskArgs;
nengel@3 269
nengel@3 270 int32 decode_slice_mb_taskArgTypes[3] = {INOUT, INOUT, NONCTLD};
nengel@3 271 int32 decode_slice_mb_taskArgSizes[3] = {sizeof(MBRecContext), sizeof(SliceBufferEntry), sizeof(H264Context)};
nengel@3 272
nengel@3 273 //#pragma omp task inout(*d) inout(*sbe)
nengel@3 274 static void decode_slice_mb_task(void *_data, SlaveVP *animatingSlv){
nengel@3 275 decode_slice_mb_taskArgs* args = (decode_slice_mb_taskArgs*) _data;
nengel@3 276 MBRecContext *d = args->d;
nengel@3 277 SliceBufferEntry *sbe = args->sbe;
nengel@3 278 H264Context *h = args->h;
nengel@3 279
nengel@2 280 H264Slice *s = &sbe->slice;
nengel@2 281
nengel@2 282 for (int i=0; i<2; i++){
nengel@2 283 for(int j=0; j< s->ref_count[i]; j++){
nengel@2 284 if (s->ref_list_cpn[i][j] ==-1)
nengel@2 285 continue;
nengel@2 286 int k;
nengel@2 287 for (k=0; k< h->max_dpb_cnt; k++){
nengel@2 288 if(h->dpb[k].reference >= 2 && h->dpb[k].cpn == s->ref_list_cpn[i][j]){
nengel@2 289 s->dp_ref_list[i][j] = &h->dpb[k];
nengel@2 290 break;
nengel@2 291 }
nengel@2 292 }
nengel@2 293 }
nengel@2 294 }
nengel@2 295
nengel@3 296 //#pragma omp critical (dpb)
nengel@3 297 VSs__start_critical(animatingSlv,0);
nengel@2 298 get_dpb_entry(h, s);
nengel@3 299 VSs__end_critical(animatingSlv,0);
nengel@3 300
nengel@2 301 if (!h->no_mbd){
nengel@3 302 decode_mb_in_slice (h, d, sbe, animatingSlv);
nengel@2 303 }
nengel@2 304
nengel@2 305 for (int i=0; i<s->release_cnt; i++){
nengel@2 306 for(int j=0; j<h->max_dpb_cnt; j++){
nengel@2 307 if(h->dpb[j].cpn== s->release_ref_cpn[i]){
nengel@3 308 //#pragma omp critical (dpb)
nengel@3 309 VSs__start_critical(animatingSlv,0);
nengel@2 310 release_dpb_entry(h, &h->dpb[j], 2);
nengel@3 311 VSs__end_critical(animatingSlv,0);
nengel@2 312 break;
nengel@2 313 }
nengel@2 314 }
nengel@2 315 }
nengel@2 316 s->release_cnt=0;
nengel@3 317 VSs__end_task( animatingSlv );
nengel@2 318 }
nengel@2 319
nengel@3 320 VSsTaskType decode_slice_mb_taskType = {
nengel@3 321 .fn = &decode_slice_mb_task,
nengel@3 322 .numCtldArgs = 2,
nengel@3 323 .numTotalArgs = 3,
nengel@3 324 .sizeOfArgs = sizeof(decode_slice_mb_taskArgs),
nengel@3 325 .argTypes = decode_slice_mb_taskArgTypes,
nengel@3 326 .argSizes = decode_slice_mb_taskArgSizes};
nengel@3 327
nengel@2 328 // for static 3d wave
nengel@2 329 /*-------------------------------------------------------------------------------*/
nengel@3 330 typedef struct{
nengel@3 331 MBRecContext *d;
nengel@3 332 SliceBufferEntry *sbe;
nengel@3 333 SuperMBTask *ml;
nengel@3 334 SuperMBTask *mur;
nengel@3 335 SuperMBTask *mprev;
nengel@3 336 SuperMBTask *m;
nengel@3 337 SuperMBContext *smbc;
nengel@3 338 } decode_3dwave_super_mb_taskArgs;
nengel@3 339
nengel@3 340 int32 decode_3dwave_super_mb_taskArgTypes[7] = {IN, IN, IN, IN, IN, INOUT, NONCTLD};
nengel@3 341 int32 decode_3dwave_super_mb_taskArgSizes[7] = {sizeof(MBRecContext), sizeof(SliceBufferEntry), sizeof(SuperMBTask),
nengel@3 342 sizeof(SuperMBTask), sizeof(SuperMBTask), sizeof(SuperMBTask), sizeof(SuperMBContext)};
nengel@3 343
nengel@3 344 //#pragma omp task input(*d, *sbe, *ml, *mur, *mprev) inout(*m)
nengel@3 345 static void decode_3dwave_super_mb_task(void *_data, SlaveVP *animatingSlv){
nengel@3 346 decode_3dwave_super_mb_taskArgs* args = (decode_3dwave_super_mb_taskArgs*) _data;
nengel@3 347 MBRecContext *d = args->d;
nengel@3 348 SliceBufferEntry *sbe = args->sbe;
nengel@3 349 SuperMBTask *ml = args->ml;
nengel@3 350 SuperMBTask *mur = args->mur;
nengel@3 351 SuperMBTask *mprev = args->mprev;
nengel@3 352 SuperMBTask *m = args->m;
nengel@3 353 SuperMBContext *smbc = args->smbc;
nengel@3 354
nengel@2 355 H264Slice *s = &sbe->slice;
nengel@2 356 H264Mb *mbs = sbe->mbs;
nengel@2 357
nengel@2 358 decode_super_mb_block(d, s, smbc, mbs, m->smb_x, m->smb_y);
nengel@3 359 VSs__end_task( animatingSlv );
nengel@2 360 }
nengel@2 361
nengel@3 362 VSsTaskType decode_3dwave_super_mb_taskType = {
nengel@3 363 .fn = &decode_3dwave_super_mb_task,
nengel@3 364 .numCtldArgs = 6,
nengel@3 365 .numTotalArgs = 7,
nengel@3 366 .sizeOfArgs = sizeof(decode_3dwave_super_mb_taskArgs),
nengel@3 367 .argTypes = decode_3dwave_super_mb_taskArgTypes,
nengel@3 368 .argSizes = decode_3dwave_super_mb_taskArgSizes};
nengel@3 369
nengel@2 370 // int init_ref_count=0;
nengel@3 371 typedef struct{
nengel@3 372 MBRecContext *d;
nengel@3 373 SliceBufferEntry *sbe;
nengel@3 374 int* init;
nengel@3 375 H264Context *h;
nengel@3 376 } init_ref_list_and_get_dpb_taskArgs;
nengel@3 377
nengel@3 378 int32 init_ref_list_and_get_dpb_taskArgTypes[4] = {INOUT, INOUT, INOUT, NONCTLD};
nengel@3 379 int32 init_ref_list_and_get_dpb_taskArgSizes[4] = {sizeof(MBRecContext), sizeof(SliceBufferEntry), sizeof(int), sizeof(H264Context)};
nengel@3 380
nengel@3 381 //#pragma omp task inout(*d, *sbe, *init)
nengel@3 382 static void init_ref_list_and_get_dpb_task(void *_data, SlaveVP *animatingSlv){
nengel@3 383 init_ref_list_and_get_dpb_taskArgs* args = (init_ref_list_and_get_dpb_taskArgs*) _data;
nengel@3 384 MBRecContext *d = args->d;
nengel@3 385 SliceBufferEntry *sbe = args->sbe;
nengel@3 386 int* initp = args->init;
nengel@3 387 H264Context *h = args->h;
nengel@3 388
nengel@2 389 H264Slice *s = &sbe->slice;
nengel@2 390 for (int i=0; i<2; i++){
nengel@2 391 for(int j=0; j< s->ref_count[i]; j++){
nengel@2 392 if (s->ref_list_cpn[i][j] ==-1)
nengel@2 393 continue;
nengel@2 394 int k;
nengel@2 395 for (k=0; k<h->max_dpb_cnt; k++){
nengel@2 396 if(h->dpb[k].reference >= 2 && h->dpb[k].cpn == s->ref_list_cpn[i][j]){
nengel@2 397 s->dp_ref_list[i][j] = &h->dpb[k];
nengel@2 398 break;
nengel@2 399 }
nengel@2 400 }
nengel@2 401 }
nengel@2 402 }
nengel@2 403
nengel@3 404 //#pragma omp critical (dpb)
nengel@3 405 VSs__start_critical(animatingSlv,0);
nengel@2 406 get_dpb_entry(h, s);
nengel@3 407 VSs__end_critical(animatingSlv,0);
nengel@3 408
nengel@3 409 VSs__end_task( animatingSlv );
nengel@2 410 }
nengel@2 411
nengel@3 412 VSsTaskType init_ref_list_and_get_dpb_taskType = {
nengel@3 413 .fn = &init_ref_list_and_get_dpb_task,
nengel@3 414 .numCtldArgs = 3,
nengel@3 415 .numTotalArgs = 4,
nengel@3 416 .sizeOfArgs = sizeof(init_ref_list_and_get_dpb_taskArgs),
nengel@3 417 .argTypes = init_ref_list_and_get_dpb_taskArgTypes,
nengel@3 418 .argSizes = init_ref_list_and_get_dpb_taskArgSizes};
nengel@3 419
nengel@3 420 static SuperMBTask* add_decode_slice_3dwave_tasks(MBRecContext *d, SliceBufferEntry *sbe, SuperMBContext *smbc, SlaveVP* animSlv){
nengel@2 421 int i,j;
nengel@2 422
nengel@2 423 int smb_3d_height =smbc->nsmb_3dheight;
nengel@2 424 int smb_height =smbc->nsmb_height, smb_width= smbc->nsmb_width;
nengel@2 425 int smb_diff_prev = smb_height - smb_3d_height;
nengel@2 426 SuperMBTask *sm=NULL, *sml, *smur, *smprev;
nengel@2 427
nengel@2 428 SuperMBTask *smbs = smbc->smbs[smbc->index++]; smbc->index%=2;
nengel@2 429 SuperMBTask *smbs_prev = smbc->smbs[smbc->index]; // index rotates -> next == prev
nengel@2 430
nengel@2 431 for(j=0; j<smb_3d_height ; j++){
nengel@2 432 for(i=0; i< smb_width; i++){
nengel@2 433 sm = smbs + j*smb_width + i;
nengel@2 434 sml = sm - ((i > 0) ? 1: 0);
nengel@2 435 smur = sm + (((i < smb_width-1) && (j >0)) ? -smb_width+1: 0);
nengel@2 436 smprev = smbs_prev + (j + smb_diff_prev+1)*smb_width -1;
nengel@3 437 decode_3dwave_super_mb_taskArgs decode_3dwave_super_mb_task_args;
nengel@3 438 decode_3dwave_super_mb_task_args.d = d;
nengel@3 439 decode_3dwave_super_mb_task_args.sbe = sbe;
nengel@3 440 decode_3dwave_super_mb_task_args.smbc = smbc;
nengel@3 441 decode_3dwave_super_mb_task_args.ml = sml;
nengel@3 442 decode_3dwave_super_mb_task_args.mur = smur;
nengel@3 443 decode_3dwave_super_mb_task_args.mprev = smprev;
nengel@3 444 decode_3dwave_super_mb_task_args.m = sm;
nengel@3 445 VSs__submit_task(&decode_3dwave_super_mb_taskType, &decode_3dwave_super_mb_task_args, animSlv);
nengel@2 446 }
nengel@3 447 draw_edges_taskArgs draw_edges_task_args;
nengel@3 448 draw_edges_task_args.d = d;
nengel@3 449 draw_edges_task_args.sbe = sbe;
nengel@3 450 draw_edges_task_args.sm = sm;
nengel@3 451 draw_edges_task_args.smbc = smbc;
nengel@3 452 draw_edges_task_args.line = VMS_App__malloc( sizeof(int) );
nengel@3 453 *(draw_edges_task_args.line) = j;
nengel@3 454 VSs__submit_task(&draw_edges_taskType, &draw_edges_task_args, animSlv);
nengel@2 455 }
nengel@2 456
nengel@2 457 for(; j< smb_height; j++){
nengel@2 458 for(i=0; i< smb_width; i++){
nengel@2 459 sm = smbs + j*smb_width + i;
nengel@2 460 sml = sm - ((i > 0) ? 1: 0);
nengel@2 461 smur = sm + (((i < smb_width-1) && (j >0)) ? -smb_width+1: 0);
nengel@3 462 decode_super_mb_taskArgs decode_super_mb_task_args;
nengel@3 463 decode_super_mb_task_args.d = d;
nengel@3 464 decode_super_mb_task_args.sbe = sbe;
nengel@3 465 decode_super_mb_task_args.smbc = smbc;
nengel@3 466 decode_super_mb_task_args.ml = sml;
nengel@3 467 decode_super_mb_task_args.mur = smur;
nengel@3 468 decode_super_mb_task_args.m = sm;
nengel@3 469 VSs__submit_task(&decode_super_mb_taskType, &decode_super_mb_task_args, animSlv);
nengel@2 470 }
nengel@3 471 draw_edges_taskArgs draw_edges_task_args;
nengel@3 472 draw_edges_task_args.d = d;
nengel@3 473 draw_edges_task_args.sbe = sbe;
nengel@3 474 draw_edges_task_args.sm = sm;
nengel@3 475 draw_edges_task_args.smbc = smbc;
nengel@3 476 draw_edges_task_args.line = VMS_App__malloc( sizeof(int) );
nengel@3 477 *(draw_edges_task_args.line) = j;
nengel@3 478 VSs__submit_task(&draw_edges_taskType, &draw_edges_task_args, animSlv);
nengel@2 479 }
nengel@2 480 return sm;
nengel@2 481 }
nengel@2 482
nengel@3 483 typedef struct{
nengel@3 484 MBRecContext *d;
nengel@3 485 SliceBufferEntry *sbe;
nengel@3 486 SuperMBTask *lastsmb;
nengel@3 487 int* release;
nengel@3 488 H264Context *h;
nengel@3 489 SuperMBContext *smbc;
nengel@3 490 } release_ref_list_taskArgs;
nengel@3 491
nengel@3 492 int32 release_ref_list_taskArgTypes[6] = {INOUT, INOUT, IN, INOUT, NONCTLD, NONCTLD};
nengel@3 493 int32 release_ref_list_taskArgSizes[6] = {sizeof(MBRecContext), sizeof(SliceBufferEntry), sizeof(SuperMBTask), sizeof(int), sizeof(H264Context), sizeof(SuperMBContext)};
nengel@3 494
nengel@3 495 //#pragma omp task inout(*d, *sbe, *release) input (*lastsmb)
nengel@3 496 static void release_ref_list_task(void *_data, SlaveVP *animatingSlv){
nengel@3 497 release_ref_list_taskArgs* args = (release_ref_list_taskArgs*) _data;
nengel@3 498 MBRecContext *d = args->d;
nengel@3 499 SliceBufferEntry *sbe = args->sbe;
nengel@3 500 SuperMBTask *lastsmb = args->lastsmb;
nengel@3 501 int* releasep = args->release;
nengel@3 502 H264Context *h = args->h;
nengel@3 503 SuperMBContext *smbc = args->smbc;
nengel@3 504
nengel@2 505 H264Slice *s = &sbe->slice;
nengel@2 506 for (int i=0; i<s->release_cnt; i++){
nengel@2 507 for(int j=0; j<h->max_dpb_cnt; j++){
nengel@2 508 if(h->dpb[j].cpn== s->release_ref_cpn[i]){
nengel@3 509 //#pragma omp critical (dpb)
nengel@3 510 VSs__start_critical(animatingSlv,0);
nengel@2 511 release_dpb_entry(h, &h->dpb[j], 2);
nengel@3 512 VSs__end_critical(animatingSlv,0);
nengel@2 513 break;
nengel@2 514 }
nengel@2 515 }
nengel@2 516 }
nengel@2 517 s->release_cnt=0;
nengel@2 518
nengel@2 519 release_smbc(h, smbc);
nengel@2 520
nengel@3 521 VSs__end_task( animatingSlv );
nengel@2 522 }
nengel@2 523
nengel@3 524 VSsTaskType release_ref_list_taskType = {
nengel@3 525 .fn = &release_ref_list_task,
nengel@3 526 .numCtldArgs = 4,
nengel@3 527 .numTotalArgs = 6,
nengel@3 528 .sizeOfArgs = sizeof(release_ref_list_taskArgs),
nengel@3 529 .argTypes = release_ref_list_taskArgTypes,
nengel@3 530 .argSizes = release_ref_list_taskArgSizes};
nengel@3 531
nengel@2 532 // static void decode_mb_static_3dwave(H264Context *h, int mb_height, int mb_width, MBRecContext *d, H264Slice *s, H264Mb *mbs, SuperMBTask *smbs, SuperMBTask *smbs_prev){
nengel@2 533 //
nengel@2 534 // }
nengel@2 535 /*-------------------------------------------------------------------------------*/
nengel@2 536 //end for static 3d wave
nengel@2 537
nengel@3 538 typedef struct{
nengel@3 539 OutputContext *oc;
nengel@3 540 SliceBufferEntry *sbe;
nengel@3 541 H264Context *h;
nengel@3 542 } output_taskArgs;
nengel@3 543
nengel@3 544 int32 output_taskArgTypes[3] = {INOUT, IN, NONCTLD};
nengel@3 545 int32 output_taskArgSizes[3] = {sizeof(OutputContext), sizeof(SliceBufferEntry), sizeof(H264Context)};
nengel@3 546
nengel@3 547 //#pragma omp task inout (*oc) input(*sbe)
nengel@3 548 static void output_task(void *_data, SlaveVP *animatingSlv){
nengel@3 549 output_taskArgs* args = (output_taskArgs*) _data;
nengel@3 550 OutputContext *oc = args->oc;
nengel@3 551 SliceBufferEntry *sbe = args->sbe;
nengel@3 552 H264Context *h = args->h;
nengel@3 553
nengel@2 554 DecodedPicture* out =output_frame(h, oc, sbe->slice.curr_pic, h->ofile, h->frame_width, h->frame_height);
nengel@2 555 if (out){
nengel@3 556 //#pragma omp critical (dpb)
nengel@3 557 VSs__start_critical(animatingSlv,0);
nengel@2 558 release_dpb_entry(h, out, 1);
nengel@3 559 VSs__end_critical(animatingSlv,0);
nengel@2 560 }
nengel@2 561 print_report(oc->frame_number, oc->video_size, 0, h->verbose);
nengel@3 562
nengel@3 563 VSs__end_task( animatingSlv );
nengel@2 564 }
nengel@2 565
nengel@3 566 VSsTaskType output_taskType = {
nengel@3 567 .fn = &output_task,
nengel@3 568 .numCtldArgs = 2,
nengel@3 569 .numTotalArgs = 3,
nengel@3 570 .sizeOfArgs = sizeof(output_taskArgs),
nengel@3 571 .argTypes = output_taskArgTypes,
nengel@3 572 .argSizes = output_taskArgSizes};
nengel@3 573
nengel@2 574 /*
nengel@2 575 * The following code is the main loop of the file converter
nengel@2 576 */
nengel@2 577 //Put VMS entry point here
nengel@3 578
nengel@3 579 void h264_decode_ompss( void *_params, SlaveVP *animSlv) {
nengel@3 580 H264Context* h = (H264Context*) _params;
nengel@3 581
nengel@2 582 const int bufs = h->pipe_bufs;
nengel@2 583
nengel@2 584 ParserContext *pc;
nengel@2 585 NalContext *nc;
nengel@2 586 EntropyContext *ec[bufs];
nengel@2 587 MBRecContext *rc[2];
nengel@2 588 OutputContext *oc;
nengel@2 589 SliceBufferEntry *sbe;
nengel@2 590 SuperMBContext *smbc;
nengel@2 591
nengel@2 592 DecodedPicture *out;
nengel@2 593 int frames=0;
nengel@4 594
nengel@4 595 int32* taskID;
nengel@2 596
nengel@2 597 #if HAVE_LIBSDL2
nengel@2 598 pthread_t sdl_thr;
nengel@2 599 if (h->display){
nengel@2 600 pthread_create(&sdl_thr, NULL, sdl_thread, h);
nengel@2 601 }
nengel@2 602 #endif
nengel@3 603 /*sbe= VMS_WL__malloc(sizeof(SliceBufferEntry) * bufs);
nengel@3 604 if (sbe)
nengel@3 605 memset(sbe, 0, sizeof(SliceBufferEntry) * bufs);*/
nengel@2 606 sbe= av_mallocz(sizeof(SliceBufferEntry) * bufs);
nengel@2 607
nengel@2 608 pc = get_parse_context(h->ifile);
nengel@2 609 nc = get_nal_context(h->width, h->height);
nengel@2 610
nengel@2 611 for(int i=0; i<bufs; i++){
nengel@2 612 ec[i] = get_entropy_context( h );
nengel@2 613 }
nengel@2 614
nengel@2 615 for(int i=0; i<2; i++){
nengel@2 616 rc[i] = get_mbrec_context(h);
nengel@2 617 }
nengel@2 618
nengel@2 619 oc = get_output_context( h );
nengel@2 620
nengel@2 621 av_start_timer();
nengel@2 622 int k=0; int init, release;
nengel@2 623 if (h->static_3d && bufs < h->num_frames ){
nengel@2 624 int num_pre_ed =0;
nengel@2 625 for (num_pre_ed=0; num_pre_ed< bufs -1 && !pc->final_frame; num_pre_ed++){
nengel@3 626 parse_taskArgs parse_task_args;
nengel@3 627 parse_task_args.h = h;
nengel@3 628 parse_task_args.pc = pc;
nengel@3 629 parse_task_args.nc = nc;
nengel@3 630 parse_task_args.sbe = &sbe[k%bufs];
nengel@4 631 taskID = VSs__create_taskID_of_size(2,animSlv );
nengel@4 632 taskID[1] = 1;
nengel@4 633 taskID[2] = num_pre_ed;
nengel@4 634 VSs__submit_task_with_ID(&parse_taskType, &parse_task_args, taskID, animSlv);
nengel@3 635
nengel@3 636 decode_slice_entropy_taskArgs decode_slice_entropy_task_args;
nengel@3 637 decode_slice_entropy_task_args.h = h;
nengel@3 638 decode_slice_entropy_task_args.ec = ec[k%bufs];
nengel@3 639 decode_slice_entropy_task_args.sbe = &sbe[k%bufs];
nengel@4 640 taskID = VSs__create_taskID_of_size(2,animSlv );
nengel@4 641 taskID[1] = 2;
nengel@4 642 taskID[2] = num_pre_ed;
nengel@4 643 VSs__submit_task_with_ID(&decode_slice_entropy_taskType, &decode_slice_entropy_task_args, taskID, animSlv);
nengel@3 644 //#pragma omp taskwait on(*pc)
nengel@3 645 VSs__taskwait_on(animSlv,pc);
nengel@2 646 k++;
nengel@2 647 }
nengel@2 648
nengel@2 649 while(!pc->final_frame && frames++ < h->num_frames && !h->quit){
nengel@3 650 parse_taskArgs parse_task_args;
nengel@3 651 parse_task_args.h = h;
nengel@3 652 parse_task_args.pc = pc;
nengel@3 653 parse_task_args.nc = nc;
nengel@3 654 parse_task_args.sbe = &sbe[k%bufs];
nengel@4 655 taskID = VSs__create_taskID_of_size(2,animSlv );
nengel@4 656 taskID[1] = 3;
nengel@4 657 taskID[2] = frames;
nengel@4 658 VSs__submit_task_with_ID(&parse_taskType, &parse_task_args, taskID, animSlv);
nengel@3 659
nengel@3 660 decode_slice_entropy_taskArgs decode_slice_entropy_task_args;
nengel@3 661 decode_slice_entropy_task_args.h = h;
nengel@3 662 decode_slice_entropy_task_args.ec = ec[k%bufs];
nengel@3 663 decode_slice_entropy_task_args.sbe = &sbe[k%bufs];
nengel@4 664 taskID = VSs__create_taskID_of_size(2,animSlv );
nengel@4 665 taskID[1] = 4;
nengel@4 666 taskID[2] = frames;
nengel@4 667 VSs__submit_task_with_ID(&decode_slice_entropy_taskType, &decode_slice_entropy_task_args, taskID, animSlv);
nengel@2 668
nengel@2 669 k++;
nengel@3 670
nengel@3 671 init_ref_list_and_get_dpb_taskArgs init_ref_list_and_get_dpb_task_args;
nengel@3 672 init_ref_list_and_get_dpb_task_args.h = h;
nengel@3 673 init_ref_list_and_get_dpb_task_args.d = rc[k%2];
nengel@3 674 init_ref_list_and_get_dpb_task_args.sbe = &sbe[k%bufs];
nengel@3 675 init_ref_list_and_get_dpb_task_args.init = &init;
nengel@4 676 taskID = VSs__create_taskID_of_size(2,animSlv );
nengel@4 677 taskID[1] = 5;
nengel@4 678 taskID[2] = frames;
nengel@4 679 VSs__submit_task_with_ID(&init_ref_list_and_get_dpb_taskType, &init_ref_list_and_get_dpb_task_args, taskID, animSlv);
nengel@2 680
nengel@2 681 smbc = acquire_smbc(h);
nengel@3 682 SuperMBTask *lastsmb= add_decode_slice_3dwave_tasks(rc[k%2], &sbe[k%bufs], smbc, animSlv);
nengel@3 683 release_ref_list_taskArgs release_ref_list_task_args;
nengel@3 684 release_ref_list_task_args.h = h;
nengel@3 685 release_ref_list_task_args.smbc = smbc;
nengel@3 686 release_ref_list_task_args.d = rc[k%2];
nengel@3 687 release_ref_list_task_args.sbe = &sbe[k%bufs];
nengel@3 688 release_ref_list_task_args.lastsmb = lastsmb;
nengel@3 689 release_ref_list_task_args.release = &release;
nengel@4 690 taskID = VSs__create_taskID_of_size(2,animSlv );
nengel@4 691 taskID[1] = 6;
nengel@4 692 taskID[2] = frames;
nengel@4 693 VSs__submit_task_with_ID(&release_ref_list_taskType, &release_ref_list_task_args, taskID, animSlv);
nengel@2 694
nengel@3 695 output_taskArgs output_task_args;
nengel@3 696 output_task_args.h = h;
nengel@3 697 output_task_args.oc = oc;
nengel@3 698 output_task_args.sbe = &sbe[k%bufs];
nengel@4 699 taskID = VSs__create_taskID_of_size(2,animSlv );
nengel@4 700 taskID[1] = 7;
nengel@4 701 taskID[2] = frames;
nengel@4 702 VSs__submit_task_with_ID(&output_taskType, &output_task_args, taskID, animSlv);
nengel@3 703 //#pragma omp taskwait on(*pc)
nengel@3 704 VSs__taskwait_on(animSlv,pc);
nengel@2 705 }
nengel@2 706
nengel@2 707 for (int i=0; i< num_pre_ed; i++){
nengel@2 708 k++;
nengel@3 709 init_ref_list_and_get_dpb_taskArgs init_ref_list_and_get_dpb_task_args;
nengel@3 710 init_ref_list_and_get_dpb_task_args.h = h;
nengel@3 711 init_ref_list_and_get_dpb_task_args.d = rc[k%2];
nengel@3 712 init_ref_list_and_get_dpb_task_args.sbe = &sbe[k%bufs];
nengel@3 713 init_ref_list_and_get_dpb_task_args.init = &init;
nengel@4 714 taskID = VSs__create_taskID_of_size(2,animSlv );
nengel@4 715 taskID[1] = 8;
nengel@4 716 taskID[2] = i;
nengel@4 717 VSs__submit_task_with_ID(&init_ref_list_and_get_dpb_taskType, &init_ref_list_and_get_dpb_task_args, taskID, animSlv);
nengel@2 718 smbc = acquire_smbc(h);
nengel@3 719 SuperMBTask *lastsmb= add_decode_slice_3dwave_tasks(rc[k%2], &sbe[k%bufs], smbc, animSlv);
nengel@3 720 release_ref_list_taskArgs release_ref_list_task_args;
nengel@3 721 release_ref_list_task_args.h = h;
nengel@3 722 release_ref_list_task_args.smbc = smbc;
nengel@3 723 release_ref_list_task_args.d = rc[k%2];
nengel@3 724 release_ref_list_task_args.sbe = &sbe[k%bufs];
nengel@3 725 release_ref_list_task_args.lastsmb = lastsmb;
nengel@3 726 release_ref_list_task_args.release = &release;
nengel@4 727 taskID = VSs__create_taskID_of_size(2,animSlv );
nengel@4 728 taskID[1] = 9;
nengel@4 729 taskID[2] = frames;
nengel@4 730 VSs__submit_task_with_ID(&release_ref_list_taskType, &release_ref_list_task_args, taskID, animSlv);
nengel@2 731
nengel@3 732 output_taskArgs output_task_args;
nengel@3 733 output_task_args.h = h;
nengel@3 734 output_task_args.oc = oc;
nengel@3 735 output_task_args.sbe = &sbe[k%bufs];
nengel@4 736 taskID = VSs__create_taskID_of_size(2,animSlv );
nengel@4 737 taskID[1] = 10;
nengel@4 738 taskID[2] = frames;
nengel@4 739 VSs__submit_task_with_ID(&output_taskType, &output_task_args, taskID, animSlv);
nengel@2 740 }
nengel@2 741
nengel@2 742 } else {
nengel@2 743 while(!pc->final_frame && frames++ < h->num_frames && !h->quit){
nengel@4 744
nengel@3 745 taskID = VSs__create_taskID_of_size(1,animSlv );
nengel@3 746 taskID[1] = frames*10+1;
nengel@3 747 parse_taskArgs parse_task_args;
nengel@3 748 parse_task_args.h = h;
nengel@3 749 parse_task_args.pc = pc;
nengel@3 750 parse_task_args.nc = nc;
nengel@3 751 parse_task_args.sbe = &sbe[k%bufs];
nengel@3 752 VSs__submit_task_with_ID(&parse_taskType, &parse_task_args, taskID, animSlv);
nengel@2 753
nengel@3 754 taskID = VSs__create_taskID_of_size(1,animSlv );
nengel@3 755 taskID[1] = frames*10+2;
nengel@3 756 decode_slice_entropy_taskArgs decode_slice_entropy_task_args;
nengel@3 757 decode_slice_entropy_task_args.h = h;
nengel@3 758 decode_slice_entropy_task_args.ec = ec[k%bufs];
nengel@3 759 decode_slice_entropy_task_args.sbe = &sbe[k%bufs];
nengel@3 760 VSs__submit_task_with_ID(&decode_slice_entropy_taskType, &decode_slice_entropy_task_args,taskID, animSlv);
nengel@2 761
nengel@3 762 taskID = VSs__create_taskID_of_size(1,animSlv );
nengel@3 763 taskID[1] = frames*10+3;
nengel@3 764 decode_slice_mb_taskArgs decode_slice_mb_task_args;
nengel@3 765 decode_slice_mb_task_args.h = h;
nengel@3 766 decode_slice_mb_task_args.d = rc[0];
nengel@3 767 decode_slice_mb_task_args.sbe = &sbe[k%bufs];
nengel@3 768 VSs__submit_task_with_ID(&decode_slice_mb_taskType, &decode_slice_mb_task_args,taskID, animSlv);
nengel@2 769
nengel@3 770 taskID = VSs__create_taskID_of_size(1,animSlv );
nengel@3 771 taskID[1] = frames*10+4;
nengel@3 772 output_taskArgs output_task_args;
nengel@3 773 output_task_args.h = h;
nengel@3 774 output_task_args.oc = oc;
nengel@3 775 output_task_args.sbe = &sbe[k%bufs];
nengel@3 776 VSs__submit_task_with_ID(&output_taskType, &output_task_args,taskID, animSlv);
nengel@3 777 //#pragma omp taskwait on(*pc)
nengel@3 778 VSs__taskwait_on(animSlv,pc);
nengel@2 779 k++;
nengel@2 780 }
nengel@2 781 }
nengel@3 782 //#pragma omp taskwait
nengel@3 783 VSs__taskwait(animSlv);
nengel@3 784
nengel@2 785 while ((out=output_frame(h, oc, NULL, h->ofile, h->frame_width, h->frame_height))) ;
nengel@2 786
nengel@2 787 print_report(oc->frame_number, oc->video_size, 1, h->verbose);
nengel@2 788 h->num_frames = oc->frame_number;
nengel@2 789 /* finished ! */
nengel@2 790
nengel@2 791 free_parse_context(pc);
nengel@2 792 free_nal_context (nc);
nengel@2 793 free_output_context(oc);
nengel@2 794 for (int i=0; i<bufs; i++){
nengel@2 795 free_sb_entry(&sbe[i]);
nengel@2 796 free_entropy_context(ec[i]);
nengel@2 797 }
nengel@2 798 av_free(sbe);
nengel@2 799
nengel@2 800 for (int i=0; i<2; i++){
nengel@2 801 free_mbrec_context(rc[i]);
nengel@2 802 }
nengel@2 803
nengel@2 804 #if HAVE_LIBSDL2
nengel@2 805 if (h->display){
nengel@2 806 signal_sdl_exit(h);
nengel@2 807 pthread_join(sdl_thr, NULL);
nengel@2 808 }
nengel@2 809 #endif
nengel@2 810
nengel@3 811 VSs__end_thread( animSlv );
nengel@2 812 }