Changeset 918 in SHVCSoftware for branches/SHM-upgrade


Ignore:
Timestamp:
12 Nov 2014, 20:27:23 (10 years ago)
Author:
seregin
Message:

update make file, add TAppDecoderAnalyser and TLibDecoderAnalyser

Location:
branches/SHM-upgrade
Files:
6 added
21 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-upgrade/build/HM_vc10.sln

    r345 r918  
    1717EndProject
    1818Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAppDownConvert", "vc10\TAppDownConvert\TAppDownConvert.vcxproj", "{FB952E1B-681F-4461-9C8B-4F1F8B70E58B}"
     19EndProject
     20Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TAppDecoderAnalyser", "vc10\TAppDecoderAnalyser_vc10.vcxproj", "{6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}"
     21EndProject
     22Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TLibDecoderAnalyser", "vc10\TLibDecoderAnalyser_vc10.vcxproj", "{68C1251A-55D8-47C9-9052-62F785BD437A}"
    1923EndProject
    2024Global
    … …  
    9094                {FB952E1B-681F-4461-9C8B-4F1F8B70E58B}.Release|x64.ActiveCfg = Release|x64
    9195                {FB952E1B-681F-4461-9C8B-4F1F8B70E58B}.Release|x64.Build.0 = Release|x64
     96                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Debug|Win32.ActiveCfg = Debug|Win32
     97                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Debug|Win32.Build.0 = Debug|Win32
     98                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Debug|x64.ActiveCfg = Debug|x64
     99                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Debug|x64.Build.0 = Debug|x64
     100                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Release|Win32.ActiveCfg = Release|Win32
     101                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Release|Win32.Build.0 = Release|Win32
     102                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Release|x64.ActiveCfg = Release|x64
     103                {6BB4C8D8-449D-4CC1-A5E1-E98AAF94012F}.Release|x64.Build.0 = Release|x64
     104                {68C1251A-55D8-47C9-9052-62F785BD437A}.Debug|Win32.ActiveCfg = Debug|Win32
     105                {68C1251A-55D8-47C9-9052-62F785BD437A}.Debug|Win32.Build.0 = Debug|Win32
     106                {68C1251A-55D8-47C9-9052-62F785BD437A}.Debug|x64.ActiveCfg = Debug|x64
     107                {68C1251A-55D8-47C9-9052-62F785BD437A}.Debug|x64.Build.0 = Debug|x64
     108                {68C1251A-55D8-47C9-9052-62F785BD437A}.Release|Win32.ActiveCfg = Release|Win32
     109                {68C1251A-55D8-47C9-9052-62F785BD437A}.Release|Win32.Build.0 = Release|Win32
     110                {68C1251A-55D8-47C9-9052-62F785BD437A}.Release|x64.ActiveCfg = Release|x64
     111                {68C1251A-55D8-47C9-9052-62F785BD437A}.Release|x64.Build.0 = Release|x64
    92112        EndGlobalSection
    93113        GlobalSection(SolutionProperties) = preSolution

  • branches/SHM-upgrade/build/linux/app/TAppDecoder/makefile

    r125 r918  
    1616USER_LIB_DIRS   =
    1717
     18ifeq ($(HIGHBITDEPTH), 1)
     19HBD=HighBitDepth
     20else
     21HBD=
     22endif
     23
    1824# intermediate directory for object files
    19 OBJ_DIR                         = ./objects
     25OBJ_DIR                         = ./objects$(HBD)
    2026
    2127# set executable name
    22 PRJ_NAME                        = TAppDecoder
     28PRJ_NAME                        = TAppDecoder$(HBD)
    2329
    2430# defines to set
    … …  
    4147
    4248
    43 DYN_DEBUG_LIBS          = -lTLibDecoderd -lTLibCommond -lTLibVideoIOd -lTAppCommond
    44 DYN_DEBUG_PREREQS               = $(LIB_DIR)/libTLibDecoderd.a $(LIB_DIR)/libTLibCommond.a $(LIB_DIR)/libTLibVideoIOd.a $(LIB_DIR)/libTAppCommond.a
    45 STAT_DEBUG_LIBS         = -lTLibDecoderStaticd -lTLibCommonStaticd -lTLibVideoIOStaticd -lTAppCommonStaticd
    46 STAT_DEBUG_PREREQS              = $(LIB_DIR)/libTLibDecoderStaticd.a $(LIB_DIR)/libTLibCommonStaticd.a $(LIB_DIR)/libTLibVideoIOStaticd.a $(LIB_DIR)/libTAppCommonStaticd.a
     49DYN_DEBUG_LIBS          = -lTLibDecoder$(HBD)d -lTLibCommon$(HBD)d -lTLibVideoIO$(HBD)d -lTAppCommon$(HBD)d
     50DYN_DEBUG_PREREQS               = $(LIB_DIR)/libTLibDecoder$(HBD)d.a $(LIB_DIR)/libTLibCommon$(HBD)d.a $(LIB_DIR)/libTLibVideoIO$(HBD)d.a $(LIB_DIR)/libTAppCommon$(HBD)d.a
     51STAT_DEBUG_LIBS         = -lTLibDecoder$(HBD)Staticd -lTLibCommon$(HBD)Staticd -lTLibVideoIO$(HBD)Staticd -lTAppCommon$(HBD)Staticd
     52STAT_DEBUG_PREREQS              = $(LIB_DIR)/libTLibDecoder$(HBD)Staticd.a $(LIB_DIR)/libTLibCommon$(HBD)Staticd.a $(LIB_DIR)/libTLibVideoIO$(HBD)Staticd.a $(LIB_DIR)/libTAppCommon$(HBD)Staticd.a
    4753
    48 DYN_RELEASE_LIBS        = -lTLibDecoder -lTLibCommon -lTLibVideoIO -lTAppCommon
    49 DYN_RELEASE_PREREQS     = $(LIB_DIR)/libTLibDecoder.a $(LIB_DIR)/libTLibCommon.a $(LIB_DIR)/libTLibVideoIO.a $(LIB_DIR)/libTAppCommon.a
    50 STAT_RELEASE_LIBS       = -lTLibDecoderStatic -lTLibCommonStatic -lTLibVideoIOStatic -lTAppCommonStatic
    51 STAT_RELEASE_PREREQS    = $(LIB_DIR)/libTLibDecoderStatic.a $(LIB_DIR)/libTLibCommonStatic.a $(LIB_DIR)/libTLibVideoIOStatic.a $(LIB_DIR)/libTAppCommonStatic.a
     54DYN_RELEASE_LIBS        = -lTLibDecoder$(HBD) -lTLibCommon$(HBD) -lTLibVideoIO$(HBD) -lTAppCommon$(HBD)
     55DYN_RELEASE_PREREQS     = $(LIB_DIR)/libTLibDecoder$(HBD).a $(LIB_DIR)/libTLibCommon$(HBD).a $(LIB_DIR)/libTLibVideoIO$(HBD).a $(LIB_DIR)/libTAppCommon$(HBD).a
     56STAT_RELEASE_LIBS       = -lTLibDecoder$(HBD)Static -lTLibCommon$(HBD)Static -lTLibVideoIO$(HBD)Static -lTAppCommon$(HBD)Static
     57STAT_RELEASE_PREREQS    = $(LIB_DIR)/libTLibDecoder$(HBD)Static.a $(LIB_DIR)/libTLibCommon$(HBD)Static.a $(LIB_DIR)/libTLibVideoIO$(HBD)Static.a $(LIB_DIR)/libTAppCommon$(HBD)Static.a
    5258
    5359

  • branches/SHM-upgrade/build/linux/app/TAppEncoder/makefile

    r125 r918  
    1616USER_LIB_DIRS   =
    1717
     18ifeq ($(HIGHBITDEPTH), 1)
     19HBD=HighBitDepth
     20else
     21HBD=
     22endif
     23
    1824# intermediate directory for object files
    19 OBJ_DIR                         = ./objects
     25OBJ_DIR                         = ./objects$(HBD)
    2026
    2127# set executable name
    22 PRJ_NAME                        = TAppEncoder
     28PRJ_NAME                        = TAppEncoder$(HBD)
    2329
    2430# defines to set
    … …  
    4248
    4349
    44 DYN_DEBUG_LIBS          = -lTLibEncoderd -lTLibCommond -lTLibVideoIOd -lTAppCommond
    45 DYN_DEBUG_PREREQS               = $(LIB_DIR)/libTLibEncoderd.a $(LIB_DIR)/libTLibCommond.a $(LIB_DIR)/libTLibVideoIOd.a $(LIB_DIR)/libTAppCommond.a
    46 STAT_DEBUG_LIBS         = -lTLibEncoderStaticd -lTLibCommonStaticd -lTLibVideoIOStaticd -lTAppCommonStaticd
    47 STAT_DEBUG_PREREQS              = $(LIB_DIR)/libTLibEncoderStaticd.a $(LIB_DIR)/libTLibCommonStaticd.a $(LIB_DIR)/libTLibVideoIOStaticd.a $(LIB_DIR)/libTAppCommonStaticd.a
     50DYN_DEBUG_LIBS          = -lTLibEncoder$(HBD)d -lTLibCommon$(HBD)d -lTLibVideoIO$(HBD)d -lTAppCommon$(HBD)d
     51DYN_DEBUG_PREREQS               = $(LIB_DIR)/libTLibEncoder$(HBD)d.a $(LIB_DIR)/libTLibCommon$(HBD)d.a $(LIB_DIR)/libTLibVideoIO$(HBD)d.a $(LIB_DIR)/libTAppCommon$(HBD)d.a
     52STAT_DEBUG_LIBS         = -lTLibEncoder$(HBD)Staticd -lTLibCommon$(HBD)Staticd -lTLibVideoIO$(HBD)Staticd -lTAppCommon$(HBD)Staticd
     53STAT_DEBUG_PREREQS              = $(LIB_DIR)/libTLibEncoder$(HBD)Staticd.a $(LIB_DIR)/libTLibCommon$(HBD)Staticd.a $(LIB_DIR)/libTLibVideoIO$(HBD)Staticd.a $(LIB_DIR)/libTAppCommon$(HBD)Staticd.a
    4854
    49 DYN_RELEASE_LIBS        = -lTLibEncoder -lTLibCommon -lTLibVideoIO -lTAppCommon
    50 DYN_RELEASE_PREREQS     = $(LIB_DIR)/libTLibEncoder.a $(LIB_DIR)/libTLibCommon.a $(LIB_DIR)/libTLibVideoIO.a $(LIB_DIR)/libTAppCommon.a
    51 STAT_RELEASE_LIBS       = -lTLibEncoderStatic -lTLibCommonStatic -lTLibVideoIOStatic -lTAppCommonStatic
    52 STAT_RELEASE_PREREQS    = $(LIB_DIR)/libTLibEncoderStatic.a $(LIB_DIR)/libTLibCommonStatic.a $(LIB_DIR)/libTLibVideoIOStatic.a $(LIB_DIR)/libTAppCommonStatic.a
     55DYN_RELEASE_LIBS        = -lTLibEncoder$(HBD) -lTLibCommon$(HBD) -lTLibVideoIO$(HBD) -lTAppCommon$(HBD)
     56DYN_RELEASE_PREREQS     = $(LIB_DIR)/libTLibEncoder$(HBD).a $(LIB_DIR)/libTLibCommon$(HBD).a $(LIB_DIR)/libTLibVideoIO$(HBD).a $(LIB_DIR)/libTAppCommon$(HBD).a
     57STAT_RELEASE_LIBS       = -lTLibEncoder$(HBD)Static -lTLibCommon$(HBD)Static -lTLibVideoIO$(HBD)Static -lTAppCommon$(HBD)Static
     58STAT_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
    5359
    5460

  • branches/SHM-upgrade/build/linux/common/makefile.base

    r125 r918  
    1313#########################################################
    1414
    15 CPP     = g++
     15CPP     = g++
     16CC      = gcc
    1617AR      = ar
    1718LD      = $(CPP)
    … …  
    5859##########
    5960
     61ifeq ($(HIGHBITDEPTH), 1)
     62CPPFLAGS+="-DRExt__HIGH_BIT_DEPTH_SUPPORT=1"
     63endif
     64
    6065#
    6166# debug cpp flags
    … …  
    6368#
    6469# release cpp
    65 RELEASE_CPPFLAGS  =  -O3 -ffloat-store -Wuninitialized
     70RELEASE_CPPFLAGS  =  -O3 -Wuninitialized
    6671
    6772
    … …  
    208213                rm -f $(OBJ_DIR)/$*.d.d
    209214endef
     215define COMPILE_AND_DEPEND_RELEASE_C
     216        $(CC) -c -MMD -MF $(OBJ_DIR)/$*.r.d -MT $(OBJ_DIR)/$*.r.o $(CPPFLAGS) $(RELEASE_CPPFLAGS) -o $@ $(CURDIR)/$<
     217        @cp $(OBJ_DIR)/$*.r.d $(OBJ_DIR)/$*.r.P; \
     218                sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
     219                -e '/^$$/ d' -e 's/$$/ :/' < $(OBJ_DIR)/$*.r.d >> $(OBJ_DIR)/$*.r.P; \
     220                rm -f $(OBJ_DIR)/$*.r.d
     221endef
     222define COMPILE_AND_DEPEND_DEBUG_C
     223        $(CC) -c -MMD -MF $(OBJ_DIR)/$*.d.d -MT $(OBJ_DIR)/$*.d.o $(CPPFLAGS) $(DEBUG_CPPFLAGS) -o $@ $(CURDIR)/$<
     224        @cp $(OBJ_DIR)/$*.d.d $(OBJ_DIR)/$*.d.P; \
     225                sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
     226                -e '/^$$/ d' -e 's/$$/ :/' < $(OBJ_DIR)/$*.d.d >> $(OBJ_DIR)/$*.d.P; \
     227                rm -f $(OBJ_DIR)/$*.d.d
     228endef
    210229
    211230# create release objects
    … …  
    251270# create release objects
    252271$(OBJ_DIR)/%.r.o: $(SRC_DIR)/%.c
    253         $(COMPILE_AND_DEPEND_RELEASE)
     272        $(COMPILE_AND_DEPEND_RELEASE_C)
    254273
    255274# create debug objects
    256275$(OBJ_DIR)/%.d.o: $(SRC_DIR)/%.c
    257         $(COMPILE_AND_DEPEND_DEBUG)
     276        $(COMPILE_AND_DEPEND_DEBUG_C)
    258277
    259278# create release objects
    260279$(OBJ_DIR)/%.r.o: $(SRC_DIR1)/%.c
    261         $(COMPILE_AND_DEPEND_RELEASE)
     280        $(COMPILE_AND_DEPEND_RELEASE_C)
    262281
    263282# create debug objects
    264283$(OBJ_DIR)/%.d.o: $(SRC_DIR1)/%.c
    265         $(COMPILE_AND_DEPEND_DEBUG)
     284        $(COMPILE_AND_DEPEND_DEBUG_C)
    266285
    267286# create release objects
    268287$(OBJ_DIR)/%.r.o: $(SRC_DIR2)/%.c
    269         $(COMPILE_AND_DEPEND_RELEASE)
     288        $(COMPILE_AND_DEPEND_RELEASE_C)
    270289
    271290# create debug objects
    272291$(OBJ_DIR)/%.d.o: $(SRC_DIR2)/%.c
    273         $(COMPILE_AND_DEPEND_DEBUG)
     292        $(COMPILE_AND_DEPEND_DEBUG_C)
    274293
    275294# create release objects
    276295$(OBJ_DIR)/%.r.o: $(SRC_DIR3)/%.c
    277         $(COMPILE_AND_DEPEND_RELEASE)
     296        $(COMPILE_AND_DEPEND_RELEASE_C)
    278297
    279298# create debug objects
    280299$(OBJ_DIR)/%.d.o: $(SRC_DIR3)/%.c
    281         $(COMPILE_AND_DEPEND_DEBUG)
     300        $(COMPILE_AND_DEPEND_DEBUG_C)
    282301
    283302# create release objects
    284303$(OBJ_DIR)/%.r.o: $(SRC_DIR4)/%.c
    285         $(COMPILE_AND_DEPEND_RELEASE)
     304        $(COMPILE_AND_DEPEND_RELEASE_C)
    286305
    287306# create debug objects
    288307$(OBJ_DIR)/%.d.o: $(SRC_DIR4)/%.c
    289         $(COMPILE_AND_DEPEND_DEBUG)
     308        $(COMPILE_AND_DEPEND_DEBUG_C)
    290309
    291310

  • branches/SHM-upgrade/build/linux/lib/TAppCommon/makefile

    r125 r918  
    1717USER_LIB_DIRS   =
    1818
     19ifeq ($(HIGHBITDEPTH), 1)
     20HBD=HighBitDepth
     21else
     22HBD=
     23endif
     24
    1925# intermediate directory for object files
    20 OBJ_DIR                 = ./objects
     26OBJ_DIR                 = ./objects$(HBD)
    2127
    2228# the library name
    23 PRJ_NAME                = TAppCommon
     29PRJ_NAME                = TAppCommon$(HBD)
    2430
    2531# version information

  • branches/SHM-upgrade/build/linux/lib/TLibCommon/makefile

    r713 r918  
    1717USER_LIB_DIRS   =
    1818
     19ifeq ($(HIGHBITDEPTH), 1)
     20HBD=HighBitDepth
     21else
     22HBD=
     23endif
     24
    1925# intermediate directory for object files
    20 OBJ_DIR                 = ./objects
     26OBJ_DIR                 = ./objects$(HBD)
    2127
    2228# the library name
    23 PRJ_NAME                = TLibCommon
     29PRJ_NAME                = TLibCommon$(HBD)
    2430
    2531# version information
    … …  
    3339# set objects
    3440OBJS            = \
     41                        $(OBJ_DIR)/Debug.o \
     42                        $(OBJ_DIR)/TComPicYuv.o \
     43                        $(OBJ_DIR)/TComYuv.o \
    3544                        $(OBJ_DIR)/ContextModel.o \
    3645                        $(OBJ_DIR)/ContextModel3DBuffer.o \
    … …  
    3948                        $(OBJ_DIR)/TComSampleAdaptiveOffset.o \
    4049                        $(OBJ_DIR)/TComBitStream.o \
     50                $(OBJ_DIR)/TComChromaFormat.o \
    4151                        $(OBJ_DIR)/TComDataCU.o \
    4252                        $(OBJ_DIR)/TComLoopFilter.o \
    … …  
    4555                        $(OBJ_DIR)/TComPic.o \
    4656                        $(OBJ_DIR)/TComPicSym.o \
    47                         $(OBJ_DIR)/TComPicYuv.o \
    4857                        $(OBJ_DIR)/TComPicYuvMD5.o \
    4958                        $(OBJ_DIR)/TComPrediction.o \
    … …  
    5261                        $(OBJ_DIR)/TComSlice.o \
    5362                        $(OBJ_DIR)/TComTrQuant.o \
    54                         $(OBJ_DIR)/TComYuv.o \
     63                        $(OBJ_DIR)/TComTU.o \
    5564                        $(OBJ_DIR)/TComInterpolationFilter.o \
    5665                        $(OBJ_DIR)/libmd5.o \

  • branches/SHM-upgrade/build/linux/lib/TLibDecoder/makefile

    r125 r918  
    1717USER_LIB_DIRS   =
    1818
     19ifeq ($(HIGHBITDEPTH), 1)
     20HBD=HighBitDepth
     21else
     22HBD=
     23endif
     24
    1925# intermediate directory for object files
    20 OBJ_DIR                 = ./objects
     26OBJ_DIR                 = ./objects$(HBD)
    2127
    2228# the library name
    23 PRJ_NAME                = TLibDecoder
     29PRJ_NAME                = TLibDecoder$(HBD)
    2430
    2531# version information

  • branches/SHM-upgrade/build/linux/lib/TLibEncoder/makefile

    r713 r918  
    1717USER_LIB_DIRS   =
    1818
     19ifeq ($(HIGHBITDEPTH), 1)
     20HBD=HighBitDepth
     21else
     22HBD=
     23endif
     24
    1925# intermediate directory for object files
    20 OBJ_DIR                 = ./objects
     26OBJ_DIR                 = ./objects$(HBD)
    2127
    2228# the library name
    23 PRJ_NAME                = TLibEncoder
     29PRJ_NAME                = TLibEncoder$(HBD)
    2430
    2531# version information

  • branches/SHM-upgrade/build/linux/lib/TLibVideoIO/makefile

    r125 r918  
    1717USER_LIB_DIRS   =
    1818
     19ifeq ($(HIGHBITDEPTH), 1)
     20HBD=HighBitDepth
     21else
     22HBD=
     23endif
     24
    1925# intermediate directory for object files
    20 OBJ_DIR                 = ./objects
     26OBJ_DIR                 = ./objects$(HBD)
    2127
    2228# the library name
    23 PRJ_NAME                = TLibVideoIO
     29PRJ_NAME                = TLibVideoIO$(HBD)
    2430
    2531# version information

  • branches/SHM-upgrade/build/linux/makefile

    r349 r918  
    1515        $(MAKE) -C utils/annexBbytecount       MM32=$(M32)
    1616        $(MAKE) -C utils/convert_NtoMbit_YCbCr MM32=$(M32)
     17        $(MAKE) -C lib/TLibDecoderAnalyser      MM32=$(M32)
     18        $(MAKE) -C app/TAppDecoderAnalyser      MM32=$(M32)
    1719
    1820debug:
    … …  
    2729        $(MAKE) -C utils/annexBbytecount       debug MM32=$(M32)
    2830        $(MAKE) -C utils/convert_NtoMbit_YCbCr debug MM32=$(M32)
     31        $(MAKE) -C lib/TLibDecoderAnalyser      debug MM32=$(M32)
     32        $(MAKE) -C app/TAppDecoderAnalyser      debug MM32=$(M32)
    2933
    3034release:
    … …  
    3640        $(MAKE) -C app/TAppDecoder      release MM32=$(M32)
    3741        $(MAKE) -C app/TAppEncoder      release MM32=$(M32)
    38         $(MAKE) -C app/TAppDownConvert      release MM32=$(M32)
     42        $(MAKE) -C app/TAppDownConvert  release MM32=$(M32)
    3943        $(MAKE) -C utils/annexBbytecount       release MM32=$(M32)
    4044        $(MAKE) -C utils/convert_NtoMbit_YCbCr release MM32=$(M32)
     45        $(MAKE) -C lib/TLibDecoderAnalyser      release MM32=$(M32)
     46        $(MAKE) -C app/TAppDecoderAnalyser      release MM32=$(M32)
    4147
    42 clean:
     48clean: clean_highbitdepth
    4349        $(MAKE) -C lib/TLibVideoIO      clean MM32=$(M32)
    4450        $(MAKE) -C lib/TLibCommon       clean MM32=$(M32)
    … …  
    5157        $(MAKE) -C utils/annexBbytecount       clean MM32=$(M32)
    5258        $(MAKE) -C utils/convert_NtoMbit_YCbCr clean MM32=$(M32)
     59        $(MAKE) -C lib/TLibDecoderAnalyser      clean MM32=$(M32)
     60        $(MAKE) -C app/TAppDecoderAnalyser      clean MM32=$(M32)
     61
     62all_highbitdepth:
     63        $(MAKE) -C lib/TLibVideoIO      MM32=$(M32) HIGHBITDEPTH=1
     64        $(MAKE) -C lib/TLibCommon       MM32=$(M32) HIGHBITDEPTH=1
     65        $(MAKE) -C lib/TLibDecoder      MM32=$(M32) HIGHBITDEPTH=1
     66        $(MAKE) -C lib/TLibEncoder      MM32=$(M32) HIGHBITDEPTH=1
     67  $(MAKE) -C app/TAppDownConvert  MM32=$(M32) HIGHBITDEPTH=1
     68        $(MAKE) -C lib/TAppCommon       MM32=$(M32) HIGHBITDEPTH=1
     69        $(MAKE) -C app/TAppDecoder      MM32=$(M32) HIGHBITDEPTH=1
     70        $(MAKE) -C app/TAppEncoder      MM32=$(M32) HIGHBITDEPTH=1
     71        $(MAKE) -C lib/TLibDecoderAnalyser      MM32=$(M32) HIGHBITDEPTH=1
     72        $(MAKE) -C app/TAppDecoderAnalyser      MM32=$(M32) HIGHBITDEPTH=1
     73
     74debug_highbitdepth:
     75        $(MAKE) -C lib/TLibVideoIO      debug MM32=$(M32) HIGHBITDEPTH=1
     76        $(MAKE) -C lib/TLibCommon       debug MM32=$(M32) HIGHBITDEPTH=1
     77        $(MAKE) -C lib/TLibDecoder      debug MM32=$(M32) HIGHBITDEPTH=1
     78        $(MAKE) -C lib/TLibEncoder      debug MM32=$(M32) HIGHBITDEPTH=1
     79  $(MAKE) -C app/TAppDownConvert        debug MM32=$(M32) HIGHBITDEPTH=1
     80        $(MAKE) -C lib/TAppCommon       debug MM32=$(M32) HIGHBITDEPTH=1
     81        $(MAKE) -C app/TAppDecoder      debug MM32=$(M32) HIGHBITDEPTH=1
     82        $(MAKE) -C app/TAppEncoder      debug MM32=$(M32) HIGHBITDEPTH=1
     83        $(MAKE) -C lib/TLibDecoderAnalyser      debug MM32=$(M32) HIGHBITDEPTH=1
     84        $(MAKE) -C app/TAppDecoderAnalyser      debug MM32=$(M32) HIGHBITDEPTH=1
     85
     86release_highbitdepth:
     87        $(MAKE) -C lib/TLibVideoIO      release MM32=$(M32) HIGHBITDEPTH=1
     88        $(MAKE) -C lib/TLibCommon       release MM32=$(M32) HIGHBITDEPTH=1
     89        $(MAKE) -C lib/TLibDecoder      release MM32=$(M32) HIGHBITDEPTH=1
     90        $(MAKE) -C lib/TLibEncoder      release MM32=$(M32) HIGHBITDEPTH=1
     91  $(MAKE) -C app/TAppDownConvert        release MM32=$(M32) HIGHBITDEPTH=1
     92        $(MAKE) -C lib/TAppCommon       release MM32=$(M32) HIGHBITDEPTH=1
     93        $(MAKE) -C app/TAppDecoder      release MM32=$(M32) HIGHBITDEPTH=1
     94        $(MAKE) -C app/TAppEncoder      release MM32=$(M32) HIGHBITDEPTH=1
     95        $(MAKE) -C lib/TLibDecoderAnalyser      release MM32=$(M32) HIGHBITDEPTH=1
     96        $(MAKE) -C app/TAppDecoderAnalyser      release MM32=$(M32) HIGHBITDEPTH=1
     97
     98clean_highbitdepth:
     99        $(MAKE) -C lib/TLibVideoIO      clean MM32=$(M32) HIGHBITDEPTH=1
     100        $(MAKE) -C lib/TLibCommon       clean MM32=$(M32) HIGHBITDEPTH=1
     101        $(MAKE) -C lib/TLibDecoder      clean MM32=$(M32) HIGHBITDEPTH=1
     102        $(MAKE) -C lib/TLibEncoder      clean MM32=$(M32) HIGHBITDEPTH=1
     103  $(MAKE) -C app/TAppDownConvert        clean MM32=$(M32) HIGHBITDEPTH=1
     104        $(MAKE) -C lib/TAppCommon       clean MM32=$(M32) HIGHBITDEPTH=1
     105        $(MAKE) -C app/TAppDecoder      clean MM32=$(M32) HIGHBITDEPTH=1
     106        $(MAKE) -C app/TAppEncoder      clean MM32=$(M32) HIGHBITDEPTH=1
     107        $(MAKE) -C lib/TLibDecoderAnalyser      clean MM32=$(M32) HIGHBITDEPTH=1
     108        $(MAKE) -C app/TAppDecoderAnalyser      clean MM32=$(M32) HIGHBITDEPTH=1
     109
     110everything: all all_highbitdepth

  • branches/SHM-upgrade/build/vc10/TAppEncoder_vc10.vcxproj

    r125 r918  
    102102      <SubSystem>Console</SubSystem>
    103103      <TargetMachine>MachineX86</TargetMachine>
     104      <StackReserveSize>8000000</StackReserveSize>
    104105    </Link>
    105106  </ItemDefinitionGroup>
    … …  
    142143      <SubSystem>Console</SubSystem>
    143144      <TargetMachine>MachineX86</TargetMachine>
     145      <StackReserveSize>8000000</StackReserveSize>
    144146    </Link>
    145147  </ItemDefinitionGroup>

  • branches/SHM-upgrade/build/vc10/TAppEncoder_vc10.vcxproj.user

    r125 r918  
    22<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    4     <LocalDebuggerCommandArguments>-c cfg/per-sequence-svc/Bus-2x.cfg -c cfg/encoder_lowdelay_main.cfg -q0 30 -q1 30 -g 4 -f 5 -b str/Bus.bin -c option.cfg -ibl rec/BusBL-2x_rec.yuv -ibs rec/BusBL-2x_syntax.bin</LocalDebuggerCommandArguments>
     4    <LocalDebuggerCommandArguments>-c cfg/per-sequence-svc/Bus-2x.cfg -c cfg/encoder_lowdelay_scalable.cfg -c cfg/layers.cfg -q0 30 -q1 30 -g 4 -f 5 -b str/Bus.bin -c option.cfg </LocalDebuggerCommandArguments>
    55  </PropertyGroup>
    66  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

  • branches/SHM-upgrade/build/vc10/TLibCommon_vc10.vcxproj

    r713 r918  
    147147    <ClCompile Include="..\..\source\Lib\TLibCommon\ContextModel3DBuffer.cpp" />
    148148    <ClCompile Include="..\..\source\Lib\libmd5\libmd5.c" />
     149    <ClCompile Include="..\..\source\Lib\TLibCommon\Debug.cpp" />
    149150    <ClCompile Include="..\..\source\Lib\TLibCommon\SEI.cpp" />
    150151    <ClCompile Include="..\..\source\Lib\TLibCommon\TCom3DAsymLUT.cpp" />
    151152    <ClCompile Include="..\..\source\Lib\TLibCommon\TComBitStream.cpp" />
    152153    <ClCompile Include="..\..\source\Lib\TLibCommon\TComCABACTables.cpp" />
     154    <ClCompile Include="..\..\source\Lib\TLibCommon\TComChromaFormat.cpp" />
    153155    <ClCompile Include="..\..\source\Lib\TLibCommon\TComDataCU.cpp" />
    154156    <ClCompile Include="..\..\source\Lib\TLibCommon\TComInterpolationFilter.cpp" />
    … …  
    167169    <ClCompile Include="..\..\source\Lib\TLibCommon\TComSlice.cpp" />
    168170    <ClCompile Include="..\..\source\Lib\TLibCommon\TComTrQuant.cpp" />
     171    <ClCompile Include="..\..\source\Lib\TLibCommon\TComTU.cpp" />
    169172    <ClCompile Include="..\..\source\Lib\TLibCommon\TComUpsampleFilter.cpp" />
    170173    <ClCompile Include="..\..\source\Lib\TLibCommon\TComWeightPrediction.cpp" />
    … …  
    179182    <ClInclude Include="..\..\source\Lib\libmd5\libmd5.h" />
    180183    <ClInclude Include="..\..\source\Lib\libmd5\MD5.h" />
     184    <ClInclude Include="..\..\source\Lib\TLibCommon\Debug.h" />
    181185    <ClInclude Include="..\..\source\Lib\TLibCommon\NAL.h" />
    182186    <ClInclude Include="..\..\source\Lib\TLibCommon\SEI.h" />
    … …  
    185189    <ClInclude Include="..\..\source\Lib\TLibCommon\TComBitStream.h" />
    186190    <ClInclude Include="..\..\source\Lib\TLibCommon\TComCABACTables.h" />
     191    <ClInclude Include="..\..\source\Lib\TLibCommon\TComChromaFormat.h" />
     192    <ClInclude Include="..\..\source\Lib\TLibCommon\TComCodingStatistics.h" />
    187193    <ClInclude Include="..\..\source\Lib\TLibCommon\TComDataCU.h" />
    188194    <ClInclude Include="..\..\source\Lib\TLibCommon\TComInterpolationFilter.h" />
    … …  
    198204    <ClInclude Include="..\..\source\Lib\TLibCommon\TComRdCost.h" />
    199205    <ClInclude Include="..\..\source\Lib\TLibCommon\TComRdCostWeightPrediction.h" />
     206    <ClInclude Include="..\..\source\Lib\TLibCommon\TComRectangle.h" />
    200207    <ClInclude Include="..\..\source\Lib\TLibCommon\TComRom.h" />
    201208    <ClInclude Include="..\..\source\Lib\TLibCommon\TComSampleAdaptiveOffset.h" />
    202209    <ClInclude Include="..\..\source\Lib\TLibCommon\TComSlice.h" />
    203210    <ClInclude Include="..\..\source\Lib\TLibCommon\TComTrQuant.h" />
     211    <ClInclude Include="..\..\source\Lib\TLibCommon\TComTU.h" />
    204212    <ClInclude Include="..\..\source\Lib\TLibCommon\TComUpsampleFilter.h" />
    205213    <ClInclude Include="..\..\source\Lib\TLibCommon\TComWeightPrediction.h" />

  • branches/SHM-upgrade/build/vc10/TLibCommon_vc10.vcxproj.filters

    r125 r918  
    8787      <Filter>Source Files</Filter>
    8888    </ClCompile>
     89    <ClCompile Include="..\..\source\Lib\TLibCommon\TCom3DAsymLUT.cpp">
     90      <Filter>Source Files</Filter>
     91    </ClCompile>
     92    <ClCompile Include="..\..\source\Lib\TLibCommon\TComChromaFormat.cpp">
     93      <Filter>Source Files</Filter>
     94    </ClCompile>
     95    <ClCompile Include="..\..\source\Lib\TLibCommon\Debug.cpp">
     96      <Filter>Source Files</Filter>
     97    </ClCompile>
     98    <ClCompile Include="..\..\source\Lib\TLibCommon\TComTU.cpp">
     99      <Filter>Source Files</Filter>
     100    </ClCompile>
    89101  </ItemGroup>
    90102  <ItemGroup>
    … …  
    188200      <Filter>Header Files</Filter>
    189201    </ClInclude>
     202    <ClInclude Include="..\..\source\Lib\TLibCommon\TCom3DAsymLUT.h">
     203      <Filter>Header Files</Filter>
     204    </ClInclude>
     205    <ClInclude Include="..\..\source\Lib\TLibCommon\TComChromaFormat.h">
     206      <Filter>Header Files</Filter>
     207    </ClInclude>
     208    <ClInclude Include="..\..\source\Lib\TLibCommon\TComCodingStatistics.h">
     209      <Filter>Header Files</Filter>
     210    </ClInclude>
     211    <ClInclude Include="..\..\source\Lib\TLibCommon\TComRectangle.h">
     212      <Filter>Header Files</Filter>
     213    </ClInclude>
     214    <ClInclude Include="..\..\source\Lib\TLibCommon\Debug.h">
     215      <Filter>Header Files</Filter>
     216    </ClInclude>
     217    <ClInclude Include="..\..\source\Lib\TLibCommon\TComTU.h">
     218      <Filter>Header Files</Filter>
     219    </ClInclude>
    190220  </ItemGroup>
    191221</Project>

  • branches/SHM-upgrade/source/App/TAppDecoder/TAppDecTop.cpp

    r916 r918  
    254254
    255255#if POC_RESET_IDC_DECODER
    256     if ( (bNewPicture && m_acTDecTop[nalu.m_layerId].getParseIdc() == 3) || (m_acTDecTop[nalu.m_layerId].getParseIdc() == 0) || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS &&
     256    if ( ( (bNewPicture && m_acTDecTop[nalu.m_layerId].getParseIdc() == 3) || m_acTDecTop[nalu.m_layerId].getParseIdc() == 0 || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS ) &&
    257257        !m_acTDecTop[nalu.m_layerId].getFirstSliceInSequence() )
    258258#else
    259     if (bNewPicture || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS &&
     259    if ( (bNewPicture || !bitstreamFile || nalu.m_nalUnitType == NAL_UNIT_EOS) &&
    260260        !m_acTDecTop[nalu.m_layerId].getFirstSliceInSequence() )
    261261#endif

  • branches/SHM-upgrade/source/App/TAppEncoder/TAppEncCfg.cpp

    r917 r918  
    38353835    for(UInt layer=0; layer<m_numLayers; layer++)
    38363836    {
    3837       Int m_iIntraPeriod = m_acLayerCfg[layer].m_iIntraPeriod;
    3838       if ( (m_iIntraPeriod != 1) && !m_loopFilterOffsetInPPS && m_DeblockingFilterControlPresent && (!m_bLoopFilterDisable) )
     3837      if ( (m_acLayerCfg[layer].m_iIntraPeriod != 1) && !m_loopFilterOffsetInPPS && m_DeblockingFilterControlPresent && (!m_bLoopFilterDisable) )
    38393838      {
    38403839        for(Int i=0; i<m_iGOPSize; i++)

  • branches/SHM-upgrade/source/App/TAppEncoder/TAppEncTop.cpp

    r917 r918  
    11221122#if O0194_DIFFERENT_BITDEPTH_EL_BL
    11231123    //2
    1124     for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
     1124    for( UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
    11251125    {
    11261126      g_bitDepth[channelTypeIndex]    = m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
    … …  
    12061206#if O0194_DIFFERENT_BITDEPTH_EL_BL
    12071207    //3
    1208     for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
     1208    for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
    12091209    {
    12101210      g_bitDepth[channelTypeIndex]    = m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
    … …  
    20702070#if O0194_DIFFERENT_BITDEPTH_EL_BL
    20712071        //6
    2072         for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
     2072        for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
    20732073        {
    20742074          g_bitDepth[channelTypeIndex]    = m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
    … …  
    21642164#if O0194_DIFFERENT_BITDEPTH_EL_BL
    21652165        //7
    2166         for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
     2166        for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
    21672167        {
    21682168          g_bitDepth[channelTypeIndex]    = m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
    … …  
    22292229#if O0194_DIFFERENT_BITDEPTH_EL_BL
    22302230      //8
    2231       for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
    2232       {
    2233         g_bitDepth[channelTypeIndex]      = m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
     2231      for (UInt channelTypeIndex = 0; channelTypeIndex < MAX_NUM_CHANNEL_TYPE; channelTypeIndex++)
     2232      {
     2233        g_bitDepth[channelTypeIndex]    = m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
    22342234        g_PCMBitDepth[channelTypeIndex] = m_bPCMInputBitDepthFlag ? m_acLayerCfg[layer].m_inputBitDepth[channelTypeIndex] : m_acLayerCfg[layer].m_internalBitDepth[channelTypeIndex];
    22352235      }

  • branches/SHM-upgrade/source/Lib/TLibDecoder/SyntaxElementParser.cpp

    r916 r918  
    4343#include "TLibCommon/TComBitStream.h"
    4444#include "SyntaxElementParser.h"
     45#if RExt__DECODER_DEBUG_BIT_STATISTICS
     46#include "TLibCommon/TComCodingStatistics.h"
     47#endif
    4548
    4649#if ENC_DEC_TRACE
    … …  
    219222
    220223#if Q0096_OVERLAY_SEI
    221 Void  SyntaxElementParser::xReadString  (UInt bufSize, UChar *pVal, UInt& rLength)
     224#if RExt__DECODER_DEBUG_BIT_STATISTICS
     225Void SyntaxElementParser::xReadString (UInt bufSize, UChar *pVal, UInt& rLength, const Char *pSymbolName)
     226#else
     227Void  SyntaxElementParser::xReadString (UInt bufSize, UChar *pVal, UInt& rLength)
     228#endif
    222229{
    223230  assert( m_pcBitstream->getNumBitsRead() % 8 == 0 ); //always start reading at a byte-aligned position

  • branches/SHM-upgrade/source/Lib/TLibDecoder/SyntaxElementParser.h

    r916 r918  
    6464#define READ_FLAG(        code, name)     xReadFlag (         code, name )
    6565#if Q0096_OVERLAY_SEI
    66 #define READ_STRING(bufSize, code, length, name)   xReadStringTr ( bufSize, code, length, name )
     66#define READ_STRING(bufSize, code, length, name)   xReadString ( bufSize, code, length, name )
    6767#endif
    6868
    … …  
    103103  Void  xReadFlag    ( UInt&  val, const Char *pSymbolName );
    104104#if Q0096_OVERLAY_SEI
    105   Void  xReadStringTr(UInt bufSize, UChar *pValue, UInt& rLength, const Char *pSymbolName);
     105  Void  xReadString  (UInt bufSize, UChar *pValue, UInt& rLength, const Char *pSymbolName);
    106106#endif
    107107#else

  • branches/SHM-upgrade/source/Lib/TLibDecoder/TDecCAVLC.cpp

    r916 r918  
    183183
    184184#if Q0048_CGS_3D_ASYMLUT
    185 Void TDecCavlc::parsePPS(TComPPS* pcPPS, TCom3DAsymLUT * pc3DAsymLUT , Int nLayerID)
     185Void TDecCavlc::parsePPS(TComPPS* pcPPS, TCom3DAsymLUT * pc3DAsymLUT, Int nLayerID)
    186186#else
    187187Void TDecCavlc::parsePPS(TComPPS* pcPPS)
    … …  
    413413#if REF_REGION_OFFSET
    414414            READ_UVLC( uiCode,      "num_ref_loc_offsets" ); pcPPS->setNumScaledRefLayerOffsets(uiCode);
    415             for(Int i = 0; i < pcPPS->getNumScaledRefLayerOffsets(); i++)
     415            for(Int k = 0; k < pcPPS->getNumScaledRefLayerOffsets(); k++)
    416416            {
    417               READ_CODE( 6, uiCode,  "ref_loc_offset_layer_id" );  pcPPS->setScaledRefLayerId( i, uiCode );
    418               READ_FLAG( uiCode, "scaled_ref_layer_offset_present_flag" );   pcPPS->setScaledRefLayerOffsetPresentFlag( i, uiCode );
     417              READ_CODE( 6, uiCode,  "ref_loc_offset_layer_id" );  pcPPS->setScaledRefLayerId( k, uiCode );
     418              READ_FLAG( uiCode, "scaled_ref_layer_offset_present_flag" );   pcPPS->setScaledRefLayerOffsetPresentFlag( k, uiCode );
    419419              if (uiCode)
    420420              {
    421                 Window& scaledWindow = pcPPS->getScaledRefLayerWindow(i);
     421                Window& scaledWindow = pcPPS->getScaledRefLayerWindow(k);
    422422                READ_SVLC( iCode, "scaled_ref_layer_left_offset" );    scaledWindow.setWindowLeftOffset  (iCode << 1);
    423423                READ_SVLC( iCode, "scaled_ref_layer_top_offset" );     scaledWindow.setWindowTopOffset   (iCode << 1);
    … …  
    428428#endif
    429429              }
    430               READ_FLAG( uiCode, "ref_region_offset_present_flag" );   pcPPS->setRefRegionOffsetPresentFlag( i, uiCode );
     430              READ_FLAG( uiCode, "ref_region_offset_present_flag" );   pcPPS->setRefRegionOffsetPresentFlag( k, uiCode );
    431431              if (uiCode)
    432432              {
    433                 Window& refWindow = pcPPS->getRefLayerWindow(i);
     433                Window& refWindow = pcPPS->getRefLayerWindow(k);
    434434                READ_SVLC( iCode, "ref_region_left_offset" );    refWindow.setWindowLeftOffset  (iCode << 1);
    435435                READ_SVLC( iCode, "ref_region_top_offset" );     refWindow.setWindowTopOffset   (iCode << 1);
    … …  
    438438              }
    439439#if R0209_GENERIC_PHASE
    440               READ_FLAG( uiCode, "resample_phase_set_present_flag" );   pcPPS->setResamplePhaseSetPresentFlag( i, uiCode );
     440              READ_FLAG( uiCode, "resample_phase_set_present_flag" );   pcPPS->setResamplePhaseSetPresentFlag( k, uiCode );
    441441              if (uiCode)
    442442              {
    443                 READ_UVLC( uiCode, "phase_hor_luma" );    pcPPS->setPhaseHorLuma ( i, uiCode );
    444                 READ_UVLC( uiCode, "phase_ver_luma" );    pcPPS->setPhaseVerLuma ( i, uiCode );
    445                 READ_UVLC( uiCode, "phase_hor_chroma_plus8" );  pcPPS->setPhaseHorChroma (i, uiCode - 8);
    446                 READ_UVLC( uiCode, "phase_ver_chroma_plus8" );  pcPPS->setPhaseVerChroma (i, uiCode - 8);
     443                READ_UVLC( uiCode, "phase_hor_luma" );    pcPPS->setPhaseHorLuma ( k, uiCode );
     444                READ_UVLC( uiCode, "phase_ver_luma" );    pcPPS->setPhaseVerLuma ( k, uiCode );
     445                READ_UVLC( uiCode, "phase_hor_chroma_plus8" );  pcPPS->setPhaseHorChroma (k, uiCode - 8);
     446                READ_UVLC( uiCode, "phase_ver_chroma_plus8" );  pcPPS->setPhaseVerChroma (k, uiCode - 8);
    447447              }
    448448#endif
    … …  
    451451#if MOVE_SCALED_OFFSET_TO_PPS
    452452            READ_UVLC( uiCode,      "num_scaled_ref_layer_offsets" ); pcPPS->setNumScaledRefLayerOffsets(uiCode);
    453             for(Int i = 0; i < pcPPS->getNumScaledRefLayerOffsets(); i++)
     453            for(Int k = 0; k < pcPPS->getNumScaledRefLayerOffsets(); k++)
    454454            {
    455               Window& scaledWindow = pcPPS->getScaledRefLayerWindow(i);
     455              Window& scaledWindow = pcPPS->getScaledRefLayerWindow(k);
    456456#if O0098_SCALED_REF_LAYER_ID
    457               READ_CODE( 6,  uiCode,  "scaled_ref_layer_id" );       pcPPS->setScaledRefLayerId( i, uiCode );
     457              READ_CODE( 6,  uiCode,  "scaled_ref_layer_id" );       pcPPS->setScaledRefLayerId( k, uiCode );
    458458#endif
    459459              READ_SVLC( iCode, "scaled_ref_layer_left_offset" );    scaledWindow.setWindowLeftOffset  (iCode << 1);
    … …  
    462462              READ_SVLC( iCode, "scaled_ref_layer_bottom_offset" );  scaledWindow.setWindowBottomOffset(iCode << 1);
    463463#if P0312_VERT_PHASE_ADJ
    464               READ_FLAG( uiCode, "vert_phase_position_enable_flag" ); scaledWindow.setVertPhasePositionEnableFlag(uiCode);  pcPPS->setVertPhasePositionEnableFlag( pcPPS->getScaledRefLayerId(i), uiCode);
     464              READ_FLAG( uiCode, "vert_phase_position_enable_flag" ); scaledWindow.setVertPhasePositionEnableFlag(uiCode);  pcPPS->setVertPhasePositionEnableFlag( pcPPS->getScaledRefLayerId(k), uiCode);
    465465#endif
    466466            }

  • branches/SHM-upgrade/source/Lib/TLibEncoder/TEncCavlc.cpp

    r916 r918  
    318318#if REF_REGION_OFFSET
    319319            WRITE_UVLC( pcPPS->getNumScaledRefLayerOffsets(),      "num_ref_loc_offsets" );
    320             for(Int num = 0; num < pcPPS->getNumScaledRefLayerOffsets(); num++)
     320            for(Int k = 0; k < pcPPS->getNumScaledRefLayerOffsets(); k++)
    321321            {
    322               WRITE_CODE( pcPPS->getScaledRefLayerId(num), 6, "ref_loc_offset_layer_id" );
    323               WRITE_FLAG( pcPPS->getScaledRefLayerOffsetPresentFlag(num) ? 1 : 0, "scaled_ref_layer_offset_prsent_flag" );
    324               if (pcPPS->getScaledRefLayerOffsetPresentFlag(num))
     322              WRITE_CODE( pcPPS->getScaledRefLayerId(k), 6, "ref_loc_offset_layer_id" );
     323              WRITE_FLAG( pcPPS->getScaledRefLayerOffsetPresentFlag(k) ? 1 : 0, "scaled_ref_layer_offset_prsent_flag" );
     324              if (pcPPS->getScaledRefLayerOffsetPresentFlag(k))
    325325              {
    326                 Window scaledWindow = pcPPS->getScaledRefLayerWindow(num);
     326                Window scaledWindow = pcPPS->getScaledRefLayerWindow(k);
    327327                WRITE_SVLC( scaledWindow.getWindowLeftOffset()   >> 1, "scaled_ref_layer_left_offset" );
    328328                WRITE_SVLC( scaledWindow.getWindowTopOffset()    >> 1, "scaled_ref_layer_top_offset" );
    … …  
    330330                WRITE_SVLC( scaledWindow.getWindowBottomOffset() >> 1, "scaled_ref_layer_bottom_offset" );
    331331              }
    332               WRITE_FLAG( pcPPS->getRefRegionOffsetPresentFlag(num) ? 1 : 0, "ref_region_offset_prsent_flag" );
    333               if (pcPPS->getRefRegionOffsetPresentFlag(num))
     332              WRITE_FLAG( pcPPS->getRefRegionOffsetPresentFlag(k) ? 1 : 0, "ref_region_offset_prsent_flag" );
     333              if (pcPPS->getRefRegionOffsetPresentFlag(k))
    334334              {
    335                 Window refWindow = pcPPS->getRefLayerWindow(num);
     335                Window refWindow = pcPPS->getRefLayerWindow(k);
    336336                WRITE_SVLC( refWindow.getWindowLeftOffset()   >> 1, "ref_region_left_offset" );
    337337                WRITE_SVLC( refWindow.getWindowTopOffset()    >> 1, "ref_region_top_offset" );
    … …  
    340340              }
    341341#if R0209_GENERIC_PHASE
    342               WRITE_FLAG( pcPPS->getResamplePhaseSetPresentFlag(num) ? 1 : 0, "resample_phase_set_present_flag" );
    343               if (pcPPS->getResamplePhaseSetPresentFlag(num))
     342              WRITE_FLAG( pcPPS->getResamplePhaseSetPresentFlag(k) ? 1 : 0, "resample_phase_set_present_flag" );
     343              if (pcPPS->getResamplePhaseSetPresentFlag(k))
    344344              {
    345                 WRITE_UVLC( pcPPS->getPhaseHorLuma(num), "phase_hor_luma" );
    346                 WRITE_UVLC( pcPPS->getPhaseVerLuma(num), "phase_ver_luma" );
    347                 WRITE_UVLC( pcPPS->getPhaseHorChroma(num) + 8, "phase_hor_chroma_plus8" );
    348                 WRITE_UVLC( pcPPS->getPhaseVerChroma(num) + 8, "phase_ver_chroma_plus8" );
     345                WRITE_UVLC( pcPPS->getPhaseHorLuma(k), "phase_hor_luma" );
     346                WRITE_UVLC( pcPPS->getPhaseVerLuma(k), "phase_ver_luma" );
     347                WRITE_UVLC( pcPPS->getPhaseHorChroma(k) + 8, "phase_hor_chroma_plus8" );
     348                WRITE_UVLC( pcPPS->getPhaseVerChroma(k) + 8, "phase_ver_chroma_plus8" );
    349349              }
    350350#endif
    … …  
    353353#if MOVE_SCALED_OFFSET_TO_PPS
    354354            WRITE_UVLC( pcPPS->getNumScaledRefLayerOffsets(),      "num_scaled_ref_layer_offsets" );
    355             for(Int num = 0; num < pcPPS->getNumScaledRefLayerOffsets(); num++)
     355            for(Int k = 0; k < pcPPS->getNumScaledRefLayerOffsets(); k++)
    356356            {
    357               Window scaledWindow = pcPPS->getScaledRefLayerWindow(num);
     357              Window scaledWindow = pcPPS->getScaledRefLayerWindow(k);
    358358#if O0098_SCALED_REF_LAYER_ID
    359               WRITE_CODE( pcPPS->getScaledRefLayerId(num), 6,          "scaled_ref_layer_id" );
     359              WRITE_CODE( pcPPS->getScaledRefLayerId(k), 6,          "scaled_ref_layer_id" );
    360360#endif
    361361              WRITE_SVLC( scaledWindow.getWindowLeftOffset()   >> 1, "scaled_ref_layer_left_offset" );
Note: See TracChangeset for help on using the changeset viewer.