Index: webrtc/modules/include/module_common_types.h |
diff --git a/webrtc/modules/include/module_common_types.h b/webrtc/modules/include/module_common_types.h |
index 82d87d5c5c721ee694e3e77a420611a9f36277f7..56a2dc602c161787eb2e1ac3836cd052ee399acf 100644 |
--- a/webrtc/modules/include/module_common_types.h |
+++ b/webrtc/modules/include/module_common_types.h |
@@ -72,8 +72,9 @@ struct RTPVideoHeaderVP8 { |
enum TemporalStructureMode { |
kTemporalStructureMode1, // 1 temporal layer structure - i.e., IPPP... |
- kTemporalStructureMode2, // 2 temporal layers 0-1-0-1... |
- kTemporalStructureMode3 // 3 temporal layers 0-2-1-2-0-2-1-2... |
+ kTemporalStructureMode2, // 2 temporal layers 01... |
+ kTemporalStructureMode3, // 3 temporal layers 0212... |
+ kTemporalStructureMode4 // 3 temporal layers 02120212... |
}; |
struct GofInfoVP9 { |
@@ -121,6 +122,52 @@ struct GofInfoVP9 { |
pid_diff[3][0] = 1; |
pid_diff[3][1] = 2; |
break; |
+ case kTemporalStructureMode4: |
+ num_frames_in_gof = 8; |
+ temporal_idx[0] = 0; |
+ temporal_up_switch[0] = false; |
+ num_ref_pics[0] = 1; |
+ pid_diff[0][0] = 4; |
+ |
+ temporal_idx[1] = 2; |
+ temporal_up_switch[1] = true; |
+ num_ref_pics[1] = 1; |
+ pid_diff[1][0] = 1; |
+ |
+ temporal_idx[2] = 1; |
+ temporal_up_switch[2] = true; |
+ num_ref_pics[2] = 1; |
+ pid_diff[2][0] = 2; |
+ |
+ temporal_idx[3] = 2; |
+ temporal_up_switch[3] = false; |
+ num_ref_pics[3] = 2; |
+ pid_diff[3][0] = 1; |
+ pid_diff[3][1] = 2; |
+ |
+ temporal_idx[4] = 0; |
+ temporal_up_switch[0] = false; |
+ num_ref_pics[4] = 1; |
+ pid_diff[4][0] = 4; |
+ |
+ temporal_idx[5] = 2; |
+ temporal_up_switch[1] = false; |
+ num_ref_pics[5] = 2; |
+ pid_diff[5][0] = 1; |
+ pid_diff[5][1] = 2; |
+ |
+ temporal_idx[6] = 1; |
+ temporal_up_switch[2] = false; |
+ num_ref_pics[6] = 2; |
+ pid_diff[6][0] = 2; |
+ pid_diff[6][1] = 4; |
+ |
+ temporal_idx[7] = 2; |
+ temporal_up_switch[3] = false; |
+ num_ref_pics[7] = 2; |
+ pid_diff[7][0] = 1; |
+ pid_diff[7][1] = 2; |
+ break; |
default: |
assert(false); |
} |
@@ -143,6 +190,7 @@ struct GofInfoVP9 { |
bool temporal_up_switch[kMaxVp9FramesInGof]; |
uint8_t num_ref_pics[kMaxVp9FramesInGof]; |
uint8_t pid_diff[kMaxVp9FramesInGof][kMaxVp9RefPics]; |
+ uint16_t pid_start; |
}; |
struct RTPVideoHeaderVP9 { |