Changeset 941 in SHVCSoftware
- Timestamp:
- 30 Dec 2014, 18:47:09 (10 years ago)
- Location:
- branches/SHM-dev
- Files:
-
- 66 edited
-
cfg/encoder_intra_main.cfg (modified) (1 diff)
-
cfg/encoder_intra_main10.cfg (modified) (1 diff)
-
cfg/encoder_lowdelay_P_main.cfg (modified) (1 diff)
-
cfg/encoder_lowdelay_P_main10.cfg (modified) (1 diff)
-
cfg/encoder_lowdelay_main.cfg (modified) (1 diff)
-
cfg/encoder_lowdelay_main10.cfg (modified) (1 diff)
-
cfg/encoder_randomaccess_main.cfg (modified) (1 diff)
-
cfg/encoder_randomaccess_main10.cfg (modified) (1 diff)
-
cfg/layers.cfg (modified) (1 diff)
-
cfg/layers_avcbase.cfg (modified) (1 diff)
-
cfg/per-sequence-svc-avcbase/BQTerrace-1.5x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/BQTerrace-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/BQTerrace-SNR.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/BasketballDrive-1.5x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/BasketballDrive-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/BasketballDrive-SNR.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/Cactus-1.5x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/Cactus-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/Cactus-SNR.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/Kimono-1.5x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/Kimono-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/Kimono-SNR.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/ParkScene-1.5x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/ParkScene-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/ParkScene-SNR.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/PeopleOnStreet-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/PeopleOnStreet-SNR.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/Traffic-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc-avcbase/Traffic-SNR.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/BQTerrace-1.5x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/BQTerrace-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/BQTerrace-SNR.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/BasketballDrive-1.5x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/BasketballDrive-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/BasketballDrive-SNR.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/CGS-Birthday-b10-1x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/CGS-Birthday-b8-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/CGS-BirthdayFlashPart1-b10-1x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/CGS-BirthdayFlashPart1-b8-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/CGS-BirthdayFlashPart2-b10-1x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/CGS-BirthdayFlashPart2-b8-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/CGS-Parakeets-b10-1x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/CGS-Parakeets-b8-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/CGS-TableCar-b10-1x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/CGS-TableCar-b8-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/Cactus-1.5x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/Cactus-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/Cactus-SNR.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/Kimono-1.5x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/Kimono-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/Kimono-SNR.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/ParkScene-1.5x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/ParkScene-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/ParkScene-SNR.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/PeopleOnStreet-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/PeopleOnStreet-SNR.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/Traffic-2x.cfg (modified) (3 diffs)
-
cfg/per-sequence-svc/Traffic-SNR.cfg (modified) (3 diffs)
-
source/App/TAppEncoder/TAppEncCfg.cpp (modified) (7 diffs)
-
source/App/TAppEncoder/TAppEncCfg.h (modified) (2 diffs)
-
source/App/TAppEncoder/TAppEncTop.cpp (modified) (9 diffs)
-
source/Lib/TLibCommon/TComSlice.h (modified) (5 diffs)
-
source/Lib/TLibCommon/TypeDef.h (modified) (1 diff)
-
source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (5 diffs)
-
source/Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)
-
source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/SHM-dev/cfg/encoder_intra_main.cfg
r876 r941 4 4 5 5 #======== Profile/Level ================ 6 Profile : main 6 #Profile : main 7 NumProfileTierLevel : 3 8 #Profile for the whole bitstream 9 Profile0 : main 10 #Profile for the base layer --- this will be ignored when BL is not HEVC 11 Profile1 : main 12 #Profile for the enhancement layer 13 Profile2 : main 7 14 8 15 #======== Unit definition ================ -
branches/SHM-dev/cfg/encoder_intra_main10.cfg
r876 r941 4 4 5 5 #======== Profile/Level ================ 6 Profile : main10 6 #Profile : main10 7 NumProfileTierLevel : 3 8 #Profile for the whole bitstream 9 Profile0 : main10 10 #Profile for the base layer --- this will be ignored when BL is not HEVC 11 Profile1 : main10 12 #Profile for the enhancement layer 13 Profile2 : main10 7 14 8 15 #======== Unit definition ================ -
branches/SHM-dev/cfg/encoder_lowdelay_P_main.cfg
r876 r941 4 4 5 5 #======== Profile/Level ================ 6 Profile : main 6 #Profile : main 7 NumProfileTierLevel : 3 8 #Profile for the whole bitstream 9 Profile0 : main 10 #Profile for the base layer --- this will be ignored when BL is not HEVC 11 Profile1 : main 12 #Profile for the enhancement layer 13 Profile2 : main 7 14 8 15 #======== Unit definition ================ -
branches/SHM-dev/cfg/encoder_lowdelay_P_main10.cfg
r876 r941 4 4 5 5 #======== Profile/Level ================ 6 Profile : main10 6 #Profile : main10 7 NumProfileTierLevel : 3 8 #Profile for the whole bitstream 9 Profile0 : main10 10 #Profile for the base layer --- this will be ignored when BL is not HEVC 11 Profile1 : main10 12 #Profile for the enhancement layer 13 Profile2 : main10 7 14 8 15 #======== Unit definition ================ -
branches/SHM-dev/cfg/encoder_lowdelay_main.cfg
r876 r941 4 4 5 5 #======== Profile/Level ================ 6 Profile : main 6 #Profile : main 7 NumProfileTierLevel : 3 8 #Profile for the whole bitstream 9 Profile0 : main 10 #Profile for the base layer --- this will be ignored when BL is not HEVC 11 Profile1 : main 12 #Profile for the enhancement layer 13 Profile2 : main 7 14 8 15 #======== Unit definition ================ -
branches/SHM-dev/cfg/encoder_lowdelay_main10.cfg
r876 r941 4 4 5 5 #======== Profile/Level ================ 6 Profile : main10 6 #Profile : main10 7 NumProfileTierLevel : 3 8 #Profile for the whole bitstream 9 Profile0 : main10 10 #Profile for the base layer --- this will be ignored when BL is not HEVC 11 Profile1 : main10 12 #Profile for the enhancement layer 13 Profile2 : main10 7 14 8 15 #======== Unit definition ================ -
branches/SHM-dev/cfg/encoder_randomaccess_main.cfg
r876 r941 4 4 5 5 #======== Profile/Level ================ 6 Profile : main 6 #Profile : main 7 NumProfileTierLevel : 3 8 #Profile for the whole bitstream 9 Profile0 : main 10 #Profile for the base layer --- this will be ignored when BL is not HEVC 11 Profile1 : main 12 #Profile for the enhancement layer 13 Profile2 : main 7 14 8 15 #======== Unit definition ================ -
branches/SHM-dev/cfg/encoder_randomaccess_main10.cfg
r876 r941 4 4 5 5 #======== Profile/Level ================ 6 Profile : main10 6 #Profile : main10 7 NumProfileTierLevel : 3 8 #Profile for the whole bitstream 9 Profile0 : main10 10 #Profile for the base layer --- this will be ignored when BL is not HEVC 11 Profile1 : main10 12 #Profile for the enhancement layer 13 Profile2 : main10 7 14 8 15 #======== Unit definition ================ -
branches/SHM-dev/cfg/layers.cfg
r876 r941 59 59 # ListOfOutputLayers0 need not be specified 60 60 ListOfOutputLayers1 : 1 61 ListOfProfileTierLevelOls1 : 1 2 -
branches/SHM-dev/cfg/layers_avcbase.cfg
r876 r941 54 54 NumLayersInOutputLayerSet : 1 # The number of layers in the 0-th OLS should not be specified, 55 55 # ListOfOutputLayers0 need not be specified 56 ListOfOutputLayers1 : 1 56 ListOfOutputLayers1 : 1 57 ListOfProfileTierLevelOls1 : 1 2 58 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/BQTerrace-1.5x.cfg
r595 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 600 # Number of frames to be coded 3 Level : 4.1 3 #Level : 4.1 4 #This is level of the whole bitstream 5 Level0 : 4.1 6 #This is level of the base layer 7 Level1 : 3.1 8 #This is level of the enhancement layer 9 Level2 : 4.1 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : BQTerrace_1920x1080_60.yuv … … 23 30 ConformanceMode1 : 1 # conformance mode 24 31 QP1 : 20 32 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/BQTerrace-2x.cfg
r911 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 600 # Number of frames to be coded 3 Level : 4.1 3 #Level : 4.1 4 #This is level of the whole bitstream 5 Level0 : 4.1 6 #This is level of the base layer 7 Level1 : 3.1 8 #This is level of the enhancement layer 9 Level2 : 4.1 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : BQTerrace_1920x1080_60.yuv … … 29 36 ResamplePhaseSetPresentFlag1 : 0 # List of resample phase set present flags 30 37 QP1 : 20 31 38 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/BQTerrace-SNR.cfg
r911 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 600 # Number of frames to be coded 3 Level : 4.1 3 #Level : 4.1 4 #This is level of the whole bitstream 5 Level0 : 4.1 6 #This is level of the base layer 7 Level1 : 4.1 8 #This is level of the enhancement layer 9 Level2 : 4.1 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : BQTerrace_1920x1080_60.yuv … … 29 36 ResamplePhaseSetPresentFlag1 : 0 # List of resample phase set present flags 30 37 QP1 : 20 38 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/BasketballDrive-1.5x.cfg
r595 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 500 # Number of frames to be coded 3 Level : 4.1 3 #Level : 4.1 4 #This is level of the whole bitstream 5 Level0 : 4.1 6 #This is level of the base layer 7 Level1 : 3.1 8 #This is level of the enhancement layer 9 Level2 : 4.1 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : BasketballDrive_1920x1080_50.yuv … … 23 30 ConformanceMode1 : 1 # conformance mode 24 31 QP1 : 20 32 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/BasketballDrive-2x.cfg
r911 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 500 # Number of frames to be coded 3 Level : 4.1 3 #Level : 4.1 4 #This is level of the whole bitstream 5 Level0 : 4.1 6 #This is level of the base layer 7 Level1 : 3.1 8 #This is level of the enhancement layer 9 Level2 : 4.1 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : BasketballDrive_1920x1080_50.yuv … … 29 36 ResamplePhaseSetPresentFlag1 : 0 # List of resample phase set present flags 30 37 QP1 : 20 31 38 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/BasketballDrive-SNR.cfg
r911 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 500 # Number of frames to be coded 3 Level : 4.1 3 #Level : 4.1 4 #This is level of the whole bitstream 5 Level0 : 4.1 6 #This is level of the base layer 7 Level1 : 3.1 8 #This is level of the enhancement layer 9 Level2 : 4.1 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : BasketballDrive_1920x1080_50.yuv … … 29 36 ResamplePhaseSetPresentFlag1 : 0 # List of resample phase set present flags 30 37 QP1 : 20 38 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/Cactus-1.5x.cfg
r595 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 500 # Number of frames to be coded 3 Level : 4.1 3 #Level : 4.1 4 #This is level of the whole bitstream 5 Level0 : 4.1 6 #This is level of the base layer 7 Level1 : 3.1 8 #This is level of the enhancement layer 9 Level2 : 4.1 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : Cactus_1920x1080_50.yuv … … 23 30 ConformanceMode1 : 1 # conformance mode 24 31 QP1 : 20 32 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/Cactus-2x.cfg
r911 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 500 # Number of frames to be coded 3 Level : 4.1 3 #Level : 4.1 4 #This is level of the whole bitstream 5 Level0 : 4.1 6 #This is level of the base layer 7 Level1 : 3.1 8 #This is level of the enhancement layer 9 Level2 : 4.1 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : Cactus_1920x1080_50.yuv … … 29 36 ResamplePhaseSetPresentFlag1 : 0 # List of resample phase set present flags 30 37 QP1 : 20 31 38 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/Cactus-SNR.cfg
r911 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 500 # Number of frames to be coded 3 Level : 4.1 3 #Level : 4.1 4 #This is level of the whole bitstream 5 Level0 : 4.1 6 #This is level of the base layer 7 Level1 : 4.1 8 #This is level of the enhancement layer 9 Level2 : 4.1 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : Cactus_1920x1080_50.yuv … … 29 36 ResamplePhaseSetPresentFlag1 : 0 # List of resample phase set present flags 30 37 QP1 : 20 38 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/Kimono-1.5x.cfg
r595 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 240 # Number of frames to be coded 3 Level : 4 3 #Level : 4 4 #This is level of the whole bitstream 5 Level0 : 4 6 #This is level of the base layer 7 Level1 : 3.1 8 #This is level of the enhancement layer 9 Level2 : 4 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : Kimono1_1920x1080_24.yuv … … 23 30 ConformanceMode1 : 1 # conformance mode 24 31 QP1 : 20 32 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/Kimono-2x.cfg
r911 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 240 # Number of frames to be coded 3 Level : 4 3 #Level : 4 4 #This is level of the whole bitstream 5 Level0 : 4 6 #This is level of the base layer 7 Level1 : 3.1 8 #This is level of the enhancement layer 9 Level2 : 4 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : O:/Kimono1_1920x1080_24.yuv … … 29 36 ResamplePhaseSetPresentFlag1 : 0 # List of resample phase set present flags 30 37 QP1 : 20 38 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/Kimono-SNR.cfg
r911 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 240 # Number of frames to be coded 3 Level : 4 3 #Level : 4 4 #This is level of the whole bitstream 5 Level0 : 4 6 #This is level of the base layer 7 Level1 : 4 8 #This is level of the enhancement layer 9 Level2 : 4 10 4 11 5 12 #======== File I/O =============== … … 13 20 ConformanceMode0 : 1 # conformance mode 14 21 QP0 : 22 22 LayerPTLIndex0 : 1 15 23 16 24 InputFile1 : Kimono1_1920x1080_24.yuv … … 29 37 ResamplePhaseSetPresentFlag1 : 0 # List of resample phase set present flags 30 38 QP1 : 20 39 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/ParkScene-1.5x.cfg
r595 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 240 # Number of frames to be coded 3 Level : 4 3 #Level : 4 4 #This is level of the whole bitstream 5 Level0 : 4 6 #This is level of the base layer 7 Level1 : 3.1 8 #This is level of the enhancement layer 9 Level2 : 4 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : ParkScene_1920x1080_24.yuv … … 23 30 ConformanceMode1 : 1 # conformance mode 24 31 QP1 : 20 32 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/ParkScene-2x.cfg
r911 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 240 # Number of frames to be coded 3 Level : 4 4 3 #Level : 4 4 #This is level of the whole bitstream 5 Level0 : 4 6 #This is level of the base layer 7 Level1 : 3.1 8 #This is level of the enhancement layer 9 Level2 : 4 5 10 #======== File I/O =============== 6 11 InputFile0 : ParkScene_960x544_24_zerophase_0.9pi.yuv … … 13 18 ConformanceMode0 : 1 # conformance mode 14 19 QP0 : 22 20 LayerPTLIndex0 : 1 15 21 16 22 InputFile1 : ParkScene_1920x1080_24.yuv … … 29 35 ResamplePhaseSetPresentFlag1 : 0 # List of resample phase set present flags 30 36 QP1 : 20 37 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/ParkScene-SNR.cfg
r911 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 240 # Number of frames to be coded 3 Level : 4 3 #Level : 4 4 #This is level of the whole bitstream 5 Level0 : 4 6 #This is level of the base layer 7 Level1 : 4 8 #This is level of the enhancement layer 9 Level2 : 4 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : ParkScene_1920x1080_24.yuv … … 29 36 ResamplePhaseSetPresentFlag1 : 0 # List of resample phase set present flags 30 37 QP1 : 20 38 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/PeopleOnStreet-2x.cfg
r595 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 150 # Number of frames to be coded 3 Level : 5 3 #Level : 5 4 #This is level of the whole bitstream 5 Level0 : 5 6 #This is level of the base layer 7 Level1 : 3.1 8 #This is level of the enhancement layer 9 Level2 : 5 4 10 11 #====== 5 12 #======== File I/O =============== 6 13 InputFile0 : PeopleOnStreet_1280x800_30_crop_zerophase_0.9pi.yuv … … 13 20 ConformanceMode0 : 1 # conformance mode 14 21 QP0 : 22 22 LayerPTLIndex0 : 1 15 23 16 24 InputFile1 : PeopleOnStreet_2560x1600_30_crop.yuv … … 23 31 ConformanceMode1 : 1 # conformance mode 24 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/PeopleOnStreet-SNR.cfg
r595 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 150 # Number of frames to be coded 3 Level : 5 3 #Level : 5 4 #This is level of the whole bitstream 5 Level0 : 5 6 #This is level of the base layer 7 Level1 : 5 8 #This is level of the enhancement layer 9 Level2 : 5 4 10 11 #====== 5 12 #======== File I/O =============== 6 13 InputFile0 : PeopleOnStreet_2560x1600_30_crop.yuv … … 13 20 ConformanceMode0 : 1 # conformance mode 14 21 QP0 : 22 22 LayerPTLIndex0 : 1 15 23 16 24 InputFile1 : PeopleOnStreet_2560x1600_30_crop.yuv … … 23 31 ConformanceMode1 : 1 # conformance mode 24 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/Traffic-2x.cfg
r595 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 150 # Number of frames to be coded 3 Level : 5 3 #Level : 5 4 #This is level of the whole bitstream 5 Level0 : 5 6 #This is level of the base layer 7 Level1 : 3.1 8 #This is level of the enhancement layer 9 Level2 : 5 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : Traffic_2560x1600_30_crop.yuv … … 23 30 ConformanceMode1 : 1 # conformance mode 24 31 QP1 : 20 32 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc-avcbase/Traffic-SNR.cfg
r595 r941 1 1 FrameSkip : 0 # Number of frames to be skipped in input 2 2 FramesToBeEncoded : 150 # Number of frames to be coded 3 Level : 5 3 #Level : 5 4 #This is level of the whole bitstream 5 Level0 : 5 6 #This is level of the base layer 7 Level1 : 5 8 #This is level of the enhancement layer 9 Level2 : 5 4 10 5 11 #======== File I/O =============== … … 13 19 ConformanceMode0 : 1 # conformance mode 14 20 QP0 : 22 21 LayerPTLIndex0 : 1 15 22 16 23 InputFile1 : Traffic_2560x1600_30_crop.yuv … … 23 30 ConformanceMode1 : 1 # conformance mode 24 31 QP1 : 20 32 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/BQTerrace-1.5x.cfg
r595 r941 2 2 FramesToBeEncoded : 600 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4.1 4 #Level : 4.1 5 #This is level of the whole bitstream 6 Level0 : 4.1 7 #This is level of the base layer 8 Level1 : 3.1 9 #This is level of the enhancement layer 10 Level2 : 4.1 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : BQTerrace_1920x1080_60.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/BQTerrace-2x.cfg
r849 r941 2 2 FramesToBeEncoded : 600 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4.1 4 #Level : 4.1 5 #This is level of the whole bitstream 6 Level0 : 4.1 7 #This is level of the base layer 8 Level1 : 3.1 9 #This is level of the enhancement layer 10 Level2 : 4.1 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : BQTerrace_1920x1080_60.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 26 34 27 35 #============= Reference location offset parameters ================== -
branches/SHM-dev/cfg/per-sequence-svc/BQTerrace-SNR.cfg
r595 r941 2 2 FramesToBeEncoded : 600 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4.1 4 #Level : 4.1 5 #This is level of the whole bitstream 6 Level0 : 4.1 7 #This is level of the base layer 8 Level1 : 4.1 9 #This is level of the enhancement layer 10 Level2 : 4.1 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : BQTerrace_1920x1080_60.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/BasketballDrive-1.5x.cfg
r595 r941 2 2 FramesToBeEncoded : 500 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4.1 4 #Level : 4.1 5 #This is level of the whole bitstream 6 Level0 : 4.1 7 #This is level of the base layer 8 Level1 : 3.1 9 #This is level of the enhancement layer 10 Level2 : 4.1 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : BasketballDrive_1920x1080_50.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/BasketballDrive-2x.cfg
r849 r941 2 2 FramesToBeEncoded : 500 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4.1 4 #Level : 4.1 5 #This is level of the whole bitstream 6 Level0 : 4.1 7 #This is level of the base layer 8 Level1 : 3.1 9 #This is level of the enhancement layer 10 Level2 : 4.1 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : BasketballDrive_1920x1080_50.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 26 34 27 35 #============= Reference location offset parameters ================== -
branches/SHM-dev/cfg/per-sequence-svc/BasketballDrive-SNR.cfg
r595 r941 2 2 FramesToBeEncoded : 500 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4.1 4 #Level : 4.1 5 #This is level of the whole bitstream 6 Level0 : 4.1 7 #This is level of the base layer 8 Level1 : 4.1 9 #This is level of the enhancement layer 10 Level2 : 4.1 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : BasketballDrive_1920x1080_50.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/CGS-Birthday-b10-1x.cfg
r713 r941 3 3 FramesToBeEncoded : 300 # Number of frames to be coded 4 4 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 5 Level : 4.1 5 #Level : 4.1 6 #This is level of the whole bitstream 7 Level0 : 4.1 8 #This is level of the base layer 9 Level1 : 4.1 10 #This is level of the enhancement layer 11 Level2 : 4.1 6 12 7 13 #======== File I/O =============== … … 16 22 InternalBitDepth0 : 10 # codec operating bit-depth for layer 0 17 23 RepFormatIdx0 : 0 # Index of corresponding rep_format() in the VPS 24 LayerPTLIndex0 : 1 18 25 19 26 InputFile1 : BT2020_Birthday_1920x1080_60_10bit_zerophase_0.9pi.yuv … … 27 34 InternalBitDepth1 : 10 # codec operating bit-depth for layer 1 28 35 RepFormatIdx1 : 0 # Index of corresponding rep_format() in the VPS 36 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/CGS-Birthday-b8-2x.cfg
r713 r941 3 3 FramesToBeEncoded : 300 # Number of frames to be coded 4 4 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 5 Level : 4.1 5 #Level : 4.1 6 #This is level of the whole bitstream 7 Level0 : 5.1 8 #This is level of the base layer 9 Level1 : 4.1 10 #This is level of the enhancement layer 11 Level2 : 5.1 6 12 7 13 #======== File I/O =============== … … 16 22 InternalBitDepth0 : 8 # codec operating bit-depth for layer 0 17 23 RepFormatIdx0 : 0 # Index of corresponding rep_format() in the VPS 24 LayerPTLIndex0 : 1 18 25 19 26 InputFile1 : BT2020_Birthday_3840x2160_60_10bit.yuv … … 27 34 InternalBitDepth1 : 10 # codec operating bit-depth for layer 1 28 35 RepFormatIdx1 : 1 # Index of corresponding rep_format() in the VPS 36 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/CGS-BirthdayFlashPart1-b10-1x.cfg
r713 r941 3 3 FramesToBeEncoded : 300 # Number of frames to be coded 4 4 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 5 Level : 4.1 5 #Level : 4.1 6 #This is level of the whole bitstream 7 Level0 : 4.1 8 #This is level of the base layer 9 Level1 : 4.1 10 #This is level of the enhancement layer 11 Level2 : 4.1 6 12 7 13 #======== File I/O =============== … … 16 22 InternalBitDepth0 : 10 # codec operating bit-depth for layer 0 17 23 RepFormatIdx0 : 0 # Index of corresponding rep_format() in the VPS 24 LayerPTLIndex0 : 1 18 25 19 26 InputFile1 : BT2020_BirthdayFlashPart1_1920x1080_60_10bit_zerophase_0.9pi.yuv … … 27 34 InternalBitDepth1 : 10 # codec operating bit-depth for layer 1 28 35 RepFormatIdx1 : 0 # Index of corresponding rep_format() in the VPS 36 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/CGS-BirthdayFlashPart1-b8-2x.cfg
r713 r941 3 3 FramesToBeEncoded : 300 # Number of frames to be coded 4 4 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 5 Level : 4.1 5 #Level : 4.1 6 #This is level of the whole bitstream 7 Level0 : 5.1 8 #This is level of the base layer 9 Level1 : 4.1 10 #This is level of the enhancement layer 11 Level2 : 5.1 6 12 7 13 #======== File I/O =============== … … 16 22 InternalBitDepth0 : 8 # codec operating bit-depth for layer 0 17 23 RepFormatIdx0 : 0 # Index of corresponding rep_format() in the VPS 24 LayerPTLIndex0 : 1 18 25 19 26 InputFile1 : BT2020_BirthdayFlashPart1_3840x2160_60_10bit.yuv … … 27 34 InternalBitDepth1 : 10 # codec operating bit-depth for layer 1 28 35 RepFormatIdx1 : 1 # Index of corresponding rep_format() in the VPS 36 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/CGS-BirthdayFlashPart2-b10-1x.cfg
r713 r941 3 3 FramesToBeEncoded : 300 # Number of frames to be coded 4 4 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 5 Level : 4.1 5 #Level : 4.1 6 #This is level of the whole bitstream 7 Level0 : 4.1 8 #This is level of the base layer 9 Level1 : 4.1 10 #This is level of the enhancement layer 11 Level2 : 4.1 6 12 7 13 #======== File I/O =============== … … 16 22 InternalBitDepth0 : 10 # codec operating bit-depth for layer 0 17 23 RepFormatIdx0 : 0 # Index of corresponding rep_format() in the VPS 24 LayerPTLIndex0 : 1 18 25 19 26 InputFile1 : BT2020_BirthdayFlashPart2_1920x1080_60_10bit_zerophase_0.9pi.yuv … … 27 34 InternalBitDepth1 : 10 # codec operating bit-depth for layer 1 28 35 RepFormatIdx1 : 0 # Index of corresponding rep_format() in the VPS 36 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/CGS-BirthdayFlashPart2-b8-2x.cfg
r713 r941 3 3 FramesToBeEncoded : 300 # Number of frames to be coded 4 4 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 5 Level : 4.1 5 #Level : 4.1 6 #This is level of the whole bitstream 7 Level0 : 5.1 8 #This is level of the base layer 9 Level1 : 4.1 10 #This is level of the enhancement layer 11 Level2 : 5.1 6 12 7 13 #======== File I/O =============== … … 16 22 InternalBitDepth0 : 8 # codec operating bit-depth for layer 0 17 23 RepFormatIdx0 : 0 # Index of corresponding rep_format() in the VPS 24 LayerPTLIndex0 : 1 18 25 19 26 InputFile1 : BT2020_BirthdayFlashPart2_3840x2160_60_10bit.yuv … … 27 34 InternalBitDepth1 : 10 # codec operating bit-depth for layer 1 28 35 RepFormatIdx1 : 1 # Index of corresponding rep_format() in the VPS 36 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/CGS-Parakeets-b10-1x.cfg
r713 r941 3 3 FramesToBeEncoded : 250 # Number of frames to be coded 4 4 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 5 Level : 4.1 5 #Level : 4.1 6 #This is level of the whole bitstream 7 Level0 : 4.1 8 #This is level of the base layer 9 Level1 : 4.1 10 #This is level of the enhancement layer 11 Level2 : 4.1 6 12 7 13 #======== File I/O =============== … … 16 22 InternalBitDepth0 : 10 # codec operating bit-depth for layer 0 17 23 RepFormatIdx0 : 0 # Index of corresponding rep_format() in the VPS 24 LayerPTLIndex0 : 1 18 25 19 26 InputFile1 : BT2020_Parakeets_1920x1080_50_10bit_zerophase_0.9pi.yuv … … 27 34 InternalBitDepth1 : 10 # codec operating bit-depth for layer 1 28 35 RepFormatIdx1 : 0 # Index of corresponding rep_format() in the VPS 36 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/CGS-Parakeets-b8-2x.cfg
r713 r941 3 3 FramesToBeEncoded : 250 # Number of frames to be coded 4 4 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 5 Level : 4.1 5 #Level : 4.1 6 #This is level of the whole bitstream 7 Level0 : 5.1 8 #This is level of the base layer 9 Level1 : 4.1 10 #This is level of the enhancement layer 11 Level2 : 5.1 6 12 7 13 #======== File I/O =============== … … 16 22 InternalBitDepth0 : 8 # codec operating bit-depth for layer 0 17 23 RepFormatIdx0 : 0 # Index of corresponding rep_format() in the VPS 24 LayerPTLIndex0 : 1 18 25 19 26 InputFile1 : BT2020_Parakeets_3840x2160_50_10bit.yuv … … 27 34 InternalBitDepth1 : 10 # codec operating bit-depth for layer 1 28 35 RepFormatIdx1 : 1 # Index of corresponding rep_format() in the VPS 36 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/CGS-TableCar-b10-1x.cfg
r713 r941 3 3 FramesToBeEncoded : 300 # Number of frames to be coded 4 4 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 5 Level : 4.1 5 #Level : 4.1 6 #This is level of the whole bitstream 7 Level0 : 4.1 8 #This is level of the base layer 9 Level1 : 4.1 10 #This is level of the enhancement layer 11 Level2 : 4.1 6 12 7 13 #======== File I/O =============== … … 16 22 InternalBitDepth0 : 10 # codec operating bit-depth for layer 0 17 23 RepFormatIdx0 : 0 # Index of corresponding rep_format() in the VPS 24 LayerPTLIndex0 : 1 18 25 19 26 InputFile1 : BT2020_TableCar_1920x1080_60_10bit_zerophase_0.9pi.yuv … … 27 34 InternalBitDepth1 : 10 # codec operating bit-depth for layer 1 28 35 RepFormatIdx1 : 0 # Index of corresponding rep_format() in the VPS 36 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/CGS-TableCar-b8-2x.cfg
r713 r941 3 3 FramesToBeEncoded : 300 # Number of frames to be coded 4 4 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 5 Level : 4.1 5 #Level : 4.1 6 #This is level of the whole bitstream 7 Level0 : 5.1 8 #This is level of the base layer 9 Level1 : 4.1 10 #This is level of the enhancement layer 11 Level2 : 5.1 6 12 7 13 #======== File I/O =============== … … 16 22 InternalBitDepth0 : 8 # codec operating bit-depth for layer 0 17 23 RepFormatIdx0 : 0 # Index of corresponding rep_format() in the VPS 24 LayerPTLIndex0 : 1 18 25 19 26 InputFile1 : BT2020_TableCar_3840x2160_60_10bit.yuv … … 27 34 InternalBitDepth1 : 10 # codec operating bit-depth for layer 1 28 35 RepFormatIdx1 : 1 # Index of corresponding rep_format() in the VPS 36 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/Cactus-1.5x.cfg
r595 r941 2 2 FramesToBeEncoded : 500 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4.1 4 #Level : 4.1 5 #This is level of the whole bitstream 6 Level0 : 4.1 7 #This is level of the base layer 8 Level1 : 3.1 9 #This is level of the enhancement layer 10 Level2 : 4.1 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : Cactus_1920x1080_50.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/Cactus-2x.cfg
r849 r941 2 2 FramesToBeEncoded : 500 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4.1 4 #Level : 4.1 5 #This is level of the whole bitstream 6 Level0 : 4.1 7 #This is level of the base layer 8 Level1 : 3.1 9 #This is level of the enhancement layer 10 Level2 : 4.1 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : Cactus_1920x1080_50.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 26 34 27 35 #============= Reference location offset parameters ================== -
branches/SHM-dev/cfg/per-sequence-svc/Cactus-SNR.cfg
r595 r941 2 2 FramesToBeEncoded : 500 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4.1 4 #Level : 4.1 5 #This is level of the whole bitstream 6 Level0 : 4.1 7 #This is level of the base layer 8 Level1 : 3.1 9 #This is level of the enhancement layer 10 Level2 : 4.1 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : Cactus_1920x1080_50.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/Kimono-1.5x.cfg
r595 r941 2 2 FramesToBeEncoded : 240 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4 4 #Level : 4 5 #This is level of the whole bitstream 6 Level0 : 4 7 #This is level of the base layer 8 Level1 : 3.1 9 #This is level of the enhancement layer 10 Level2 : 4 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : Kimono1_1920x1080_24.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/Kimono-2x.cfg
r849 r941 2 2 FramesToBeEncoded : 240 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4 4 #Level : 4 5 #This is level of the whole bitstream 6 Level0 : 4 7 #This is level of the base layer 8 Level1 : 3.1 9 #This is level of the enhancement layer 10 Level2 : 4 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : Kimono1_1920x1080_24.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 26 34 27 35 #============= Reference location offset parameters ================== -
branches/SHM-dev/cfg/per-sequence-svc/Kimono-SNR.cfg
r595 r941 2 2 FramesToBeEncoded : 240 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4 4 #Level : 4 5 #This is level of the whole bitstream 6 Level0 : 4 7 #This is level of the base layer 8 Level1 : 4 9 #This is level of the enhancement layer 10 Level2 : 4 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : Kimono1_1920x1080_24.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/ParkScene-1.5x.cfg
r595 r941 2 2 FramesToBeEncoded : 240 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4 4 #Level : 4 5 #This is level of the whole bitstream 6 Level0 : 4 7 #This is level of the base layer 8 Level1 : 3.1 9 #This is level of the enhancement layer 10 Level2 : 4 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : ParkScene_1920x1080_24.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/ParkScene-2x.cfg
r849 r941 2 2 FramesToBeEncoded : 240 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4 4 #Level : 4 5 #This is level of the whole bitstream 6 Level0 : 4 7 #This is level of the base layer 8 Level1 : 3.1 9 #This is level of the enhancement layer 10 Level2 : 4 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : ParkScene_1920x1080_24.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 26 34 27 35 #============= Reference location offset parameters ================== -
branches/SHM-dev/cfg/per-sequence-svc/ParkScene-SNR.cfg
r595 r941 2 2 FramesToBeEncoded : 240 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 4 4 #Level : 4 5 #This is level of the whole bitstream 6 Level0 : 4 7 #This is level of the base layer 8 Level1 : 4 9 #This is level of the enhancement layer 10 Level2 : 4 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : ParkScene_1920x1080_24.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/PeopleOnStreet-2x.cfg
r595 r941 2 2 FramesToBeEncoded : 150 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 5 4 #Level : 5 5 #This is level of the whole bitstream 6 Level0 : 5 7 #This is level of the base layer 8 Level1 : 3.1 9 #This is level of the enhancement layer 10 Level2 : 5 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : PeopleOnStreet_2560x1600_30_crop.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/PeopleOnStreet-SNR.cfg
r595 r941 2 2 FramesToBeEncoded : 150 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 5 4 #Level : 5 5 #This is level of the whole bitstream 6 Level0 : 5 7 #This is level of the base layer 8 Level1 : 5 9 #This is level of the enhancement layer 10 Level2 : 5 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : PeopleOnStreet_2560x1600_30_crop.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/Traffic-2x.cfg
r595 r941 2 2 FramesToBeEncoded : 150 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 5 4 #Level : 5 5 #This is level of the whole bitstream 6 Level0 : 5 7 #This is level of the base layer 8 Level1 : 3.1 9 #This is level of the enhancement layer 10 Level2 : 5 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : Traffic_2560x1600_30_crop.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/cfg/per-sequence-svc/Traffic-SNR.cfg
r595 r941 2 2 FramesToBeEncoded : 150 # Number of frames to be coded 3 3 PhaseAlignment : 0 # Sample location alignment between layers (0: zero position aligned, 1: central position aligned) 4 Level : 5 4 #Level : 5 5 #This is level of the whole bitstream 6 Level0 : 5 7 #This is level of the base layer 8 Level1 : 5 9 #This is level of the enhancement layer 10 Level2 : 5 5 11 6 12 #======== File I/O =============== … … 14 20 ConformanceMode0 : 1 # conformance mode 15 21 QP0 : 22 22 LayerPTLIndex0 : 1 16 23 17 24 InputFile1 : Traffic_2560x1600_30_crop.yuv … … 24 31 ConformanceMode1 : 1 # conformance mode 25 32 QP1 : 20 33 LayerPTLIndex1 : 2 -
branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.cpp
r925 r941 608 608 string* cfg_outputLayerSetIdx = new string; 609 609 #endif 610 #if MULTIPLE_PTL_SUPPORT 611 string* cfg_listOfLayerPTLOfOlss = new string[MAX_VPS_OUTPUT_LAYER_SETS_PLUS1]; 612 #endif 610 613 #if AVC_BASE 611 614 string cfg_BLInputFile; … … 837 840 838 841 // Profile and level 842 #if !MULTIPLE_PTL_SUPPORT 839 843 ("Profile", m_profile, Profile::NONE, "Profile to be used when encoding (Incomplete)") 840 844 ("Level", m_level, Level::NONE, "Level limit to be used, eg 5.1 (Incomplete)") … … 845 849 ("NonPackedSource", m_nonPackedConstraintFlag, false, "Indicate that source does not contain frame packing") 846 850 ("FrameOnly", m_frameOnlyConstraintFlag, false, "Indicate that the bitstream contains only frames") 851 #else 852 ("NumProfileTierLevel", m_numPTLInfo, 2, "Number of Profile, Tier and Level information") 853 ("Profile%d", m_profileList, Profile::NONE, NUM_POSSIBLE_LEVEL, "Profile to be used when encoding (Incomplete)") 854 ("Level%d", m_levelList, Level::NONE, NUM_POSSIBLE_LEVEL, "Level limit to be used, eg 5.1 (Incomplete)") 855 ("Tier%d", m_levelTierList, Level::MAIN, NUM_POSSIBLE_LEVEL, "Tier to use for interpretation of --Level") 856 857 ("ProgressiveSource%d", m_progressiveSourceFlagList, false, MAX_VPS_LAYER_ID_PLUS1, "Indicate that source is progressive") 858 ("InterlacedSource%d", m_interlacedSourceFlagList, false, MAX_VPS_LAYER_ID_PLUS1, "Indicate that source is interlaced") 859 ("NonPackedSource%d", m_nonPackedConstraintFlagList, false, MAX_VPS_LAYER_ID_PLUS1, "Indicate that source does not contain frame packing") 860 ("FrameOnly%d", m_frameOnlyConstraintFlagList, false, MAX_VPS_LAYER_ID_PLUS1, "Indicate that the bitstream contains only frames") 861 862 ("LayerPTLIndex%d", m_layerPTLIdx, 0, MAX_VPS_LAYER_ID_PLUS1, "Index of PTL for each layer") 863 ("ListOfProfileTierLevelOls%d", cfg_listOfLayerPTLOfOlss, string(""), MAX_VPS_LAYER_ID_PLUS1, "PTL Index for each layer in each OLS except the first OLS. The PTL index for layer in the first OLS is set to 1") 864 #endif 847 865 848 866 #if LAYER_CTB … … 1922 1940 // Layers in the output layer set 1923 1941 m_listOfOutputLayers.resize(m_numOutputLayerSets); 1942 1943 #if MULTIPLE_PTL_SUPPORT 1944 m_listOfLayerPTLofOlss.resize(m_numOutputLayerSets); 1945 #endif 1946 1924 1947 Int startOlsCtr = 1; 1925 1948 if( m_defaultTargetOutputLayerIdc == 0 || m_defaultTargetOutputLayerIdc == 1 ) … … 1941 1964 assert( scanStringToArray( cfg_listOfOutputLayers[olsCtr], m_numLayersInOutputLayerSet[olsCtr], "ListOfOutputLayers", m_listOfOutputLayers[olsCtr] ) ); 1942 1965 } 1943 } 1966 #if MULTIPLE_PTL_SUPPORT 1967 if (olsCtr > m_numLayerSets) 1968 { 1969 scanStringToArray( cfg_listOfLayerPTLOfOlss[olsCtr], m_numLayerInIdList[m_outputLayerSetIdx[olsCtr - m_numLayerSets]], "ListOfOutputLayers", m_listOfLayerPTLofOlss[olsCtr] ); 1970 } 1971 else 1972 { 1973 scanStringToArray( cfg_listOfLayerPTLOfOlss[olsCtr], m_numLayerInIdList[olsCtr], "List of PTL for each layer in OLS", m_listOfLayerPTLofOlss[olsCtr] ); 1974 } 1975 #endif 1976 } 1977 #if MULTIPLE_PTL_SUPPORT 1978 m_listOfLayerPTLofOlss[0].push_back(m_layerPTLIdx[0]); 1979 delete [] cfg_listOfLayerPTLOfOlss; 1980 #endif 1944 1981 delete cfg_numLayersInOutputLayerSet; 1945 1982 delete [] cfg_listOfOutputLayers; … … 2503 2540 fprintf(stderr, "******************************************************************\n"); 2504 2541 } 2542 2543 #if !MULTIPLE_PTL_SUPPORT 2505 2544 if( m_profile==Profile::NONE ) 2506 2545 { … … 2515 2554 fprintf(stderr, "***************************************************************************\n"); 2516 2555 } 2556 #else 2557 int ii = 0; 2558 while ( ii < m_numPTLInfo ) 2559 { 2560 if( m_profileList[ii] == Profile::NONE ) 2561 { 2562 fprintf(stderr, "***************************************************************************\n"); 2563 fprintf(stderr, "** WARNING: For conforming bitstreams a valid Profile value must be set! **\n"); 2564 fprintf(stderr, "***************************************************************************\n"); 2565 } 2566 if( m_levelList[ii] == Level::NONE ) 2567 { 2568 fprintf(stderr, "***************************************************************************\n"); 2569 fprintf(stderr, "** WARNING: For conforming bitstreams a valid Level value must be set! **\n"); 2570 fprintf(stderr, "***************************************************************************\n"); 2571 } 2572 ii++; 2573 } 2574 #endif 2517 2575 2518 2576 Bool check_failed = false; /* abort if there is a fatal configuration problem */ -
branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h
r912 r941 120 120 121 121 // profile/level 122 #if !MULTIPLE_PTL_SUPPORT 122 123 Profile::Name m_profile; 123 124 Level::Tier m_levelTier; … … 127 128 Bool m_nonPackedConstraintFlag; 128 129 Bool m_frameOnlyConstraintFlag; 129 130 #else 131 Int m_numPTLInfo; 132 Int m_layerPTLIdx[MAX_VPS_LAYER_ID_PLUS1]; ///< scalability_mask 133 Profile::Name m_profileList[NUM_POSSIBLE_LEVEL]; 134 Level::Tier m_levelTierList[NUM_POSSIBLE_LEVEL]; 135 Level::Name m_levelList[NUM_POSSIBLE_LEVEL]; 136 Bool m_progressiveSourceFlagList[NUM_POSSIBLE_LEVEL]; 137 Bool m_interlacedSourceFlagList[NUM_POSSIBLE_LEVEL]; 138 Bool m_nonPackedConstraintFlagList[NUM_POSSIBLE_LEVEL]; 139 Bool m_frameOnlyConstraintFlagList[NUM_POSSIBLE_LEVEL]; 140 141 std::vector< std::vector<Int> > m_listOfLayerPTLofOlss; 142 #endif 130 143 // coding structure 131 144 #if !SVC_EXTENSION -
branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp
r924 r941 200 200 #endif 201 201 202 #if MULTIPLE_PTL_SUPPORT 203 //Populate PTL in VPS 204 TComVPS *pVPS = m_acTEncTop[0].getVPS(); 205 ProfileTierLevel& profileTierLevel = *(pVPS->getPTL(0)->getGeneralPTL()); 206 for (int ii = 0; ii < m_numPTLInfo; ii++) 207 { 208 profileTierLevel = *(pVPS->getPTL(ii)->getGeneralPTL()); 209 210 profileTierLevel.setLevelIdc(m_levelList[ii]); 211 profileTierLevel.setTierFlag(m_levelTierList[ii]); 212 profileTierLevel.setProfileIdc(m_profileList[ii]); 213 profileTierLevel.setProfileCompatibilityFlag(m_profileList[ii], 1); 214 profileTierLevel.setProgressiveSourceFlag(m_progressiveSourceFlagList[ii]); 215 profileTierLevel.setInterlacedSourceFlag(m_interlacedSourceFlagList[ii]); 216 profileTierLevel.setNonPackedConstraintFlag(m_nonPackedConstraintFlagList[ii]); 217 profileTierLevel.setFrameOnlyConstraintFlag(m_frameOnlyConstraintFlagList[ii]); 218 } 219 pVPS->setNumProfileTierLevel(m_numPTLInfo); 220 221 std::vector<int> myvector; 222 vps->getProfileLevelTierIdx()->resize(m_numOutputLayerSets); 223 for (int ii = 0; ii < m_numOutputLayerSets; ii++) 224 { 225 myvector = m_listOfLayerPTLofOlss[ii]; 226 vps->getProfileLevelTierIdx()->resize(myvector.size()); 227 for (std::vector<int>::iterator it = myvector.begin() ; it != myvector.end(); ++it) 228 { 229 pVPS->addProfileLevelTierIdx(ii, it[0]); 230 } 231 } 232 233 //pVPS->setProfileLevelTierIdx( 234 #endif 235 202 236 assert( m_numLayers <= MAX_LAYERS ); 203 237 … … 228 262 m_acTEncTop[layer].setFramesToBeEncoded ( m_framesToBeEncoded ); 229 263 264 #if !MULTIPLE_PTL_SUPPORT 230 265 m_acTEncTop[layer].setProfile(m_profile); 231 266 m_acTEncTop[layer].setLevel(m_levelTier, m_level); … … 234 269 m_acTEncTop[layer].setNonPackedConstraintFlag(m_nonPackedConstraintFlag); 235 270 m_acTEncTop[layer].setFrameOnlyConstraintFlag(m_frameOnlyConstraintFlag); 271 #else 272 m_acTEncTop[layer].setProfile(m_profileList[m_layerPTLIdx[layer]]); 273 m_acTEncTop[layer].setLevel(m_levelTierList[m_layerPTLIdx[layer]], m_levelList[m_layerPTLIdx[layer]]); 274 m_acTEncTop[layer].setProgressiveSourceFlag(m_progressiveSourceFlagList[m_layerPTLIdx[layer]]); 275 m_acTEncTop[layer].setInterlacedSourceFlag(m_interlacedSourceFlagList[m_layerPTLIdx[layer]]); 276 m_acTEncTop[layer].setNonPackedConstraintFlag(m_nonPackedConstraintFlagList[m_layerPTLIdx[layer]]); 277 m_acTEncTop[layer].setFrameOnlyConstraintFlag(m_frameOnlyConstraintFlagList[m_layerPTLIdx[layer]]); 278 #endif 236 279 237 280 #if REF_IDX_MFM … … 1385 1428 vps->setIlpSshSignalingEnabledFlag(false); 1386 1429 #if VPS_EXTN_PROFILE_INFO 1387 1430 #if !MULTIPLE_PTL_SUPPORT 1388 1431 #if LIST_OF_PTL 1389 1432 vps->getPTLForExtnPtr()->resize(1); // Dummy object - unused. … … 1414 1457 *(vps->getPTLForExtn(setId)) = *(m_acTEncTop[setId].getSPS()->getPTL()); 1415 1458 } 1459 #endif 1416 1460 #endif 1417 1461 #endif … … 1524 1568 #endif 1525 1569 // Target output layer 1570 #if !MULTIPLE_PTL_SUPPORT 1526 1571 #if LIST_OF_PTL 1527 1572 vps->setNumProfileTierLevel( vps->getPTLForExtnPtr()->size() ); // +1 for the base VPS PTL() … … 1529 1574 vps->setNumOutputLayerSets(vps->getNumLayerSets()); 1530 1575 vps->setNumProfileTierLevel(vps->getNumLayerSets()); 1576 #endif 1531 1577 #endif 1532 1578 #if !OUTPUT_LAYER_SETS_CONFIG // Taken care by configuration file parameter … … 1619 1665 vps->checkNecessaryLayerFlagCondition(); 1620 1666 #endif 1667 #if !MULTIPLE_PTL_SUPPORT 1621 1668 #if PER_LAYER_PTL 1622 1669 vps->getProfileLevelTierIdx()->resize(vps->getNumOutputLayerSets()); … … 1639 1686 } 1640 1687 } 1688 #endif 1641 1689 #endif 1642 1690 #if SUB_LAYERS_IN_LAYER_SET -
branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h
r908 r941 582 582 Bool m_layerIdIncludedFlag[MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1]; 583 583 #endif 584 #if !MULTIPLE_PTL_SUPPORT 584 585 TComPTL m_pcPTL; 586 #else 587 TComPTL m_pcPTLList[NUM_POSSIBLE_LEVEL]; 588 #endif 585 589 TimingInfo m_timingInfo; 586 590 … … 649 653 UInt m_profileLayerSetRef[MAX_VPS_LAYER_SETS_PLUS1]; // The value with index 0 will not be used. 650 654 #endif 651 std::vector<TComPTL> m_pcPTLForExtn; 655 #if !MULTIPLE_PTL_SUPPORT 656 std::vector<TComPTL> m_pcPTLForExtn; 657 #endif 652 658 #endif 653 659 #if VPS_EXTN_OP_LAYER_SETS … … 964 970 Void setLayerIdIncludedFlag(Bool v, UInt opsIdx, UInt id) { m_layerIdIncludedFlag[opsIdx][id] = v; } 965 971 972 #if !MULTIPLE_PTL_SUPPORT 966 973 TComPTL* getPTL() { return &m_pcPTL; } 974 #else 975 TComPTL* getPTL() { return &m_pcPTLList[0]; } 976 TComPTL* getPTL(UInt idx) { return &m_pcPTLList[idx]; } 977 #endif 967 978 TimingInfo* getTimingInfo() { return &m_timingInfo; } 968 979 … … 1065 1076 #endif 1066 1077 1078 #if !MULTIPLE_PTL_SUPPORT 1067 1079 std::vector<TComPTL>* getPTLForExtnPtr() { return &m_pcPTLForExtn; } 1068 1080 TComPTL* getPTLForExtn(Int id) { return &m_pcPTLForExtn[id]; } 1081 #endif 1069 1082 #endif 1070 1083 #if VPS_EXTN_OP_LAYER_SETS … … 1132 1145 Int getProfileLevelTierIdx(Int const olsIdx, Int const layerIdx) { return m_profileLevelTierIdx[olsIdx][layerIdx]; } 1133 1146 Void setProfileLevelTierIdx(Int const olsIdx, Int const layerIdx, Int const ptlIdx) { m_profileLevelTierIdx[olsIdx][layerIdx] = ptlIdx; } 1147 #if MULTIPLE_PTL_SUPPORT 1148 Void addProfileLevelTierIdx(Int const olsIdx, Int const ptlIdx) { m_profileLevelTierIdx[olsIdx].push_back(ptlIdx); } 1149 #endif 1134 1150 Int calculateLenOfSyntaxElement( Int const numVal ); 1135 1151 #else -
branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h
r924 r941 69 69 #define VPS_VUI_BSP_HRD_PARAMS 1 ///< JCTVC-R0231: Define the VPS VUI BSP hrd_params() as a separate function, and apply changes adopted. 70 70 #define O0137_MAX_LAYERID 1 ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1 71 72 #define MULTIPLE_PTL_SUPPORT 1 ///< Fixing profile, tier and level signalling 73 #define NUM_POSSIBLE_LEVEL 13 ///< Number of possible level as described in R1013 71 74 72 75 #define R0226_CONSTRAINT_TMVP_SEI 1 ///< JCTVC-R0226, Modification to semantics in temporal motion vector prediction constraints SEI message -
branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp
r937 r941 1375 1375 { 1376 1376 vps->setProfilePresentFlag(1, false); 1377 #if !MULTIPLE_PTL_SUPPORT 1377 1378 vps->getPTLForExtnPtr()->empty(); 1378 1379 vps->getPTLForExtnPtr()->resize(2); 1379 1380 vps->getPTLForExtn(1)->copyProfileInfo( vps->getPTL() ); 1380 1381 parsePTL( vps->getPTLForExtn(1), vps->getProfilePresentFlag(1), vps->getMaxTLayers() - 1 ); 1382 #else 1383 parsePTL( vps->getPTL(1), vps->getProfilePresentFlag(1), vps->getMaxTLayers() - 1 ); 1384 #endif 1381 1385 } 1382 1386 #endif … … 1600 1604 READ_CODE( 6, uiCode, "vps_num_profile_tier_level_minus1"); vps->setNumProfileTierLevel( uiCode + 1 ); 1601 1605 #else 1602 READ_UVLC( uiCode, "vps_num_profile_tier_level_minus1"); vps->setNumProfileTierLevel( uiCode + 1 ); 1606 READ_UVLC( uiCode, "vps_num_profile_tier_level_minus1"); 1607 vps->setNumProfileTierLevel( uiCode + 1 ); 1608 //vps->setNumProfileTierLevel( 3 ); 1609 int aa = vps->getNumProfileTierLevel(); 1603 1610 #endif 1604 1611 #if PER_LAYER_PTL 1605 1612 Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() ); 1606 1613 #endif 1614 #if !MULTIPLE_PTL_SUPPORT 1607 1615 vps->getPTLForExtnPtr()->resize(vps->getNumProfileTierLevel()); 1616 #endif 1608 1617 #if LIST_OF_PTL 1609 1618 for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx <= vps->getNumProfileTierLevel() - 1; idx++) … … 1612 1621 #endif 1613 1622 { 1614 READ_FLAG( uiCode, "vps_profile_present_flag[i]" ); vps->setProfilePresentFlag(idx, uiCode ? true : false); 1623 READ_FLAG( uiCode, "vps_profile_present_flag[i]" ); 1624 vps->setProfilePresentFlag(idx, uiCode ? true : false); 1615 1625 if( !vps->getProfilePresentFlag(idx) ) 1616 1626 { 1617 1627 #if P0048_REMOVE_PROFILE_REF 1618 1628 // Copy profile information from previous one 1629 #if !MULTIPLE_PTL_SUPPORT 1619 1630 vps->getPTLForExtn(idx)->copyProfileInfo( (idx==1) ? vps->getPTL() : vps->getPTLForExtn( idx - 1 ) ); 1631 #else 1632 vps->getPTL(idx)->copyProfileInfo( vps->getPTL( idx - 1 ) ); 1633 #endif 1620 1634 #else 1621 1635 READ_CODE( 6, uiCode, "profile_ref_minus1[i]" ); vps->setProfileLayerSetRef(idx, uiCode + 1); … … 1629 1643 #endif 1630 1644 } 1645 #if !MULTIPLE_PTL_SUPPORT 1631 1646 parsePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 ); 1647 #else 1648 parsePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 ); 1649 #endif 1632 1650 } 1633 1651 #endif … … 1673 1691 if( vps->getNumLayerSets() > 1 ) 1674 1692 { 1675 READ_UVLC( uiCode, "num_add_olss" ); vps->setNumAddOutputLayerSets( uiCode ); 1693 READ_UVLC( uiCode, "num_add_olss" ); 1694 vps->setNumAddOutputLayerSets( uiCode ); 1676 1695 READ_CODE( 2, uiCode, "default_output_layer_idc" ); vps->setDefaultTargetOutputLayerIdc( uiCode ); 1677 1696 } -
branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp
r924 r941 354 354 #else 355 355 m_iMaxRefPicNum = pcSlice->getVPS()->getMaxVpsDecPicBufferingMinus1( getCommonDecoderParams()->getTargetOutputLayerSetIdx(), pcSlice->getLayerId(), pcSlice->getTLayer() ) + 1; // m_uiMaxDecPicBuffering has the space for the picture currently being decoded 356 //TODO: HENDRY -- Do the checking here.357 356 #endif 358 357 } … … 1088 1087 m_isNoOutputPriorPics = false; 1089 1088 } 1090 1091 //TODO: HENDRY -- Probably do the checking for max number of positive and negative pics here1092 1093 1089 1094 1090 //For inference of PicOutputFlag -
branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp
r937 r941 1088 1088 if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() ) 1089 1089 { 1090 #if !MULTIPLE_PTL_SUPPORT 1090 1091 codePTL( vps->getPTLForExtn(1), false, vps->getMaxTLayers() - 1 ); 1092 #else 1093 codePTL( vps->getPTL(1), false, vps->getMaxTLayers() - 1 ); 1094 #endif 1091 1095 } 1092 1096 #endif … … 1254 1258 #endif 1255 1259 #if LIST_OF_PTL 1260 #if !MULTIPLE_PTL_SUPPORT 1256 1261 assert( vps->getNumProfileTierLevel() == vps->getPTLForExtnPtr()->size()); 1262 #else 1263 //Do something here to make sure the loop is correct to consider base layer internal stuff 1264 #endif 1257 1265 for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx <= vps->getNumProfileTierLevel() - 1; idx++) 1258 1266 #else … … 1260 1268 #endif 1261 1269 { 1270 #if MULTIPLE_PTL_SUPPORT 1271 vps->setProfilePresentFlag(idx, true); 1272 #endif 1262 1273 WRITE_FLAG( vps->getProfilePresentFlag(idx), "vps_profile_present_flag[i]" ); 1263 1274 #if !P0048_REMOVE_PROFILE_REF … … 1267 1278 } 1268 1279 #endif 1280 #if !MULTIPLE_PTL_SUPPORT 1269 1281 codePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 ); 1282 #else 1283 codePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 ); 1284 #endif 1270 1285 } 1271 1286 #endif
Note: See TracChangeset for help on using the changeset viewer.
