diff --git a/tutorials/OsdSample/C++/ExternalOsdInstances.json b/tutorials/OsdSample/C++/ExternalOsdInstances.json index 3ce60ac44d3de27a3ce41b85c30edabe8fed67bf..ed6083e31f533e57b0f735ba7667c22d549e5e12 100644 --- a/tutorials/OsdSample/C++/ExternalOsdInstances.json +++ b/tutorials/OsdSample/C++/ExternalOsdInstances.json @@ -1,78 +1,78 @@ { -  "osdInstancesVec": [ -    { -      "osdTextVec": [ -        { -          "text": "Hello, world!", -          "x0": 150, -          "y0": 400, -          "fontFace": 1, -          "fontScale": 2.0, -          "osdParams": { -            "scalorB": 60, -            "scalorG": 20, -            "scalorR": 220, -            "thickness": 2, -            "lineType": 8 -          } -        } -      ], -      "osdRectVec": [ -        { -          "x0": 0, -          "y0": 0, -          "x1": 512, -          "y1": 512, -          "osdParams": { -            "scalorB": 42, -            "scalorG": 42, -            "scalorR": 165, -            "thickness": 5, -            "lineType": 8 -          } -        } -      ], -      "osdCircleVec": [ -        { -          "x0": 0, -          "y0": 320, -          "radius": 10, -          "osdParams": { -            "scalorB": 0, -            "scalorG": 128, -            "scalorR": 255, -            "thickness": -1, -            "lineType": 8 -          } -        }, -        { -          "x0": 512, -          "y0": 320, -          "radius": 10, -          "osdParams": { -            "scalorB": 0, -            "scalorG": 128, -            "scalorR": 255, -            "thickness": -1, -            "lineType": 8 -          } -        } -      ], -      "osdLineVec": [ -        { -          "x0": 0, -          "y0": 320, -          "x1": 512, -          "y1": 320, -          "osdParams": { -            "scalorB": 255, -            "scalorG": 128, -            "scalorR": 0, -            "thickness": 5, -            "lineType": 8 -          } -        } -      ] -    } -  ] + "osdInstancesVec": [ + { + "osdTextVec": [ + { + "text": "Hello, world!", + "x0": 150, + "y0": 400, + "fontFace": 1, + "fontScale": 2.0, + "osdParams": { + "scalorB": 60, + "scalorG": 20, + "scalorR": 220, + "thickness": 2, + "lineType": 8 + } + } + ], + "osdRectVec": [ + { + "x0": 0, + "y0": 0, + "x1": 512, + "y1": 512, + "osdParams": { + "scalorB": 42, + "scalorG": 42, + "scalorR": 165, + "thickness": 5, + "lineType": 8 + } + } + ], + "osdCircleVec": [ + { + "x0": 0, + "y0": 320, + "radius": 10, + "osdParams": { + "scalorB": 0, + "scalorG": 128, + "scalorR": 255, + "thickness": -1, + "lineType": 8 + } + }, + { + "x0": 512, + "y0": 320, + "radius": 10, + "osdParams": { + "scalorB": 0, + "scalorG": 128, + "scalorR": 255, + "thickness": -1, + "lineType": 8 + } + } + ], + "osdLineVec": [ + { + "x0": 0, + "y0": 320, + "x1": 512, + "y1": 320, + "osdParams": { + "scalorB": 255, + "scalorG": 128, + "scalorR": 0, + "thickness": 5, + "lineType": 8 + } + } + ] + } + ] } \ No newline at end of file diff --git a/tutorials/OsdSample/C++/main.cpp b/tutorials/OsdSample/C++/main.cpp index 7dc9ceb63382878a8f7dda4fac776e474b88f662..d2dc1b711ed7ec25b52c05191d7d1a5c940acc2c 100644 --- a/tutorials/OsdSample/C++/main.cpp +++ b/tutorials/OsdSample/C++/main.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include +#include #include #include "MxBase/Log/Log.h" #include "MxStream/StreamManager/MxStreamManager.h" @@ -144,12 +144,12 @@ int main(int argc, char* argv[]) // send osd instances protobuf. std::string result = ReadFileContent("./ExternalOsdInstances.json"); - auto osdInstancesList = std::make_shared(); + auto osdInstancesList = std::make_shared(); google::protobuf::util::JsonStringToMessage(result, osdInstancesList.get()); MxStream::MxstProtobufIn protobuf; - protobuf.key = "mxpi_parallel2serial0"; - protobuf.messagePtr = std::static_pointer_cast(osdInstancesList); - std::vector dataBufferVec; + protobuf.key = "appsrc1"; + protobuf.messagePtr = std::static_pointer_cast(osdInstancesList); + std::vector dataBufferVec; dataBufferVec.push_back(protobuf); // send data into stream ret = mxStreamManager.SendProtobuf(streamName, 1, dataBufferVec); diff --git a/tutorials/OsdSample/pipeline/SampleOsd.pipeline b/tutorials/OsdSample/pipeline/SampleOsd.pipeline index eebe9bc79f4a35fdd9eee02e3f539e672c2f1ed1..9757602fb35b1d93f3fcf95e3699c27eb8728448 100644 --- a/tutorials/OsdSample/pipeline/SampleOsd.pipeline +++ b/tutorials/OsdSample/pipeline/SampleOsd.pipeline @@ -1,56 +1,55 @@ { -    "encoder":{ -        "stream_config":{ -            "deviceId":"0" -        }, -        "appsrc0": { -            "props": { -                "blocksize": "40960000" -            }, -            "factory": "appsrc", -            "next": "mxpi_imagedecoder0" -        }, -        "mxpi_imagedecoder0":{ -            "factory":"mxpi_imagedecoder", -            "next":"mxpi_imageresize0" -        }, -        "mxpi_imageresize0":{ -            "props":{ -                "resizeHeight":"512", -                "resizeWidth":"512" -            }, -            "factory":"mxpi_imageresize", -            "next":"mxpi_aicpuosd0:0" -        }, -        "appsrc1": { -            "props": { -                "blocksize": "40960000" -            }, -            "factory": "appsrc", -            "next":"mxpi_parallel2serial0" -        }, -        "mxpi_parallel2serial0":{ -            "factory":"mxpi_parallel2serial", -            "next":"mxpi_aicpuosd0:1" -        }, -        "mxpi_aicpuosd0":{ -            "props": { -    "dataSourceOsd":"mxpi_parallel2serial0", -    "dataSourceImage":"mxpi_imagedecoder0" -            }, -            "factory":"mxpi_opencvosd", -            "next":"mxpi_imageencoder0" -        }, -        "mxpi_imageencoder0":{ -            "factory":"mxpi_imageencoder", -            "next":"appsink0" -        }, -        "appsink0":{ -            "props": { -    "blocksize":"40960000", -                "location": "./testout.jpg" -            }, -            "factory":"filesink" -        } -    } + "encoder":{ + "stream_config":{ + "deviceId":"0" + }, + "appsrc0":{ + "props":{ + "blocksize":"40960000" + }, + "factory":"appsrc", + "next":"mxpi_imagedecoder0" + }, + "mxpi_imagedecoder0":{ + "factory":"mxpi_imagedecoder", + "next":"mxpi_imageresize0" + }, + "mxpi_imageresize0":{ + "props":{ + "resizeHeight":"512", + "resizeWidth":"512" + }, + "factory":"mxpi_imageresize", + "next":"mxpi_opencvosd0:0" + }, + "appsrc1":{ + "props":{ + "blocksize":"40960000" + }, + "factory":"appsrc", + "next":"mxpi_osdinstancemerger0" + }, + "mxpi_osdinstancemerger0":{ + "props":{ + "dataSourceList":"appsrc1" + }, + "factory":"mxpi_osdinstancemerger", + "next":"mxpi_opencvosd0:1" + }, + "mxpi_opencvosd0":{ + "factory":"mxpi_opencvosd", + "next":"mxpi_imageencoder0" + }, + "mxpi_imageencoder0":{ + "factory":"mxpi_imageencoder", + "next":"appsink0" + }, + "appsink0":{ + "props":{ + "blocksize":"40960000", + "location":"./testout.jpg" + }, + "factory":"filesink" + } + } } \ No newline at end of file diff --git a/tutorials/OsdSample/python/ExternalOsdInstances.json b/tutorials/OsdSample/python/ExternalOsdInstances.json index 3ce60ac44d3de27a3ce41b85c30edabe8fed67bf..ed6083e31f533e57b0f735ba7667c22d549e5e12 100644 --- a/tutorials/OsdSample/python/ExternalOsdInstances.json +++ b/tutorials/OsdSample/python/ExternalOsdInstances.json @@ -1,78 +1,78 @@ { -  "osdInstancesVec": [ -    { -      "osdTextVec": [ -        { -          "text": "Hello, world!", -          "x0": 150, -          "y0": 400, -          "fontFace": 1, -          "fontScale": 2.0, -          "osdParams": { -            "scalorB": 60, -            "scalorG": 20, -            "scalorR": 220, -            "thickness": 2, -            "lineType": 8 -          } -        } -      ], -      "osdRectVec": [ -        { -          "x0": 0, -          "y0": 0, -          "x1": 512, -          "y1": 512, -          "osdParams": { -            "scalorB": 42, -            "scalorG": 42, -            "scalorR": 165, -            "thickness": 5, -            "lineType": 8 -          } -        } -      ], -      "osdCircleVec": [ -        { -          "x0": 0, -          "y0": 320, -          "radius": 10, -          "osdParams": { -            "scalorB": 0, -            "scalorG": 128, -            "scalorR": 255, -            "thickness": -1, -            "lineType": 8 -          } -        }, -        { -          "x0": 512, -          "y0": 320, -          "radius": 10, -          "osdParams": { -            "scalorB": 0, -            "scalorG": 128, -            "scalorR": 255, -            "thickness": -1, -            "lineType": 8 -          } -        } -      ], -      "osdLineVec": [ -        { -          "x0": 0, -          "y0": 320, -          "x1": 512, -          "y1": 320, -          "osdParams": { -            "scalorB": 255, -            "scalorG": 128, -            "scalorR": 0, -            "thickness": 5, -            "lineType": 8 -          } -        } -      ] -    } -  ] + "osdInstancesVec": [ + { + "osdTextVec": [ + { + "text": "Hello, world!", + "x0": 150, + "y0": 400, + "fontFace": 1, + "fontScale": 2.0, + "osdParams": { + "scalorB": 60, + "scalorG": 20, + "scalorR": 220, + "thickness": 2, + "lineType": 8 + } + } + ], + "osdRectVec": [ + { + "x0": 0, + "y0": 0, + "x1": 512, + "y1": 512, + "osdParams": { + "scalorB": 42, + "scalorG": 42, + "scalorR": 165, + "thickness": 5, + "lineType": 8 + } + } + ], + "osdCircleVec": [ + { + "x0": 0, + "y0": 320, + "radius": 10, + "osdParams": { + "scalorB": 0, + "scalorG": 128, + "scalorR": 255, + "thickness": -1, + "lineType": 8 + } + }, + { + "x0": 512, + "y0": 320, + "radius": 10, + "osdParams": { + "scalorB": 0, + "scalorG": 128, + "scalorR": 255, + "thickness": -1, + "lineType": 8 + } + } + ], + "osdLineVec": [ + { + "x0": 0, + "y0": 320, + "x1": 512, + "y1": 320, + "osdParams": { + "scalorB": 255, + "scalorG": 128, + "scalorR": 0, + "thickness": 5, + "lineType": 8 + } + } + ] + } + ] } \ No newline at end of file diff --git a/tutorials/OsdSample/python/main.py b/tutorials/OsdSample/python/main.py index 005089bb43ea83d1838dd260e4fad6acd015354e..92684e120bc694dfd799baed52748e1411ca9431 100644 --- a/tutorials/OsdSample/python/main.py +++ b/tutorials/OsdSample/python/main.py @@ -19,54 +19,54 @@ limitations under the License. import json import time -from StreamManagerApi import * +from stream_manager_api import * import MxpiOSDType_pb2 as MxpiOSDType from google.protobuf.json_format import * if __name__ == '__main__': # init stream manager - streamManagerApi = StreamManagerApi() - ret = streamManagerApi.InitManager() + stream_manager_api = stream_manager_api() + ret = stream_manager_api.InitManager() if ret != 0: print("Failed to init Stream manager, ret=%s" % str(ret)) exit() # create streams by pipeline config file with open("../pipeline/SampleOsd.pipeline", 'rb') as f: - pipelineStr = f.read() - ret = streamManagerApi.CreateMultipleStreams(pipelineStr) + pipeline_str = f.read() + ret = stream_manager_api.CreateMultipleStreams(pipeline_str) if ret != 0: print("Failed to create Stream, ret=%s" % str(ret)) exit() # Construct the input of the stream - dataInput = MxDataInput() + data_input = Mxdata_input() with open("test.jpg", 'rb') as f: - dataInput.data = f.read() + data_input.data = f.read() # Send image. - streamName = b'encoder' - inPluginId = 0 - ret = streamManagerApi.SendData(streamName, inPluginId, dataInput) + stream_name = b'encoder' + in_plugin_id = 0 + ret = stream_manager_api.SendData(stream_name, in_plugin_id, data_input) if ret < 0: print("Failed to send data to stream.") exit() # Send osd instances protobuf. with open("ExternalOsdInstances.json", "r") as f: - messageJson = json.load(f) - print(messageJson) - inPluginId = 1 - osdInstancesList = MxpiOSDType.MxpiOsdInstancesList() - osdInstancesList = ParseDict(messageJson, osdInstancesList) + message_json = json.load(f) + print(message_json) + in_plugin_id = 1 + osd_instances_list = MxpiOSDType.Mxpiosd_instances_list() + osd_instances_list = ParseDict(message_json, osd_instances_list) - protobufVec = InProtobufVector() + protobuf_vec = Inprotobuf_vector() protobuf = MxProtobufIn() - protobuf.key = b'mxpi_parallel2serial0' - protobuf.type = b'MxTools.MxpiOsdInstancesList' - protobuf.protobuf = osdInstancesList.SerializeToString() - protobufVec.push_back(protobuf) - ret = streamManagerApi.SendProtobuf(streamName, inPluginId, protobufVec) + protobuf.key = b'appsrc1' + protobuf.type = b'MxTools.Mxpiosd_instances_list' + protobuf.protobuf = osd_instances_list.SerializeToString() + protobuf_vec.push_back(protobuf) + ret = stream_manager_api.SendProtobuf(stream_name, in_plugin_id, protobuf_vec) if ret < 0: print("Failed to send protobuf to stream.") exit() @@ -74,4 +74,4 @@ if __name__ == '__main__': time.sleep(2) # destroy streams - streamManagerApi.DestroyAllStreams() + stream_manager_api.DestroyAllStreams()