Changeset 707 in SHVCSoftware for branches/SHM-6-dev


Ignore:
Timestamp:
20 Apr 2014, 10:09:43 (11 years ago)
Author:
qualcomm
Message:

Bug fix for Q0200 integration, from cjianle@…

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/SHM-6-dev/source/Lib/TLibCommon/TComUpsampleFilter.cpp

    r705 r707  
    316316    Int   deltaY = 4 * phaseY;
    317317#endif
     318
     319#if Q0200_CONFORMANCE_BL_SIZE
     320    deltaX -= ( confBL.getWindowLeftOffset() * xScal ) << 4;
     321    deltaY -= ( confBL.getWindowTopOffset() * yScal ) << 4;
     322#endif
     323
    318324    Int shiftXM4 = shiftX - 4;
    319325    Int shiftYM4 = shiftY - 4;
     
    330336    Int bottomEndL = pcUsPic->getHeight() - scalEL.getWindowBottomOffset();
    331337    Int leftOffset = leftStartL > 0 ? leftStartL : 0;
    332 #if Q0200_CONFORMANCE_BL_SIZE
    333     leftStartL += ( confBL.getWindowLeftOffset() * xScal ) << 4;
    334     topStartL  += ( confBL.getWindowTopOffset() * yScal ) << 4;
    335 #endif
    336338#if N0214_INTERMEDIATE_BUFFER_16BITS
    337339#if O0194_JOINT_US_BITSHIFT
     
    450452    Int bottomEndC = (pcUsPic->getHeight() >> 1) - (scalEL.getWindowBottomOffset() >> 1);
    451453    leftOffset = leftStartC > 0 ? leftStartC : 0;
    452 #if Q0200_CONFORMANCE_BL_SIZE
    453     leftStartC += ( ( confBL.getWindowLeftOffset() * xScal ) >> 1 ) << 4;
    454     topStartC  += ( ( confBL.getWindowTopOffset() * yScal ) >> 1 ) << 4;
    455 #endif
    456454    shiftX = 16;
    457455    shiftY = 16;
     
    495493    deltaX     = 4 * phaseXC;
    496494    deltaY     = 4 * phaseYC;
     495#endif
     496
     497#if Q0200_CONFORMANCE_BL_SIZE
     498    deltaX -= ( ( confBL.getWindowLeftOffset() * xScal ) >> 1 ) << 4;
     499    deltaY  -= ( ( confBL.getWindowTopOffset() * yScal ) >> 1 ) << 4;
    497500#endif
    498501
Note: See TracChangeset for help on using the changeset viewer.