Revision e7015b41 libavcodec/vp3.c

View differences:

libavcodec/vp3.c
311 311
    int32_t *ip = intermediate_data;
312 312
    int16_t *op = output_data;
313 313

  
314
    int32_t _A, _B, _C, _D, _Ad, _Bd, _Cd, _Dd, _E, _F, _G, _H;
314
    int32_t A_, B_, C_, D_, _Ad, _Bd, _Cd, _Dd, E_, F_, G_, H_;
315 315
    int32_t _Ed, _Gd, _Add, _Bdd, _Fd, _Hd;
316 316
    int32_t t1, t2;
317 317

  
......
348 348
            t2 = (int32_t)(xC7S1 * ip[7]);
349 349
            t1 >>= 16;
350 350
            t2 >>= 16;
351
            _A = t1 + t2;
351
            A_ = t1 + t2;
352 352

  
353 353
            t1 = (int32_t)(xC7S1 * ip[1]);
354 354
            t2 = (int32_t)(xC1S7 * ip[7]);
355 355
            t1 >>= 16;
356 356
            t2 >>= 16;
357
            _B = t1 - t2;
357
            B_ = t1 - t2;
358 358

  
359 359
            t1 = (int32_t)(xC3S5 * ip[3]);
360 360
            t2 = (int32_t)(xC5S3 * ip[5]);
361 361
            t1 >>= 16;
362 362
            t2 >>= 16;
363
            _C = t1 + t2;
363
            C_ = t1 + t2;
364 364

  
365 365
            t1 = (int32_t)(xC3S5 * ip[5]);
366 366
            t2 = (int32_t)(xC5S3 * ip[3]);
367 367
            t1 >>= 16;
368 368
            t2 >>= 16;
369
            _D = t1 - t2;
369
            D_ = t1 - t2;
370 370

  
371 371

  
372
            t1 = (int32_t)(xC4S4 * (_A - _C));
372
            t1 = (int32_t)(xC4S4 * (A_ - C_));
373 373
            t1 >>= 16;
374 374
            _Ad = t1;
375 375

  
376
            t1 = (int32_t)(xC4S4 * (_B - _D));
376
            t1 = (int32_t)(xC4S4 * (B_ - D_));
377 377
            t1 >>= 16;
378 378
            _Bd = t1;
379 379

  
380 380

  
381
            _Cd = _A + _C;
382
            _Dd = _B + _D;
381
            _Cd = A_ + C_;
382
            _Dd = B_ + D_;
383 383

  
384 384
            t1 = (int32_t)(xC4S4 * (ip[0] + ip[4]));
385 385
            t1 >>= 16;
386
            _E = t1;
386
            E_ = t1;
387 387

  
388 388
            t1 = (int32_t)(xC4S4 * (ip[0] - ip[4]));
389 389
            t1 >>= 16;
390
            _F = t1;
390
            F_ = t1;
391 391

  
392 392
            t1 = (int32_t)(xC2S6 * ip[2]);
393 393
            t2 = (int32_t)(xC6S2 * ip[6]);
394 394
            t1 >>= 16;
395 395
            t2 >>= 16;
396
            _G = t1 + t2;
396
            G_ = t1 + t2;
397 397

  
398 398
            t1 = (int32_t)(xC6S2 * ip[2]);
399 399
            t2 = (int32_t)(xC2S6 * ip[6]);
400 400
            t1 >>= 16;
401 401
            t2 >>= 16;
402
            _H = t1 - t2;
402
            H_ = t1 - t2;
403 403

  
404 404

  
405
            _Ed = _E - _G;
406
            _Gd = _E + _G;
405
            _Ed = E_ - G_;
406
            _Gd = E_ + G_;
407 407

  
408
            _Add = _F + _Ad;
409
            _Bdd = _Bd - _H;
408
            _Add = F_ + _Ad;
409
            _Bdd = _Bd - H_;
410 410

  
411
            _Fd = _F - _Ad;
412
            _Hd = _Bd + _H;
411
            _Fd = F_ - _Ad;
412
            _Hd = _Bd + H_;
413 413

  
414 414
            /*  Final sequence of operations over-write original inputs. */
415 415
            ip[0] = (int16_t)((_Gd + _Cd )   >> 0);
......
440 440
            t2 = (int32_t)(xC7S1 * ip[7*8]);
441 441
            t1 >>= 16;
442 442
            t2 >>= 16;
443
            _A = t1 + t2;
443
            A_ = t1 + t2;
444 444

  
445 445
            t1 = (int32_t)(xC7S1 * ip[1*8]);
446 446
            t2 = (int32_t)(xC1S7 * ip[7*8]);
447 447
            t1 >>= 16;
448 448
            t2 >>= 16;
449
            _B = t1 - t2;
449
            B_ = t1 - t2;
450 450

  
451 451
            t1 = (int32_t)(xC3S5 * ip[3*8]);
452 452
            t2 = (int32_t)(xC5S3 * ip[5*8]);
453 453
            t1 >>= 16;
454 454
            t2 >>= 16;
455
            _C = t1 + t2;
455
            C_ = t1 + t2;
456 456

  
457 457
            t1 = (int32_t)(xC3S5 * ip[5*8]);
458 458
            t2 = (int32_t)(xC5S3 * ip[3*8]);
459 459
            t1 >>= 16;
460 460
            t2 >>= 16;
461
            _D = t1 - t2;
461
            D_ = t1 - t2;
462 462

  
463 463

  
464
            t1 = (int32_t)(xC4S4 * (_A - _C));
464
            t1 = (int32_t)(xC4S4 * (A_ - C_));
465 465
            t1 >>= 16;
466 466
            _Ad = t1;
467 467

  
468
            t1 = (int32_t)(xC4S4 * (_B - _D));
468
            t1 = (int32_t)(xC4S4 * (B_ - D_));
469 469
            t1 >>= 16;
470 470
            _Bd = t1;
471 471

  
472 472

  
473
            _Cd = _A + _C;
474
            _Dd = _B + _D;
473
            _Cd = A_ + C_;
474
            _Dd = B_ + D_;
475 475

  
476 476
            t1 = (int32_t)(xC4S4 * (ip[0*8] + ip[4*8]));
477 477
            t1 >>= 16;
478
            _E = t1;
478
            E_ = t1;
479 479

  
480 480
            t1 = (int32_t)(xC4S4 * (ip[0*8] - ip[4*8]));
481 481
            t1 >>= 16;
482
            _F = t1;
482
            F_ = t1;
483 483

  
484 484
            t1 = (int32_t)(xC2S6 * ip[2*8]);
485 485
            t2 = (int32_t)(xC6S2 * ip[6*8]);
486 486
            t1 >>= 16;
487 487
            t2 >>= 16;
488
            _G = t1 + t2;
488
            G_ = t1 + t2;
489 489

  
490 490
            t1 = (int32_t)(xC6S2 * ip[2*8]);
491 491
            t2 = (int32_t)(xC2S6 * ip[6*8]);
492 492
            t1 >>= 16;
493 493
            t2 >>= 16;
494
            _H = t1 - t2;
494
            H_ = t1 - t2;
495 495

  
496 496

  
497
            _Ed = _E - _G;
498
            _Gd = _E + _G;
497
            _Ed = E_ - G_;
498
            _Gd = E_ + G_;
499 499

  
500
            _Add = _F + _Ad;
501
            _Bdd = _Bd - _H;
500
            _Add = F_ + _Ad;
501
            _Bdd = _Bd - H_;
502 502

  
503
            _Fd = _F - _Ad;
504
            _Hd = _Bd + _H;
503
            _Fd = F_ - _Ad;
504
            _Hd = _Bd + H_;
505 505

  
506 506
            _Gd += IdctAdjustBeforeShift;
507 507
            _Add += IdctAdjustBeforeShift;

Also available in: Unified diff