Revision 007b1f04

View differences:

libavcodec/h264.c
1612 1612
                                            idct_dc_add(ptr, h->mb + i*16, linesize);
1613 1613
                                        else
1614 1614
                                            idct_add   (ptr, h->mb + i*16, linesize);
1615
                                    }else
1615
                                    }
1616
#if CONFIG_SVQ3_DECODER
1617
                                    else
1616 1618
                                        ff_svq3_add_idct_c(ptr, h->mb + i*16, linesize, s->qscale, 0);
1619
#endif
1617 1620
                                }
1618 1621
                            }
1619 1622
                        }
......
1632 1635
                                h->mb[dc_mapping[i]] = h->mb_luma_dc[i];
1633 1636
                        }
1634 1637
                    }
1635
                }else
1638
                }
1639
#if CONFIG_SVQ3_DECODER
1640
                else
1636 1641
                    ff_svq3_luma_dc_dequant_idct_c(h->mb, h->mb_luma_dc, s->qscale);
1642
#endif
1637 1643
            }
1638 1644
            if(h->deblocking_filter)
1639 1645
                xchg_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, 0, simple);
......
1677 1683
                        }
1678 1684
                    }
1679 1685
                }
1680
            }else{
1686
            }
1687
#if CONFIG_SVQ3_DECODER
1688
            else{
1681 1689
                for(i=0; i<16; i++){
1682 1690
                    if(h->non_zero_count_cache[ scan8[i] ] || h->mb[i*16]){ //FIXME benchmark weird rule, & below
1683 1691
                        uint8_t * const ptr= dest_y + block_offset[i];
......
1685 1693
                    }
1686 1694
                }
1687 1695
            }
1696
#endif
1688 1697
        }
1689 1698

  
1690 1699
        if((simple || !CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)) && (h->cbp&0x30)){
......
1709 1718
                    h->h264dsp.h264_idct_add8(dest, block_offset,
1710 1719
                                              h->mb, uvlinesize,
1711 1720
                                              h->non_zero_count_cache);
1712
                }else{
1721
                }
1722
#if CONFIG_SVQ3_DECODER
1723
                else{
1713 1724
                    chroma_dc_dequant_idct_c(h->mb + 16*16     , h->dequant4_coeff[IS_INTRA(mb_type) ? 1:4][h->chroma_qp[0]][0]);
1714 1725
                    chroma_dc_dequant_idct_c(h->mb + 16*16+4*16, h->dequant4_coeff[IS_INTRA(mb_type) ? 2:5][h->chroma_qp[1]][0]);
1715 1726
                    for(i=16; i<16+8; i++){
......
1719 1730
                        }
1720 1731
                    }
1721 1732
                }
1733
#endif
1722 1734
            }
1723 1735
        }
1724 1736
    }

Also available in: Unified diff