Skip to content

Commit 4ae00ad

Browse files
smuppandsmuppand
authored
Merge pull request #316 from abbajaj806/MMAP_Fix
Video Upstream MMAP Memory type fix
2 parents 229b45a + 45c12e9 commit 4ae00ad

10 files changed

Lines changed: 170 additions & 2 deletions

‎Runner/suites/Multimedia/Video/Video_V4L2_Runner/base_h264Decoder.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"ExecutionMode": "Sequential",
3+
"TestCases": [
4+
{
5+
"Name" : "H264 Decoder Testcase",
6+
"TestConfigs" : {
7+
"Domain": "Decoder",
8+
"InputPath": "./256_144p_h264.h264",
9+
"NumFrames": -1,
10+
"CodecName": "AVC",
11+
"PixelFormat": "NV12",
12+
"Width": 256,
13+
"Height": 144,
14+
"Outputpath": "",
15+
"_Outputpath_original": "./output_256_144p_h264.yuv",
16+
"InputBufferCount": 16,
17+
"OutputBufferCount": 16,
18+
"MemoryType": "MMAP"
19+
}
20+
}
21+
]
22+
}

Runner/suites/Multimedia/Video/Video_V4L2_Runner/h264Encoder.json renamed to Runner/suites/Multimedia/Video/Video_V4L2_Runner/base_h264Encoder.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
{"Id": "PrefixHeaderMode", "Vtype": "String", "Value": "JOINED"},
2727
],
2828
"DynamicControls": [],
29-
"MemoryType": "MMAP"
29+
"MemoryType": "MMAP"
3030
}
3131
}
3232
]

‎Runner/suites/Multimedia/Video/Video_V4L2_Runner/base_h265Decoder.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"ExecutionMode": "Sequential",
3+
"TestCases": [
4+
{
5+
"Name": "HEVC Decoder TestCase",
6+
"TestConfigs": {
7+
"Domain": "Decoder",
8+
"InputPath": "./256_144p_hevc.h265",
9+
"NumFrames": -1,
10+
"CodecName": "HEVC",
11+
"PixelFormat": "NV12",
12+
"Width": 256,
13+
"Height": 144,
14+
"Outputpath": "",
15+
"_Outputpath_original": "./output_256_144p_hevc.yuv",
16+
"InputBufferCount": 16,
17+
"OutputBufferCount": 16,
18+
"UseMinBufferCtrl": false,
19+
"MemoryType": "MMAP"
20+
}
21+
}
22+
]
23+
}

Runner/suites/Multimedia/Video/Video_V4L2_Runner/h265Encoder.json renamed to Runner/suites/Multimedia/Video/Video_V4L2_Runner/base_h265Encoder.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
}
6363
],
6464
"DynamicControls": [],
65-
"MemoryType": "MMAP"
65+
"MemoryType": "MMAP"
6666
}
6767
}
6868
]

‎Runner/suites/Multimedia/Video/Video_V4L2_Runner/base_vp9Decoder.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"ExecutionMode": "Sequential",
3+
"TestCases": [
4+
{
5+
"Name": "VP9 Decode TestCase",
6+
"TestConfigs": {
7+
"Domain": "Decoder",
8+
"InputPath": "./320_240_10fps.ivf",
9+
"NumFrames": -1,
10+
"CodecName": "VP9",
11+
"PixelFormat": "NV12",
12+
"Width": 320,
13+
"Height": 240,
14+
"Outputpath": "",
15+
"_Outputpath_original": "./320_240_10fps_vp9.yuv",
16+
"InputBufferCount": 16,
17+
"OutputBufferCount": 16,
18+
"UseMinBufferCtrl": false,
19+
"MemoryType": "MMAP"
20+
}
21+
}
22+
]
23+
}

Runner/suites/Multimedia/Video/Video_V4L2_Runner/h264Decoder.json renamed to Runner/suites/Multimedia/Video/Video_V4L2_Runner/overlay_h264Decoder.json

File renamed without changes.

‎Runner/suites/Multimedia/Video/Video_V4L2_Runner/overlay_h264Encoder.json‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"ExecutionMode": "Sequential",
3+
"TestCases": [
4+
{
5+
"Name" : "Encoder Testcase",
6+
"TestConfigs" : {
7+
"Domain": "Encoder",
8+
"InputPath": "./Animation_144p.yuv",
9+
"NumFrames": -1,
10+
"CodecName": "AVC",
11+
"PixelFormat": "NV12",
12+
"Width": 256,
13+
"Height": 144,
14+
"Outputpath": "",
15+
"_Outputpath_original": "./Output_Animation_144p.h264",
16+
"InputBufferCount": 32,
17+
"OutputBufferCount": 32,
18+
"OperatingRate": 10,
19+
"FrameRate": 10,
20+
"StaticControls": [
21+
{"Id": "Profile", "Vtype": "String", "Value": "BASELINE"},
22+
{"Id": "Level", "Vtype": "String", "Value": "5.0"},
23+
{"Id": "FrameRC", "Vtype": "Int", "Value": 1},
24+
{"Id": "BitRate", "Vtype": "Int", "Value": 18000000},
25+
{"Id": "BitRateMode", "Vtype": "String", "Value": "CBR"},
26+
{"Id": "PrefixHeaderMode", "Vtype": "String", "Value": "JOINED"},
27+
],
28+
"DynamicControls": []
29+
}
30+
}
31+
]
32+
}

Runner/suites/Multimedia/Video/Video_V4L2_Runner/h265Decoder.json renamed to Runner/suites/Multimedia/Video/Video_V4L2_Runner/overlay_h265Decoder.json

File renamed without changes.

‎Runner/suites/Multimedia/Video/Video_V4L2_Runner/overlay_h265Encoder.json‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
{
2+
"ExecutionMode": "Sequential",
3+
"TestCases": [
4+
{
5+
"Name": "HEVC Encode TestCase",
6+
"TestConfigs": {
7+
"VideoDevice": "/dev/video1",
8+
"Domain": "Encoder",
9+
"InputPath": "./Animation_144p.yuv",
10+
"NumFrames": 60,
11+
"CodecName": "HEVC",
12+
"PixelFormat": "NV12",
13+
"Width": 256,
14+
"Height": 144,
15+
"Outputpath": "",
16+
"_Outputpath_original": "./Output_Animation_144p.265",
17+
"UseMinBufferCtrl": false,
18+
"InputBufferCount": 32,
19+
"OutputBufferCount": 32,
20+
"OperatingRate": 30,
21+
"FrameRate": 30,
22+
"StaticControls": [
23+
{
24+
"Id": "Profile",
25+
"Vtype": "String",
26+
"Value": "MAIN"
27+
},
28+
{
29+
"Id": "Level",
30+
"Vtype": "String",
31+
"Value": "5.0"
32+
},
33+
{
34+
"Id": "FrameRC",
35+
"Vtype": "Int",
36+
"Value": 1
37+
},
38+
{
39+
"Id": "BitRate",
40+
"Vtype": "Int",
41+
"Value": 3662400
42+
},
43+
{
44+
"Id": "BitRateMode",
45+
"Vtype": "String",
46+
"Value": "VBR"
47+
},
48+
{
49+
"Id": "PrefixHeaderMode",
50+
"Vtype": "String",
51+
"Value": "JOINED"
52+
},
53+
{
54+
"Id": "Tier",
55+
"Vtype": "String",
56+
"Value": "HIGH"
57+
},
58+
{
59+
"Id": "GOPSize",
60+
"Vtype": "Int",
61+
"Value": 59
62+
}
63+
],
64+
"DynamicControls": []
65+
}
66+
}
67+
]
68+
}

Runner/suites/Multimedia/Video/Video_V4L2_Runner/vp9Decoder.json renamed to Runner/suites/Multimedia/Video/Video_V4L2_Runner/overlay_vp9Decoder.json

File renamed without changes.

0 commit comments

Comments
 (0)