Fixed TrackerMIL one frame late (#7399)

cvat-ai · Jan 26, 2024 · ed9439b · ed9439b
1 parent 34bc61e
commit ed9439b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/changelog.d/20240126_130427_klakhov_fix_opencv_tracker_frame_late.md b/changelog.d/20240126_130427_klakhov_fix_opencv_tracker_frame_late.md
@@ -0,0 +1,4 @@
+### Fixed
+
+- OpenCV tracker MIL works one frame behind
+  (<https://github.com/opencv/cvat/pull/7399>)
diff --git a/cvat-ui/package.json b/cvat-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-ui",
-  "version": "1.61.2",
+  "version": "1.61.3",
   "description": "CVAT single-page application",
   "main": "src/index.tsx",
   "scripts": {

diff --git a/...ui/src/components/annotation-page/standard-workspace/controls-side-bar/opencv-control.tsx b/...ui/src/components/annotation-page/standard-workspace/controls-side-bar/opencv-control.tsx
@@ -45,6 +45,7 @@ import withVisibilityHandling from './handle-popover-visibility';
 interface Props {
     labels: any[];
     canvasInstance: Canvas;
+    canvasReady: boolean;
     jobInstance: any;
     isActivated: boolean;
     states: any[];
@@ -85,6 +86,7 @@ interface State {
     trackedShapes: TrackedShape[];
     activeTracker: OpenCVTracker | null;
     trackers: OpenCVTracker[];
+    lastTrackedFrame: number | null;
 }
 
 const core = getCore();
@@ -98,7 +100,7 @@ function mapStateToProps(state: CombinedState): Props {
                 zLayer: { cur: curZOrder },
             },
             job: { instance: jobInstance, labels },
-            canvas: { activeControl, instance: canvasInstance },
+            canvas: { activeControl, instance: canvasInstance, ready: canvasReady },
             player: {
                 frame: { number: frame, data: frameData },
             },
@@ -113,6 +115,7 @@ function mapStateToProps(state: CombinedState): Props {
         isActivated: activeControl === ActiveControl.OPENCV_TOOLS,
         activeControl,
         canvasInstance: canvasInstance as Canvas,
+        canvasReady,
         defaultApproxPolyAccuracy,
         jobInstance,
         curZOrder,
@@ -157,6 +160,7 @@ class OpenCVControlComponent extends React.PureComponent<Props & DispatchToProps
             trackedShapes: [],
             trackers: openCVWrapper.isInitialized ? Object.values(openCVWrapper.tracking) : [],
             activeTracker: openCVWrapper.isInitialized ? Object.values(openCVWrapper.tracking)[0] : null,
+            lastTrackedFrame: null,
         };
     }
 
@@ -168,7 +172,7 @@ class OpenCVControlComponent extends React.PureComponent<Props & DispatchToProps
     public componentDidUpdate(prevProps: Props, prevState: State): void {
         const { approxPolyAccuracy } = this.state;
         const {
-            isActivated, defaultApproxPolyAccuracy, canvasInstance, toolsBlockerState,
+            isActivated, defaultApproxPolyAccuracy, canvasInstance, canvasReady, toolsBlockerState,
         } = this.props;
 
         if (!prevProps.isActivated && isActivated) {
@@ -202,7 +206,8 @@ class OpenCVControlComponent extends React.PureComponent<Props & DispatchToProps
             !!this.activeTool?.switchBlockMode) {
             this.activeTool.switchBlockMode(toolsBlockerState.algorithmsLocked);
         }
-        this.checkTrackedStates(prevProps);
+
+        if (canvasReady) this.checkTrackedStates();
     }
 
     public componentWillUnmount(): void {
@@ -419,15 +424,19 @@ class OpenCVControlComponent extends React.PureComponent<Props & DispatchToProps
         });
     };
 
-    private checkTrackedStates(prevProps: Props): void {
+    private checkTrackedStates(): void {
         const {
             frame,
             states: objectStates,
             fetchAnnotations,
             switchNavigationBlocked,
         } = this.props;
-        const { trackedShapes } = this.state;
-        if (prevProps.frame !== frame && trackedShapes.length) {
+        const { trackedShapes, lastTrackedFrame } = this.state;
+        if (lastTrackedFrame !== frame && trackedShapes.length) {
+            this.setState({
+                lastTrackedFrame: frame,
+            });
+
             type AccumulatorType = {
                 [index: string]: TrackedShape[];
             };

diff --git a/tests/cypress/e2e/actions_tasks2/case_101_opencv_basic_actions.js b/tests/cypress/e2e/actions_tasks2/case_101_opencv_basic_actions.js
@@ -212,10 +212,10 @@ context('OpenCV. Intelligent scissors. Histogram Equalization. TrackerMIL.', ()
                         // On each frame text is moved by 5px on x and y axis,
                         // so we expect shape to be close to real text positions
                         cy.get('#cvat_canvas_shape_3').invoke('attr', 'x').then((xVal) => {
-                            expect(parseFloat(xVal)).to.be.closeTo(x + (i - 1) * 5, 2.0);
+                            expect(parseFloat(xVal)).to.be.closeTo(x + (i - 1) * 5, 3.0);
                         });
                         cy.get('#cvat_canvas_shape_3').invoke('attr', 'y').then((yVal) => {
-                            expect(parseFloat(yVal)).to.be.closeTo(y + (i - 1) * 5, 2.0);
+                            expect(parseFloat(yVal)).to.be.closeTo(y + (i - 1) * 5, 3.0);
                         });
                         cy.get('#cvat-objects-sidebar-state-item-3')
                             .should('contain', 'RECTANGLE TRACK')