Changeset 1413 in 3DVCSoftware for trunk/build


Ignore:
Timestamp:
11 Jul 2018, 15:19:49 (7 years ago)
Author:
tech
Message:

Merged HTM-16.2-dev@1412

Location:
trunk/build
Files:
1 added
18 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/linux/app/TAppEncoder/makefile

    r1313 r1413  
    5757STAT_RELEASE_PREREQS    = $(LIB_DIR)/libTLibEncoder$(HBD)Static.a $(LIB_DIR)/libTLibCommon$(HBD)Static.a $(LIB_DIR)/libTLibVideoIO$(HBD)Static.a $(LIB_DIR)/libTAppCommon$(HBD)Static.a  $(LIB_DIR)/libTLibRenderer$(HBD)Static.a
    5858
     59ifeq ($(EXTENSION_360_VIDEO), 1)
     60  DYN_DEBUG_LIBS      += -lTAppEncHelper360$(HBD)d -lTLib360$(HBD)d
     61  DYN_DEBUG_PREREQS   += $(LIB_DIR)/libTAppEncHelper360$(HBD)d.a $(LIB_DIR)/libTLib360$(HBD)d.a
     62  STAT_DEBUG_LIBS     += -lTAppEncHelper360$(HBD)Staticd -lTLib360$(HBD)Staticd
     63  STAT_DEBUG_PREREQS  += $(LIB_DIR)/libTAppEncHelper360$(HBD)Staticd.a $(LIB_DIR)/libTLib360$(HBD)Staticd.a
     64  DYN_RELEASE_LIBS    += -lTAppEncHelper360$(HBD) -lTLib360$(HBD)
     65  DYN_RELEASE_PREREQS += $(LIB_DIR)/libTAppEncHelper360$(HBD).a $(LIB_DIR)/libTLib360$(HBD).a
     66  STAT_RELEASE_LIBS   += -lTAppEncHelper360$(HBD)Static -lTLib360$(HBD)Static
     67  STAT_RELEASE_PREREQS+= $(LIB_DIR)/libTAppEncHelper360$(HBD)Static.a $(LIB_DIR)/libTLib360$(HBD)Static.a
     68endif
    5969
    6070# name of the base makefile
  • trunk/build/linux/common/makefile.base

    r1313 r1413  
    4747
    4848# default cpp flags for all configurations
    49 #CPPFLAGS          = -Wall -fPIC $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS)
    50 CPPFLAGS          = -fPIC $(DEFS) $(ADDDEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror
     49#CPPFLAGS          = -Wall $(DEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS)
     50CPPFLAGS          = $(DEFS) $(ADDDEFS) -I$(CURDIR)/$(INC_DIR) $(USER_INC_DIRS) -Wall -Wshadow -Wno-sign-compare -Werror
    5151
    5252##########
     
    6161ifeq ($(HIGHBITDEPTH), 1)
    6262CPPFLAGS+="-DRExt__HIGH_BIT_DEPTH_SUPPORT=1"
     63endif
     64
     65ifeq ($(EXTENSION_360_VIDEO), 1)
     66  CPPFLAGS+=-DEXTENSION_360_VIDEO=1
     67else
     68  CPPFLAGS+=-DEXTENSION_360_VIDEO=0
    6369endif
    6470
  • trunk/build/linux/lib/TLibDecoder/makefile

    r1313 r1413  
    5151                                $(OBJ_DIR)/TDecSlice.o \
    5252                                $(OBJ_DIR)/TDecTop.o \
     53                                $(OBJ_DIR)/TDecConformance.o \
    5354
    5455LIBS                            = -lpthread
  • trunk/build/linux/lib/TLibDecoderAnalyser/makefile

    r1313 r1413  
    5151                                $(OBJ_DIR)/TDecSlice.o \
    5252                                $(OBJ_DIR)/TDecTop.o \
     53                                $(OBJ_DIR)/TDecConformance.o \
    5354
    5455LIBS                            = -lpthread
  • trunk/build/linux/makefile

    r1313 r1413  
    99endif
    1010
     11EXTENSION_360_VIDEO?=0
     12export EXTENSION_360_VIDEO
     13
     14
    1115all:
    1216        $(MAKE) -C lib/TLibVideoIO      MM32=$(M32) ADDDEFS=$(ADDDEFS)
     
    1721        $(MAKE) -C lib/TLibExtractor    MM32=$(M32) ADDDEFS=$(ADDDEFS)
    1822        $(MAKE) -C lib/TAppCommon       MM32=$(M32) ADDDEFS=$(ADDDEFS)
     23        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
     24          $(MAKE) -C lib/TLib360                MM32=$(M32) ; \
     25          $(MAKE) -C lib/TAppEncHelper360       MM32=$(M32) ; \
     26          $(MAKE) -C app/TApp360Convert         MM32=$(M32) ; \
     27        fi
    1928        $(MAKE) -C app/TAppDecoder      MM32=$(M32) ADDDEFS=$(ADDDEFS)
    2029        $(MAKE) -C app/TAppEncoder      MM32=$(M32) ADDDEFS=$(ADDDEFS)
     
    3443        $(MAKE) -C lib/TLibExtractor    debug MM32=$(M32) ADDDEFS=$(ADDDEFS)
    3544        $(MAKE) -C lib/TAppCommon       debug MM32=$(M32) ADDDEFS=$(ADDDEFS)
     45        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
     46          $(MAKE) -C lib/TLib360                debug MM32=$(M32) ; \
     47          $(MAKE) -C lib/TAppEncHelper360       debug MM32=$(M32) ; \
     48          $(MAKE) -C app/TApp360Convert         debug MM32=$(M32) ; \
     49        fi
     50
    3651        $(MAKE) -C app/TAppDecoder      debug MM32=$(M32) ADDDEFS=$(ADDDEFS)
    3752        $(MAKE) -C app/TAppEncoder      debug MM32=$(M32) ADDDEFS=$(ADDDEFS)
     
    5166        $(MAKE) -C lib/TLibExtractor    release MM32=$(M32) ADDDEFS=$(ADDDEFS)
    5267        $(MAKE) -C lib/TAppCommon       release MM32=$(M32) ADDDEFS=$(ADDDEFS)
     68        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
     69          $(MAKE) -C lib/TLib360                release MM32=$(M32) ; \
     70          $(MAKE) -C lib/TAppEncHelper360       release MM32=$(M32) ; \
     71          $(MAKE) -C app/TApp360Convert         release MM32=$(M32) ; \
     72        fi
    5373        $(MAKE) -C app/TAppDecoder      release MM32=$(M32) ADDDEFS=$(ADDDEFS)
    5474        $(MAKE) -C app/TAppEncoder      release MM32=$(M32) ADDDEFS=$(ADDDEFS)
     
    6989
    7090        $(MAKE) -C lib/TAppCommon       clean MM32=$(M32)
     91        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
     92          $(MAKE) -C lib/TLib360                  clean MM32=$(M32) ; \
     93          $(MAKE) -C lib/TAppEncHelper360         clean MM32=$(M32) ; \
     94          $(MAKE) -C app/TApp360Convert           clean MM32=$(M32) ; \
     95        fi
     96
    7197        $(MAKE) -C app/TAppDecoder      clean MM32=$(M32)
    7298        $(MAKE) -C app/TAppEncoder      clean MM32=$(M32)
     
    86112        $(MAKE) -C lib/TLibExtractor    MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
    87113        $(MAKE) -C lib/TAppCommon       MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
     114        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
     115          $(MAKE) -C lib/TLib360                MM32=$(M32) HIGHBITDEPTH=1 ; \
     116          $(MAKE) -C lib/TAppEncHelper360       MM32=$(M32) HIGHBITDEPTH=1 ; \
     117          $(MAKE) -C app/TApp360Convert         MM32=$(M32) HIGHBITDEPTH=1 ; \
     118        fi
     119
    88120        $(MAKE) -C app/TAppDecoder      MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
    89121        $(MAKE) -C app/TAppEncoder      MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
     
    101133        $(MAKE) -C lib/TLibExtractor    debug M32=$(M32)  HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
    102134        $(MAKE) -C lib/TAppCommon       debug MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
     135        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
     136          $(MAKE) -C lib/TLib360                debug MM32=$(M32) HIGHBITDEPTH=1 ; \
     137          $(MAKE) -C lib/TAppEncHelper360       debug MM32=$(M32) HIGHBITDEPTH=1 ; \
     138          $(MAKE) -C app/TApp360Convert         debug MM32=$(M32) HIGHBITDEPTH=1 ; \
     139        fi
    103140        $(MAKE) -C app/TAppDecoder      debug MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
    104141        $(MAKE) -C app/TAppEncoder      debug MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
     
    116153        $(MAKE) -C lib/TLibExtractor    release MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
    117154        $(MAKE) -C lib/TAppCommon       release MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
     155        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
     156          $(MAKE) -C lib/TLib360                release MM32=$(M32) HIGHBITDEPTH=1 ; \
     157          $(MAKE) -C lib/TAppEncHelper360       release MM32=$(M32) HIGHBITDEPTH=1 ; \
     158          $(MAKE) -C app/TApp360Convert         release MM32=$(M32) HIGHBITDEPTH=1 ; \
     159        fi
    118160        $(MAKE) -C app/TAppDecoder      release MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
    119161        $(MAKE) -C app/TAppEncoder      release MM32=$(M32) HIGHBITDEPTH=1 ADDDEFS=$(ADDDEFS)
     
    131173        $(MAKE) -C lib/TLibExtractor    clean MM32=$(M32) HIGHBITDEPTH=1 
    132174        $(MAKE) -C lib/TAppCommon       clean MM32=$(M32) HIGHBITDEPTH=1
     175        @if [ $(EXTENSION_360_VIDEO) -eq 1 ] ; then \
     176          $(MAKE) -C lib/TLib360                  clean MM32=$(M32) HIGHBITDEPTH=1 ; \
     177          $(MAKE) -C lib/TAppEncHelper360         clean MM32=$(M32) HIGHBITDEPTH=1 ; \
     178          $(MAKE) -C app/TApp360Convert           clean MM32=$(M32) HIGHBITDEPTH=1 ; \
     179        fi
    133180        $(MAKE) -C app/TAppDecoder      clean MM32=$(M32) HIGHBITDEPTH=1
    134181        $(MAKE) -C app/TAppEncoder      clean MM32=$(M32) HIGHBITDEPTH=1
  • trunk/build/vc2010/TAppDecoderAnalyser_vc2010.vcxproj

    r1386 r1413  
    186186    </ProjectReference>
    187187    <ProjectReference Include="TLibDecoderAnalyser_vc2010.vcxproj">
    188       <Project>{f8b77a48-af6c-4746-a89f-b706aba6ad94}</Project>
     188      <Project>{68C1251A-55D8-47C9-9052-62F785BD437A}</Project>
    189189      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    190190    </ProjectReference>
  • trunk/build/vc2010/TLibDecoderAnalyser_vc2010.vcxproj

    r1386 r1413  
    150150    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.cpp" />
    151151    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.cpp" />
     152    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecConformance.cpp" />
    152153    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCu.cpp" />
    153154    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecEntropy.cpp" />
     
    165166    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.h" />
    166167    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.h" />
     168    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecConformance.h" />
    167169    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCu.h" />
    168170    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecEntropy.h" />
  • trunk/build/vc2010/TLibDecoder_vc2010.vcxproj

    r1386 r1413  
    150150    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.cpp" />
    151151    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.cpp" />
     152    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecConformance.cpp" />
    152153    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCu.cpp" />
    153154    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecEntropy.cpp" />
     
    165166    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.h" />
    166167    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.h" />
     168    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecConformance.h" />
    167169    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCu.h" />
    168170    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecEntropy.h" />
  • trunk/build/vc2012/TAppDecoderAnalyser_vc2012.vcxproj

    r1386 r1413  
    190190    </ProjectReference>
    191191    <ProjectReference Include="TLibDecoderAnalyser_vc2012.vcxproj">
    192       <Project>{f8b77a48-af6c-4746-a89f-b706aba6ad94}</Project>
     192      <Project>{68C1251A-55D8-47C9-9052-62F785BD437A}</Project>
    193193      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    194194    </ProjectReference>
  • trunk/build/vc2012/TLibDecoderAnalyser_vc2012.vcxproj

    r1386 r1413  
    154154    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.cpp" />
    155155    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.cpp" />
     156    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecConformance.cpp" />
    156157    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCu.cpp" />
    157158    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecEntropy.cpp" />
     
    169170    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.h" />
    170171    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.h" />
     172    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecConformance.h" />
    171173    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCu.h" />
    172174    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecEntropy.h" />
  • trunk/build/vc2012/TLibDecoder_vc2012.vcxproj

    r1386 r1413  
    154154    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.cpp" />
    155155    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.cpp" />
     156    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecConformance.cpp" />
    156157    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCu.cpp" />
    157158    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecEntropy.cpp" />
     
    169170    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.h" />
    170171    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.h" />
     172    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecConformance.h" />
    171173    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCu.h" />
    172174    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecEntropy.h" />
  • trunk/build/vc2013/TAppDecoderAnalyser_vc2013.vcxproj

    r1386 r1413  
    190190    </ProjectReference>
    191191    <ProjectReference Include="TLibDecoderAnalyser_vc2013.vcxproj">
    192       <Project>{f8b77a48-af6c-4746-a89f-b706aba6ad94}</Project>
     192      <Project>{68C1251A-55D8-47C9-9052-62F785BD437A}</Project>
    193193      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    194194    </ProjectReference>
  • trunk/build/vc2013/TLibDecoderAnalyser_vc2013.vcxproj

    r1386 r1413  
    154154    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.cpp" />
    155155    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.cpp" />
     156    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecConformance.cpp" />
    156157    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCu.cpp" />
    157158    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecEntropy.cpp" />
     
    169170    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.h" />
    170171    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.h" />
     172    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecConformance.h" />
    171173    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCu.h" />
    172174    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecEntropy.h" />
  • trunk/build/vc2013/TLibDecoder_vc2013.vcxproj

    r1386 r1413  
    154154    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.cpp" />
    155155    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.cpp" />
     156    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecConformance.cpp" />
    156157    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCu.cpp" />
    157158    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecEntropy.cpp" />
     
    169170    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.h" />
    170171    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.h" />
     172    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecConformance.h" />
    171173    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCu.h" />
    172174    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecEntropy.h" />
  • trunk/build/vc2015/TAppDecoderAnalyser_vc2015.vcxproj

    r1386 r1413  
    191191    </ProjectReference>
    192192    <ProjectReference Include="TLibDecoderAnalyser_vc2015.vcxproj">
    193       <Project>{f8b77a48-af6c-4746-a89f-b706aba6ad94}</Project>
     193      <Project>{68C1251A-55D8-47C9-9052-62F785BD437A}</Project>
    194194      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
    195195    </ProjectReference>
  • trunk/build/vc2015/TLibCommon_vc2015.vcxproj

    r1386 r1413  
    172172    <ClCompile Include="..\..\source\Lib\TLibCommon\TComSampleAdaptiveOffset.cpp" />
    173173    <ClCompile Include="..\..\source\Lib\TLibCommon\TComSlice.cpp" />
    174     <ClCompile Include="..\..\source\Lib\TLibCommon\TComTrQuant.cpp" />
     174    <ClCompile Include="..\..\source\Lib\TLibCommon\TComTrQuant.cpp" >
     175      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/d2Qvec-sse2only %(AdditionalOptions)</AdditionalOptions>
     176    </ClCompile>
    175177    <ClCompile Include="..\..\source\Lib\TLibCommon\TComTU.cpp" />
    176178    <ClCompile Include="..\..\source\Lib\TLibCommon\TComWedgelet.cpp" />
  • trunk/build/vc2015/TLibDecoderAnalyser_vc2015.vcxproj

    r1386 r1413  
    155155    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.cpp" />
    156156    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.cpp" />
     157    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecConformance.cpp" />
    157158    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCu.cpp" />
    158159    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecEntropy.cpp" />
     
    170171    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.h" />
    171172    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.h" />
     173    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecConformance.h" />
    172174    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCu.h" />
    173175    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecEntropy.h" />
  • trunk/build/vc2015/TLibDecoder_vc2015.vcxproj

    r1386 r1413  
    155155    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.cpp" />
    156156    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.cpp" />
     157    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecConformance.cpp" />
    157158    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecCu.cpp" />
    158159    <ClCompile Include="..\..\source\Lib\TLibDecoder\TDecEntropy.cpp" />
     
    170171    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecBinCoderCABAC.h" />
    171172    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCAVLC.h" />
     173    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecConformance.h" />
    172174    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecCu.h" />
    173175    <ClInclude Include="..\..\source\Lib\TLibDecoder\TDecEntropy.h" />
Note: See TracChangeset for help on using the changeset viewer.