Browse Source

巡检云代码提交

tags/V2.7.3^2
chenyukun 1 year ago
parent
commit
6c0f5c94bc
2 changed files with 4 additions and 5 deletions
  1. +2
    -3
      .idea/workspace.xml
  2. +2
    -2
      util/Cv2Utils.py

+ 2
- 3
.idea/workspace.xml View File

@@ -6,9 +6,7 @@
<component name="ChangeListManager">
<list default="true" id="4f7dccd9-8f92-4a6e-90cc-33890d102263" name="Changes" comment="Changes">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/concurrency/PullVideoStreamProcess.py" beforeDir="false" afterPath="$PROJECT_DIR$/concurrency/PullVideoStreamProcess.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/util/Cv2Utils.py" beforeDir="false" afterPath="$PROJECT_DIR$/util/Cv2Utils.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/util/ModelUtils.py" beforeDir="false" afterPath="$PROJECT_DIR$/util/ModelUtils.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -409,7 +407,8 @@
<workItem from="1677112353743" duration="588000" />
<workItem from="1677574708616" duration="34000" />
<workItem from="1677632498068" duration="4279000" />
<workItem from="1677654510460" duration="1688000" />
<workItem from="1677654510460" duration="2082000" />
<workItem from="1677727307545" duration="438000" />
</task>
<servers />
</component>

+ 2
- 2
util/Cv2Utils.py View File

@@ -102,7 +102,7 @@ class Cv2Util():
nb_frames = video_stream.get('nb_frames')
fps = video_stream.get('r_frame_rate')
# duration = video_stream.get('duration')
bit_rate = video_stream.get('bit_rate')
# bit_rate = video_stream.get('bit_rate')
self.width = int(width)
self.height = int(height)
if width > 1600:
@@ -134,7 +134,7 @@ class Cv2Util():
self.fps = int(eval(up) / eval(down))
# if duration:
# self.duration = float(video_stream['duration'])
self.bit_rate = int(bit_rate) / 1000
# self.bit_rate = int(bit_rate) / 1000
logger.info("视频信息, width:{}|height:{}|fps:{}|all_frames:{}|bit_rate:{}, requestId:{}", self.width,
self.height, self.fps, self.all_frames, self.bit_rate, self.requestId)
except ServiceException as s:

Loading…
Cancel
Save