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


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

Clean version with cfg-files

File:
1 edited

Legend:

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

    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
     
    6497  }
    6598
    66 #if HHI_DMM_INTRA
     99#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    67100  if ( !g_aacWedgeLists.empty() )
    68101  {
     
    23692402// Mapping each Unified Directional Intra prediction direction to DCT/DST transform
    23702403// 0 implies use DCT, 1 implies DST
    2371 #if ADD_PLANAR_MODE && !HHI_DMM_INTRA
     2404#if ADD_PLANAR_MODE
     2405#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
     2406const UChar g_aucDCTDSTMode_Vert[NUM_INTRA_MODE+8] =
     2407#elif HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
     2408const UChar g_aucDCTDSTMode_Vert[NUM_INTRA_MODE+4] =
     2409#else
    23722410const UChar g_aucDCTDSTMode_Vert[NUM_INTRA_MODE] =
    2373 #elif !ADD_PLANAR_MODE && HHI_DMM_INTRA
    2374 const UChar g_aucDCTDSTMode_Vert[34+NUM_DMM_INTRA] =
    2375 #elif ADD_PLANAR_MODE && HHI_DMM_INTRA
    2376 const UChar g_aucDCTDSTMode_Vert[NUM_INTRA_MODE+NUM_DMM_INTRA] =
     2411#endif
     2412#else
     2413#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
     2414const UChar g_aucDCTDSTMode_Vert[34+8] =
     2415#elif
     2416const UChar g_aucDCTDSTMode_Vert[34+4] =
    23772417#else
    23782418const UChar g_aucDCTDSTMode_Vert[34] =
     2419#endif
    23792420#endif
    23802421{ //0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
     
    23832424,1
    23842425#endif
    2385 #if HHI_DMM_INTRA
     2426#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
    23862427,0,0,0,0,0,0,0,0
    2387 #endif
    2388 };
    2389 #if ADD_PLANAR_MODE && !HHI_DMM_INTRA
     2428#elif HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
     2429,0,0,0,0
     2430#endif
     2431};
     2432#if ADD_PLANAR_MODE
     2433#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
     2434const UChar g_aucDCTDSTMode_Hor[NUM_INTRA_MODE+8] =
     2435#elif HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
     2436const UChar g_aucDCTDSTMode_Hor[NUM_INTRA_MODE+4] =
     2437#else
    23902438const UChar g_aucDCTDSTMode_Hor[NUM_INTRA_MODE] =
    2391 #elif !ADD_PLANAR_MODE && HHI_DMM_INTRA
    2392 const UChar g_aucDCTDSTMode_Hor[34+NUM_DMM_INTRA] =
    2393 #elif ADD_PLANAR_MODE && HHI_DMM_INTRA
    2394 const UChar g_aucDCTDSTMode_Hor[NUM_INTRA_MODE+NUM_DMM_INTRA] =
     2439#endif
     2440#else
     2441#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
     2442const UChar g_aucDCTDSTMode_Hor[34+8] =
     2443#elif
     2444const UChar g_aucDCTDSTMode_Hor[34+4] =
    23952445#else
    23962446const UChar g_aucDCTDSTMode_Hor[34] =
     2447#endif
    23972448#endif
    23982449{ //0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
     
    24012452,1
    24022453#endif
    2403 #if HHI_DMM_INTRA
     2454#if HHI_DMM_WEDGE_INTRA && HHI_DMM_PRED_TEX
    24042455,0,0,0,0,0,0,0,0
     2456#elif HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
     2457,0,0,0,0
    24052458#endif
    24062459};
     
    25362589};
    25372590
    2538 #if HHI_DMM_INTRA
     2591#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    25392592const WedgeResolution g_aeWedgeResolutionList[5] =
    25402593{
     
    25682621};
    25692622
    2570 const UChar g_aucAdditionalIntraModeList[NUM_DMM_INTRA] =
    2571 {
    2572   DMM_WEDGE_FULL_IDX,
    2573   DMM_WEDGE_FULL_D_IDX,
    2574   DMM_WEDGE_PREDTEX_IDX,
    2575   DMM_WEDGE_PREDTEX_D_IDX,
    2576   DMM_CONTOUR_PREDTEX_IDX,
    2577   DMM_CONTOUR_PREDTEX_D_IDX,
    2578   DMM_WEDGE_PREDDIR_IDX,
    2579   DMM_WEDGE_PREDDIR_D_IDX
    2580 };
    2581 
    25822623double g_dDeltaDCsQuantOffset = 0.0;
    25832624#endif
     
    25952636// Misc.
    25962637// ====================================================================================================================
    2597 #if SB_DEBUG
    2598 Bool g_bEncoding = false ;
    2599 #endif
    26002638Char  g_aucConvertToBit  [ MAX_CU_SIZE+1 ];
    26012639
     
    27542792#endif
    27552793
    2756 #if HHI_DMM_INTRA
     2794#if HHI_DMM_WEDGE_INTRA || HHI_DMM_PRED_TEX
    27572795std::vector<std::vector<TComWedgelet> > g_aacWedgeLists;
    27582796std::vector<std::vector<TComWedgeRef> > g_aacWedgeRefLists;
Note: See TracChangeset for help on using the changeset viewer.