Deleted unnecessary

main
Maya 6 years ago
parent d29f4cb6e0
commit fb383c71e2

@ -188,7 +188,7 @@ class ZipReader(ImageListReader):
def get_path(self, i):
if self._zip_source.filename:
return os.path.join(os.path.dirname(self._zip_source.filename), self._source_path[i])
else: #для определения mime_type
else: # necessary for mime_type definition
return self._source_path[i]
def extract(self):

@ -54,25 +54,6 @@ class AnalyzeVideo(WorkWithVideo):
frame_pts, frame_dts = frame.pts, frame.dts
self._close_video_container(container)
# class Frame:
# def __init__(self, frame, frame_number=None):
# self.frame = frame
# if frame_number:
# self.frame_number = frame_number
# def md5_hash(self):
# return hashlib.md5(self.frame.to_image().tobytes()).hexdigest()
# def __eq__(self, image):
# return self.md5_hash(self) == image.md5_hash(image) and self.frame.pts == image.frame.pts
# def __ne__(self, image):
# return md5_hash(self) != md5_hash(image) or self.frame.pts != image.frame.pts
# def __len__(self):
# return (self.frame.width, self.frame.height)
def md5_hash(frame):
return hashlib.md5(frame.to_image().tobytes()).hexdigest()
@ -109,7 +90,8 @@ class PrepareInfo(WorkWithVideo):
if not flag:
break
if len(self.key_frames) == 0: #or self.frames // len(self.key_frames) > 300:
#TODO: correct ratio of number of frames to keyframes
if len(self.key_frames) == 0:
raise Exception('Too few keyframes')
def save_key_frames(self):
@ -139,7 +121,6 @@ class PrepareInfo(WorkWithVideo):
for line in file:
frame_number, timestamp = line.strip().split(' ')
#TODO: исправить если вдруг ключевой кадр окажется не первым
if int(frame_number) <= start_chunk_frame_number:
start_decode_frame_number = frame_number
start_decode_timestamp = timestamp

@ -27,7 +27,7 @@ from rest_framework.exceptions import APIException
from rest_framework.permissions import SAFE_METHODS, IsAuthenticated
from rest_framework.renderers import JSONRenderer
from rest_framework.response import Response
from sendfile import sendfile#убрать
from sendfile import sendfile
import cvat.apps.dataset_manager as dm
import cvat.apps.dataset_manager.views # pylint: disable=unused-import

Loading…
Cancel
Save