Changeset 5 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComRom.h


Ignore:
Timestamp:
12 Dec 2011, 18:35:44 (13 years ago)
Author:
hhi
Message:

Clean version with cfg-files

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComRom.h

    r2 r5  
     1/* The copyright in this software is being made available under the BSD
     2 * License, included below. This software may be subject to other third party
     3 * and contributor rights, including patent rights, and no such rights are
     4 * granted under this license.
     5 *
     6 * Copyright (c) 2010-2011, ISO/IEC
     7 * All rights reserved.
     8 *
     9 * Redistribution and use in source and binary forms, with or without
     10 * modification, are permitted provided that the following conditions are met:
     11 *
     12 *  * Redistributions of source code must retain the above copyright notice,
     13 *    this list of conditions and the following disclaimer.
     14 *  * Redistributions in binary form must reproduce the above copyright notice,
     15 *    this list of conditions and the following disclaimer in the documentation
     16 *    and/or other materials provided with the distribution.
     17 *  * Neither the name of the ISO/IEC nor the names of its contributors may
     18 *    be used to endorse or promote products derived from this software without
     19 *    specific prior written permission.
     20 *
     21 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
     22 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
     23 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
     24 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
     25 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
     26 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
     27 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
     28 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
     29 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
     30 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
     31 * THE POSSIBILITY OF SUCH DAMAGE.
     32 */
     33
    134
    235
     
    1447
    1548
    16 #if HHI_DMM_INTRA
     49#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    1750#include "TComWedgelet.h"
    1851#endif
     
    3871#endif //QC_MDCS
    3972
    40 #if HHI_DMM_INTRA
     73#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    4174Void initWedgeLists();
    4275Void createWedgeList( UInt uiWidth, UInt uiHeight, std::vector<TComWedgelet> &racWedgeList, std::vector<TComWedgeRef> &racWedgeRefList, WedgeResolution eWedgeRes );
     
    72105extern       UInt g_auiPUOffset[4];
    73106
    74 #if HHI_DMM_INTRA
     107#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    75108extern       std::vector<std::vector<TComWedgelet> > g_aacWedgeLists;
    76109extern       std::vector<std::vector<TComWedgeRef> > g_aacWedgeRefLists;
     
    287320#endif
    288321
    289 #if HHI_DMM_INTRA
     322#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    290323extern const UChar g_aucWedgeFullBitsListIdx[7];
    291324extern const UChar g_aucIntraSizeIdxToWedgeSize[7];
    292 extern const UChar g_aucAdditionalIntraModeList[NUM_DMM_INTRA];
    293325extern const WedgeResolution g_aeWedgeResolutionList[5];
    294 
    295326extern       double g_dDeltaDCsQuantOffset;
    296327#endif
     
    315346#if INTRA_DST_TYPE_7
    316347extern const short g_as_DST_MAT_4 [4][4];
    317 #if ADD_PLANAR_MODE && !HHI_DMM_INTRA
     348#if ADD_PLANAR_MODE
     349#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
     350extern const UChar g_aucDCTDSTMode_Vert[NUM_INTRA_MODE+8];
     351extern const UChar g_aucDCTDSTMode_Hor[NUM_INTRA_MODE+8];
     352#elif HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
     353extern const UChar g_aucDCTDSTMode_Vert[NUM_INTRA_MODE+4];
     354extern const UChar g_aucDCTDSTMode_Hor[NUM_INTRA_MODE+4];
     355#else
    318356extern const UChar g_aucDCTDSTMode_Vert[NUM_INTRA_MODE];
    319357extern const UChar g_aucDCTDSTMode_Hor[NUM_INTRA_MODE];
    320 #elif !ADD_PLANAR_MODE && HHI_DMM_INTRA
    321 extern const UChar g_aucDCTDSTMode_Vert[34+NUM_DMM_INTRA];
    322 extern const UChar g_aucDCTDSTMode_Hor[34+NUM_DMM_INTRA];
    323 #elif ADD_PLANAR_MODE && HHI_DMM_INTRA
    324 extern const UChar g_aucDCTDSTMode_Vert[NUM_INTRA_MODE+NUM_DMM_INTRA];
    325 extern const UChar g_aucDCTDSTMode_Hor[NUM_INTRA_MODE+NUM_DMM_INTRA];
     358#endif
     359#else
     360#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
     361extern const UChar g_aucDCTDSTMode_Vert[34+8];
     362extern const UChar g_aucDCTDSTMode_Hor[34+8];
     363#elif HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
     364extern const UChar g_aucDCTDSTMode_Vert[34+4];
     365extern const UChar g_aucDCTDSTMode_Hor[34+4];
    326366#else
    327367extern const UChar g_aucDCTDSTMode_Vert[34];
     
    329369#endif
    330370#endif
     371#endif
    331372// ==========================================
    332373
     
    334375// Misc.
    335376// ====================================================================================================================
    336 #if SB_DEBUG
    337 extern Bool g_bEncoding ;
    338 #endif
    339377
    340378#if QC_MOD_LCEC
     
    500538__inline Void mapPlanartoDC(   Int& curDir ) { curDir = (curDir == PLANAR_IDX) ? 2 : curDir; }
    501539#endif
    502 #if HHI_DMM_INTRA
     540#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    503541__inline Void mapDMMtoDC( UChar& curDir ) { curDir = (curDir > MAX_MODE_ID_INTRA_DIR) ? 2 : curDir; }
    504542__inline Void mapDMMtoDC(  UInt& curDir ) { curDir = (curDir > MAX_MODE_ID_INTRA_DIR) ? 2 : curDir; }
Note: See TracChangeset for help on using the changeset viewer.