From a7d110fb97233bc759393ce79fa027735b3a0e0b Mon Sep 17 00:00:00 2001 From: Paul Kocialkowski Date: Wed, 4 Jul 2018 14:09:59 +0200 Subject: Update to the latest kernel-side definitions Signed-off-by: Paul Kocialkowski --- data/bbb-h264-32/frames.h | 128 ++++++++++++------------- data/bbb-h264-all-i-32/frames.h | 128 ++++++++++++------------- data/bbb-mpeg2/frames.h | 100 ++++++++++---------- data/ed-mpeg2/frames.h | 200 ++++++++++++++++++++-------------------- 4 files changed, 278 insertions(+), 278 deletions(-) (limited to 'data') diff --git a/data/bbb-h264-32/frames.h b/data/bbb-h264-32/frames.h index db3f14b..10cf06a 100644 --- a/data/bbb-h264-32/frames.h +++ b/data/bbb-h264-32/frames.h @@ -1,7 +1,7 @@ { .index = 0, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 0, .bottom_field_order_cnt = 0, .dpb = { @@ -212,7 +212,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 33286, .header_bit_size = 30, .first_mb_in_slice = 0, @@ -230,7 +230,7 @@ { .index = 1, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 2, .bottom_field_order_cnt = 2, .dpb = { @@ -441,7 +441,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 3294, .header_bit_size = 29, .first_mb_in_slice = 0, @@ -460,7 +460,7 @@ { .index = 2, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 4, .bottom_field_order_cnt = 4, .dpb = { @@ -671,7 +671,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 10722, .header_bit_size = 31, .first_mb_in_slice = 0, @@ -690,7 +690,7 @@ { .index = 3, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 6, .bottom_field_order_cnt = 6, .dpb = { @@ -901,7 +901,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 14920, .header_bit_size = 26, .first_mb_in_slice = 0, @@ -920,7 +920,7 @@ { .index = 4, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 8, .bottom_field_order_cnt = 8, .dpb = { @@ -1131,7 +1131,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 8576, .header_bit_size = 26, .first_mb_in_slice = 0, @@ -1150,7 +1150,7 @@ { .index = 5, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 10, .bottom_field_order_cnt = 10, .dpb = { @@ -1361,7 +1361,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 2660, .header_bit_size = 26, .first_mb_in_slice = 0, @@ -1380,7 +1380,7 @@ { .index = 6, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 12, .bottom_field_order_cnt = 12, .dpb = { @@ -1591,7 +1591,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 1646, .header_bit_size = 28, .first_mb_in_slice = 0, @@ -1610,7 +1610,7 @@ { .index = 7, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 14, .bottom_field_order_cnt = 14, .dpb = { @@ -1821,7 +1821,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 1015, .header_bit_size = 28, .first_mb_in_slice = 0, @@ -1840,7 +1840,7 @@ { .index = 8, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 16, .bottom_field_order_cnt = 16, .dpb = { @@ -2051,7 +2051,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 725, .header_bit_size = 30, .first_mb_in_slice = 0, @@ -2070,7 +2070,7 @@ { .index = 9, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 18, .bottom_field_order_cnt = 18, .dpb = { @@ -2281,7 +2281,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 285, .header_bit_size = 30, .first_mb_in_slice = 0, @@ -2300,7 +2300,7 @@ { .index = 10, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 20, .bottom_field_order_cnt = 20, .dpb = { @@ -2511,7 +2511,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 327, .header_bit_size = 30, .first_mb_in_slice = 0, @@ -2530,7 +2530,7 @@ { .index = 11, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 22, .bottom_field_order_cnt = 22, .dpb = { @@ -2741,7 +2741,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 370, .header_bit_size = 32, .first_mb_in_slice = 0, @@ -2760,7 +2760,7 @@ { .index = 12, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 24, .bottom_field_order_cnt = 24, .dpb = { @@ -2971,7 +2971,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 341, .header_bit_size = 32, .first_mb_in_slice = 0, @@ -2990,7 +2990,7 @@ { .index = 13, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 26, .bottom_field_order_cnt = 26, .dpb = { @@ -3201,7 +3201,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 225, .header_bit_size = 32, .first_mb_in_slice = 0, @@ -3220,7 +3220,7 @@ { .index = 14, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 28, .bottom_field_order_cnt = 28, .dpb = { @@ -3431,7 +3431,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 53017, .header_bit_size = 30, .first_mb_in_slice = 0, @@ -3449,7 +3449,7 @@ { .index = 15, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 30, .bottom_field_order_cnt = 30, .dpb = { @@ -3660,7 +3660,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 3802, .header_bit_size = 28, .first_mb_in_slice = 0, @@ -3679,7 +3679,7 @@ { .index = 16, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 32, .bottom_field_order_cnt = 32, .dpb = { @@ -3890,7 +3890,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 3187, .header_bit_size = 30, .first_mb_in_slice = 0, @@ -3909,7 +3909,7 @@ { .index = 17, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 34, .bottom_field_order_cnt = 34, .dpb = { @@ -4120,7 +4120,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 3760, .header_bit_size = 28, .first_mb_in_slice = 0, @@ -4139,7 +4139,7 @@ { .index = 18, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 36, .bottom_field_order_cnt = 36, .dpb = { @@ -4350,7 +4350,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 7605, .header_bit_size = 28, .first_mb_in_slice = 0, @@ -4369,7 +4369,7 @@ { .index = 19, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 38, .bottom_field_order_cnt = 38, .dpb = { @@ -4580,7 +4580,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 9194, .header_bit_size = 28, .first_mb_in_slice = 0, @@ -4599,7 +4599,7 @@ { .index = 20, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 40, .bottom_field_order_cnt = 40, .dpb = { @@ -4810,7 +4810,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 10690, .header_bit_size = 28, .first_mb_in_slice = 0, @@ -4829,7 +4829,7 @@ { .index = 21, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 42, .bottom_field_order_cnt = 42, .dpb = { @@ -5040,7 +5040,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 8287, .header_bit_size = 30, .first_mb_in_slice = 0, @@ -5059,7 +5059,7 @@ { .index = 22, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 44, .bottom_field_order_cnt = 44, .dpb = { @@ -5270,7 +5270,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 5160, .header_bit_size = 30, .first_mb_in_slice = 0, @@ -5289,7 +5289,7 @@ { .index = 23, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 46, .bottom_field_order_cnt = 46, .dpb = { @@ -5500,7 +5500,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 5681, .header_bit_size = 30, .first_mb_in_slice = 0, @@ -5519,7 +5519,7 @@ { .index = 24, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 48, .bottom_field_order_cnt = 48, .dpb = { @@ -5730,7 +5730,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 3740, .header_bit_size = 30, .first_mb_in_slice = 0, @@ -5749,7 +5749,7 @@ { .index = 25, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 50, .bottom_field_order_cnt = 50, .dpb = { @@ -5960,7 +5960,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 3387, .header_bit_size = 30, .first_mb_in_slice = 0, @@ -5979,7 +5979,7 @@ { .index = 26, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 52, .bottom_field_order_cnt = 52, .dpb = { @@ -6190,7 +6190,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 3353, .header_bit_size = 30, .first_mb_in_slice = 0, @@ -6209,7 +6209,7 @@ { .index = 27, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 54, .bottom_field_order_cnt = 54, .dpb = { @@ -6420,7 +6420,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 3053, .header_bit_size = 32, .first_mb_in_slice = 0, @@ -6439,7 +6439,7 @@ { .index = 28, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 56, .bottom_field_order_cnt = 56, .dpb = { @@ -6650,7 +6650,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 3769, .header_bit_size = 32, .first_mb_in_slice = 0, @@ -6669,7 +6669,7 @@ { .index = 29, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 58, .bottom_field_order_cnt = 58, .dpb = { @@ -6880,7 +6880,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 3984, .header_bit_size = 32, .first_mb_in_slice = 0, @@ -6899,7 +6899,7 @@ { .index = 30, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 60, .bottom_field_order_cnt = 60, .dpb = { @@ -7110,7 +7110,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 2726, .header_bit_size = 32, .first_mb_in_slice = 0, @@ -7129,7 +7129,7 @@ { .index = 31, .frame.h264 = { - .decode = { + .decode_param = { .top_field_order_cnt = 62, .bottom_field_order_cnt = 62, .dpb = { @@ -7340,7 +7340,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 2850, .header_bit_size = 34, .first_mb_in_slice = 0, diff --git a/data/bbb-h264-all-i-32/frames.h b/data/bbb-h264-all-i-32/frames.h index dea32a8..2e03e66 100644 --- a/data/bbb-h264-all-i-32/frames.h +++ b/data/bbb-h264-all-i-32/frames.h @@ -1,7 +1,7 @@ { .index = 0, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -190,7 +190,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 36843, .header_bit_size = 32, .first_mb_in_slice = 0, @@ -210,7 +210,7 @@ { .index = 1, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -399,7 +399,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 23036, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -419,7 +419,7 @@ { .index = 2, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -608,7 +608,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 23745, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -628,7 +628,7 @@ { .index = 3, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -817,7 +817,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 23342, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -837,7 +837,7 @@ { .index = 4, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -1026,7 +1026,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 23299, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -1046,7 +1046,7 @@ { .index = 5, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -1235,7 +1235,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 23228, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -1255,7 +1255,7 @@ { .index = 6, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -1444,7 +1444,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 23309, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -1464,7 +1464,7 @@ { .index = 7, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -1653,7 +1653,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 23276, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -1673,7 +1673,7 @@ { .index = 8, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -1862,7 +1862,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 23308, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -1882,7 +1882,7 @@ { .index = 9, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -2071,7 +2071,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 23252, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -2091,7 +2091,7 @@ { .index = 10, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -2280,7 +2280,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 23278, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -2300,7 +2300,7 @@ { .index = 11, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -2489,7 +2489,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 23335, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -2509,7 +2509,7 @@ { .index = 12, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -2698,7 +2698,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 23332, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -2718,7 +2718,7 @@ { .index = 13, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -2907,7 +2907,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 23263, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -2927,7 +2927,7 @@ { .index = 14, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -3116,7 +3116,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 26141, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -3136,7 +3136,7 @@ { .index = 15, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -3325,7 +3325,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 26301, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -3345,7 +3345,7 @@ { .index = 16, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -3534,7 +3534,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 26326, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -3554,7 +3554,7 @@ { .index = 17, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -3743,7 +3743,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 26165, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -3763,7 +3763,7 @@ { .index = 18, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -3952,7 +3952,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 26113, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -3972,7 +3972,7 @@ { .index = 19, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -4161,7 +4161,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 25794, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -4181,7 +4181,7 @@ { .index = 20, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -4370,7 +4370,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 25432, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -4390,7 +4390,7 @@ { .index = 21, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -4579,7 +4579,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 25104, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -4599,7 +4599,7 @@ { .index = 22, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -4788,7 +4788,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 24968, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -4808,7 +4808,7 @@ { .index = 23, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -4997,7 +4997,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 24776, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -5017,7 +5017,7 @@ { .index = 24, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -5206,7 +5206,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 24687, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -5226,7 +5226,7 @@ { .index = 25, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -5415,7 +5415,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 24523, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -5435,7 +5435,7 @@ { .index = 26, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -5624,7 +5624,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 24694, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -5644,7 +5644,7 @@ { .index = 27, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -5833,7 +5833,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 24709, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -5853,7 +5853,7 @@ { .index = 28, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -6042,7 +6042,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 24722, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -6062,7 +6062,7 @@ { .index = 29, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -6251,7 +6251,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 24755, .header_bit_size = 38, .first_mb_in_slice = 0, @@ -6271,7 +6271,7 @@ { .index = 30, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -6460,7 +6460,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 24690, .header_bit_size = 36, .first_mb_in_slice = 0, @@ -6480,7 +6480,7 @@ { .index = 31, .frame.h264 = { - .decode = { + .decode_param = { }, .pps = { .weighted_bipred_idc = 0, @@ -6669,7 +6669,7 @@ }, }, }, - .slice = { + .slice_param = { .size = 24811, .header_bit_size = 38, .first_mb_in_slice = 0, diff --git a/data/bbb-mpeg2/frames.h b/data/bbb-mpeg2/frames.h index 5aebca3..51f8f04 100644 --- a/data/bbb-mpeg2/frames.h +++ b/data/bbb-mpeg2/frames.h @@ -1,7 +1,7 @@ { .index = 0, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_I, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_I, .f_code = { 15, 15, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -17,8 +17,8 @@ }, { .index = 1, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -34,8 +34,8 @@ }, { .index = 2, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -51,8 +51,8 @@ }, { .index = 3, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -68,8 +68,8 @@ }, { .index = 4, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -85,8 +85,8 @@ }, { .index = 5, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -102,8 +102,8 @@ }, { .index = 6, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -119,8 +119,8 @@ }, { .index = 7, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -136,8 +136,8 @@ }, { .index = 8, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -153,8 +153,8 @@ }, { .index = 9, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -170,8 +170,8 @@ }, { .index = 10, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -187,8 +187,8 @@ }, { .index = 11, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -204,8 +204,8 @@ }, { .index = 12, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -221,8 +221,8 @@ }, { .index = 13, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -238,8 +238,8 @@ }, { .index = 14, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 7, 7, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -255,8 +255,8 @@ }, { .index = 15, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_I, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_I, .f_code = { 15, 15, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -272,8 +272,8 @@ }, { .index = 16, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -289,8 +289,8 @@ }, { .index = 17, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -306,8 +306,8 @@ }, { .index = 18, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -323,8 +323,8 @@ }, { .index = 19, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -340,8 +340,8 @@ }, { .index = 20, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -357,8 +357,8 @@ }, { .index = 21, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -374,8 +374,8 @@ }, { .index = 22, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -391,8 +391,8 @@ }, { .index = 23, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -408,8 +408,8 @@ }, { .index = 24, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 1, 1, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, diff --git a/data/ed-mpeg2/frames.h b/data/ed-mpeg2/frames.h index 0616c2f..647213a 100644 --- a/data/ed-mpeg2/frames.h +++ b/data/ed-mpeg2/frames.h @@ -1,7 +1,7 @@ { .index = 0, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_I, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_I, .f_code = { 15, 15, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -17,8 +17,8 @@ }, { .index = 1, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 4, 4, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -34,8 +34,8 @@ }, { .index = 2, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -51,8 +51,8 @@ }, { .index = 3, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 2, 2 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -68,8 +68,8 @@ }, { .index = 4, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 4, 4, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -85,8 +85,8 @@ }, { .index = 5, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 2, 2, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -102,8 +102,8 @@ }, { .index = 6, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -119,8 +119,8 @@ }, { .index = 7, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 4, 4, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -136,8 +136,8 @@ }, { .index = 8, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -153,8 +153,8 @@ }, { .index = 9, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 2, 2 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -170,8 +170,8 @@ }, { .index = 10, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_I, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_I, .f_code = { 15, 15, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -187,8 +187,8 @@ }, { .index = 11, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 2, 2, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -204,8 +204,8 @@ }, { .index = 12, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 1, 1 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -221,8 +221,8 @@ }, { .index = 13, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 4, 4, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -238,8 +238,8 @@ }, { .index = 14, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 1, 1, 2, 2 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -255,8 +255,8 @@ }, { .index = 15, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 2, 2 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -272,8 +272,8 @@ }, { .index = 16, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 4, 4, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -289,8 +289,8 @@ }, { .index = 17, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 2, 2, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -306,8 +306,8 @@ }, { .index = 18, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -323,8 +323,8 @@ }, { .index = 19, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 4, 4, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -340,8 +340,8 @@ }, { .index = 20, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 4, 4, 2, 2 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -357,8 +357,8 @@ }, { .index = 21, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 2, 2 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -374,8 +374,8 @@ }, { .index = 22, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_I, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_I, .f_code = { 15, 15, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -391,8 +391,8 @@ }, { .index = 23, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 2, 2, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -408,8 +408,8 @@ }, { .index = 24, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 2, 2 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -425,8 +425,8 @@ }, { .index = 25, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 4, 4, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -442,8 +442,8 @@ }, { .index = 26, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -459,8 +459,8 @@ }, { .index = 27, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 4, 4, 2, 2 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -476,8 +476,8 @@ }, { .index = 28, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 3, 3, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -493,8 +493,8 @@ }, { .index = 29, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 2, 2, 2, 2 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -510,8 +510,8 @@ }, { .index = 30, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -527,8 +527,8 @@ }, { .index = 31, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 4, 4, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -544,8 +544,8 @@ }, { .index = 32, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -561,8 +561,8 @@ }, { .index = 33, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 2, 2 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -578,8 +578,8 @@ }, { .index = 34, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_I, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_I, .f_code = { 15, 15, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -595,8 +595,8 @@ }, { .index = 35, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -612,8 +612,8 @@ }, { .index = 36, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -629,8 +629,8 @@ }, { .index = 37, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 4, 4, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -646,8 +646,8 @@ }, { .index = 38, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 4, 4 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -663,8 +663,8 @@ }, { .index = 39, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -680,8 +680,8 @@ }, { .index = 40, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 4, 4, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -697,8 +697,8 @@ }, { .index = 41, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 2, 2 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -714,8 +714,8 @@ }, { .index = 42, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 2, 2 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -731,8 +731,8 @@ }, { .index = 43, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 4, 4, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -748,8 +748,8 @@ }, { .index = 44, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -765,8 +765,8 @@ }, { .index = 45, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 4, 4, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -782,8 +782,8 @@ }, { .index = 46, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_I, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_I, .f_code = { 15, 15, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -799,8 +799,8 @@ }, { .index = 47, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -816,8 +816,8 @@ }, { .index = 48, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_B, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_B, .f_code = { 3, 3, 3, 3 }, .intra_dc_precision = 0, .picture_structure = 3, @@ -833,8 +833,8 @@ }, { .index = 49, - .frame.mpeg2.header = { - .picture_coding_type = V4L2_SLICE_PCT_P, + .frame.mpeg2.slice_params = { + .slice_type = V4L2_MPEG2_SLICE_TYPE_P, .f_code = { 5, 5, 15, 15 }, .intra_dc_precision = 0, .picture_structure = 3, -- cgit v1.2.3