Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

log ffmpeg command line & export interpolation to VOC #312

Merged
merged 10 commits into from
Feb 12, 2019

Conversation

jrjbertram
Copy link
Contributor

@jrjbertram jrjbertram commented Feb 5, 2019

Add ffmpeg command line to logs for easier debuggging of frame extraction issues in the future.

Edit: Also included a change to the convert.py script to support interpolated annotation for video files.

Related to issue #275

@jrjbertram jrjbertram changed the title log ffmpeg command line log ffmpeg command line & export interpolation to VOC Feb 5, 2019
utils/voc/converter.py Outdated Show resolved Hide resolved
@nmanovic
Copy link
Contributor

nmanovic commented Feb 6, 2019

@jrjbertram , thanks for your contribution! Could you please help us to improve the PR a little bit? Need to remove extra blank lines and fix coday issues.

utils/voc/converter.py Outdated Show resolved Hide resolved
utils/voc/converter.py Outdated Show resolved Hide resolved
utils/voc/converter.py Outdated Show resolved Hide resolved
@nmanovic
Copy link
Contributor

nmanovic commented Feb 7, 2019

@jrjbertram , one more ask. Could you please add some information about the contribution into CHANGELOG.md file?

@nmanovic
Copy link
Contributor

nmanovic commented Feb 7, 2019

@jrjbertram ,

One more problem, need to adjust tests for the converter. Inside virtual environment with all necessary dependencies just run python manage.py test utils and you will see the output below. Just need to adjust the file: utils/voc/tests/test_process_cvat_xml.py

Creating test database for alias 'default'...
System check identified no issues (0 silenced).
.0
    1: (626.810000,30.960000) (656.050000,58.880000) 'car'
1
    1: (626.630000,31.560000) (655.870000,59.480000) 'car'
2
110
    0: (634.120000,37.680000) (661.500000,71.370000) 'car'
111
    0: (634.210000,38.500000) (661.590000,72.190000) 'car'
112
F
======================================================================
FAIL: test_parse_interpolation_xml (utils.voc.tests.test_process_cvat_xml.TestProcessCvatXml)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python3.6/unittest/mock.py", line 1179, in patched
    return func(*args, **keywargs)
  File "/workspace/cvat_github/utils/voc/tests/test_process_cvat_xml.py", line 169, in test_parse_interpolation_xml
    self.assertTrue(len(os.listdir(voc_dir)) == 0)
AssertionError: False is not true

----------------------------------------------------------------------
Ran 2 tests in 0.082s

FAILED (failures=1)
Destroying test database for alias 'default'...

@jrjbertram
Copy link
Contributor Author

I tried reproducing the test failure but was unable to. Will work on that.

@jrjbertram
Copy link
Contributor Author

Got it worked out. I misunderstood the testing environment, but figured it out from CONTRIBUTING.md. Tests should be passing now. All other findings should now be addressed as well.

utils/voc/converter.py Outdated Show resolved Hide resolved
@nmanovic
Copy link
Contributor

@jrjbertram , thanks for your patience. I know that it is hard to implement something for a new project. I appreciate your time and willing to help.

@jrjbertram
Copy link
Contributor Author

@nmanovic no worries at all. Thanks for catching the bugs.

@nmanovic nmanovic merged commit cc55c30 into cvat-ai:develop Feb 12, 2019
nmanovic added a commit that referenced this pull request Feb 17, 2019
commit 4d30e2c2e5a325a3c0adb36efbaf452d731cc1d7
Merge: 4259f1d 8003a80
Author: Nikita Manovich <[email protected]>
Date:   Sun Feb 17 11:25:02 2019 +0300

    Merge remote-tracking branch 'origin/develop' into restapi

commit 4259f1d3f84dd4da0bb797138ef4cfbeb839e349
Author: Nikita Manovich <[email protected]>
Date:   Sun Feb 17 11:21:39 2019 +0300

    Initial version of task create

commit 8003a80
Author: Boris Sekachev <[email protected]>
Date:   Thu Feb 14 14:10:32 2019 +0300

    Fit condition has been fixed (#320)

commit cc55c30
Author: jrjbertram <[email protected]>
Date:   Tue Feb 12 15:06:48 2019 -0600

    log ffmpeg command line & export interpolation to VOC (#312)

commit 6baaeac
Author: Nikita Manovich <[email protected]>
Date:   Tue Feb 12 19:13:01 2019 +0300

    Implementation of POST /api/v1/tasks/{id}/data is in progress

commit 98bb2f9
Author: Nikita Manovich <[email protected]>
Date:   Tue Feb 12 18:28:51 2019 +0300

    Removed dead code

commit f4c2330
Author: Nikita Manovich <[email protected]>
Date:   Tue Feb 12 12:04:22 2019 +0300

    Add funtional tests for REST API /api/v1/users/*

commit 70d4de3
Merge: 4b59dec df10fe1
Author: Nikita Manovich <[email protected]>
Date:   Tue Feb 12 10:24:35 2019 +0300

    Merge remote-tracking branch 'origin/develop' into restapi

commit 4b59dec
Author: Nikita Manovich <[email protected]>
Date:   Mon Feb 11 19:57:38 2019 +0300

    Added API for Server REST API

commit ee0a89b
Author: Nikita Manovich <[email protected]>
Date:   Mon Feb 11 19:07:46 2019 +0300

    Add tests for Job REST API

commit 6b7f69d
Author: Nikita Manovich <[email protected]>
Date:   Sun Feb 10 22:14:37 2019 +0300

    Add permissions for REST API.

commit dcbbcb7
Author: Nikita Manovich <[email protected]>
Date:   Thu Feb 7 19:30:59 2019 +0300

    Minor changes.

commit 450c4c7
Author: Nikita Manovich <[email protected]>
Date:   Thu Feb 7 18:51:42 2019 +0300

    Add list for users, slightly improved server/exception

commit 090da2f
Author: Nikita Manovich <[email protected]>
Date:   Wed Feb 6 23:01:21 2019 +0300

    Implemented DELETE method for a task.

commit 3e87bc3
Author: Nikita Manovich <[email protected]>
Date:   Wed Feb 6 22:52:13 2019 +0300

    Improve update for the task.

commit a4054a0
Author: Nikita Manovich <[email protected]>
Date:   Wed Feb 6 19:27:39 2019 +0300

    Fixed a number of problems with PUT/PATCH methods for TaskSerializer

commit dff3b51
Author: Nikita Manovich <[email protected]>
Date:   Wed Feb 6 15:08:47 2019 +0300

    Redesigned AttributeSpec model + special migration for text field.

commit e132c2b
Author: Nikita Manovich <[email protected]>
Date:   Wed Feb 6 00:31:39 2019 +0300

    Added a constrain for clientfile

commit 88d4b0b
Author: Nikita Manovich <[email protected]>
Date:   Wed Feb 6 00:22:28 2019 +0300

    Fixed problems with renaming of files.

commit 711eb2f
Author: Nikita Manovich <[email protected]>
Date:   Tue Feb 5 23:31:28 2019 +0300

    Added contastrain for labels (name should be unique)

commit c6b8060
Author: Nikita Manovich <[email protected]>
Date:   Tue Feb 5 22:37:58 2019 +0300

    Minor changes inside server.

commit a19887e
Author: Nikita Manovich <[email protected]>
Date:   Tue Feb 5 19:15:16 2019 +0300

    Minor changes

commit d2692da
Author: Nikita Manovich <[email protected]>
Date:   Tue Feb 5 17:50:03 2019 +0300

    Improved versioning and dummy implementation for PluginViewSet

    Replaced URLPathVersioning by Namespace versioning. It fixed a couple of
    problems with documentation (api/docs).

commit 90d0b38
Merge: 828989b b4e6f22
Author: Nikita Manovich <[email protected]>
Date:   Tue Feb 5 12:24:06 2019 +0300

    Merge remote-tracking branch 'origin/develop' into restapi

commit 828989b
Author: Nikita Manovich <[email protected]>
Date:   Mon Feb 4 23:14:52 2019 +0300

    Fix data action for TaskViewSet.

commit 17ce661
Author: Nikita Manovich <[email protected]>
Date:   Mon Feb 4 19:57:51 2019 +0300

    TaskDataSerializer is in progress.

commit 51eca12
Author: Nikita Manovich <[email protected]>
Date:   Mon Feb 4 15:11:48 2019 +0300

    Make most of all custom routers were implemented as actions.

commit 55effe1
Author: Nikita Manovich <[email protected]>
Date:   Mon Feb 4 13:15:35 2019 +0300

    Implemented documentation for REST API: /api/docs/

commit 2f32ed0
Merge: 6e7ea98 46d2120
Author: Nikita Manovich <[email protected]>
Date:   Mon Feb 4 11:32:05 2019 +0300

    Merge remote-tracking branch 'origin/develop' into restapi

commit 6e7ea98
Author: Nikita Manovich <[email protected]>
Date:   Fri Feb 1 23:45:57 2019 +0300

    Used ModelViewSets instead of GeneralViews.

commit 4feb191
Author: Nikita Manovich <[email protected]>
Date:   Fri Feb 1 18:55:55 2019 +0300

    Got idea to separate FileUpload and Json part.

    https://www.trell.se/blog/file-uploads-json-apis-django-rest-framework/

commit 5f27325
Author: Nikita Manovich <[email protected]>
Date:   Fri Feb 1 14:39:29 2019 +0300

    Send POST request from create an annotation task.

commit 205186d
Author: Nikita Manovich <[email protected]>
Date:   Thu Jan 31 23:42:37 2019 +0300

    Minor fixes.

commit 6902545
Author: Nikita Manovich <[email protected]>
Date:   Thu Jan 31 19:36:37 2019 +0300

    Implemented GET tasks/ID/status and POST tasks/ is in progress.

commit 2262597
Author: Nikita Manovich <[email protected]>
Date:   Thu Jan 31 14:33:09 2019 +0300

    Improved POST for api/v1/tasks

commit 13fada7
Author: Nikita Manovich <[email protected]>
Date:   Thu Jan 31 11:21:33 2019 +0300

    Improved launch file for vscode.

    Removed --nothreading due to https://code.google.com/p/chromium-os/issues/detail?id=13043
    See https://code.visualstudio.com/docs/python/tutorial-django for more
    details.

commit 8ab75d6
Author: Nikita Manovich <[email protected]>
Date:   Wed Jan 30 23:44:34 2019 +0300

    Added remote/client/server files field.

commit 20bad7a
Author: Nikita Manovich <[email protected]>
Date:   Wed Jan 30 19:32:49 2019 +0300

    Implementation of create/task is in progress.

commit 0169ac3
Merge: 09431f3 746cffb
Author: Nikita Manovich <[email protected]>
Date:   Wed Jan 30 16:01:19 2019 +0300

    Merge remote-tracking branch 'origin/develop' into restapi

commit 09431f3
Author: Nikita Manovich <[email protected]>
Date:   Mon Jan 28 19:55:54 2019 +0300

    Replaced get/job and save/status by new REST API.

commit a66073c
Author: Nikita Manovich <[email protected]>
Date:   Mon Jan 28 18:53:28 2019 +0300

    Replaced /get/job by /api/v1/jobs/1

commit 6ca3c6f
Author: Nikita Manovich <[email protected]>
Date:   Mon Jan 28 16:25:47 2019 +0300

    Replaced get/task/ID by api/v1/tasks/ID

commit fdd99ad
Author: Nikita Manovich <[email protected]>
Date:   Fri Jan 25 16:11:26 2019 +0300

    Implemented REST_API_PREFIX + 'tasks/<int:pk>/frames/meta'

commit 8700940
Author: Nikita Manovich <[email protected]>
Date:   Fri Jan 25 12:18:30 2019 +0300

    Added segment_size field to Task model.

commit e6bbe22
Author: Nikita Manovich <[email protected]>
Date:   Fri Jan 25 10:44:13 2019 +0300

    REST API for get/username

    Replaced by /api/v1/users/self

commit e3a049b
Author: Nikita Manovich <[email protected]>
Date:   Fri Jan 25 10:37:40 2019 +0300

    REST API for 'get/task/<int:pk>/frame/<int:frame>'

    Replaced by REST_API_PREFIX + 'tasks/<int:pk>/frames/<int:frame>'

commit b1d0867
Author: Nikita Manovich <[email protected]>
Date:   Thu Jan 24 23:25:35 2019 +0300

    Slightly improve serializers.

commit 056e4c4
Author: Nikita Manovich <[email protected]>
Date:   Thu Jan 24 19:26:31 2019 +0300

    Continued, added urls, labels and attributes for tasks.

commit 0b8c000
Merge: 7b8b9f8 062d145
Author: Nikita Manovich <[email protected]>
Date:   Thu Jan 24 16:30:34 2019 +0300

    Merge remote-tracking branch 'origin/develop' into restapi

commit 7b8b9f8
Author: Nikita Manovich <[email protected]>
Date:   Wed Jan 23 18:43:20 2019 +0300

    Added cvat.utils with get_version implementation

commit a2dc274
Author: Nikita Manovich <[email protected]>
Date:   Wed Jan 23 18:31:44 2019 +0300

    Implemented more end points for REST API

commit 1b97f3c
Author: Nikita Manovich <[email protected]>
Date:   Wed Jan 23 13:07:51 2019 +0300

    Implemented a couple of rest methods.

    users/self
    users/
    users/<int:pk>
    tasks/<int:pk>/frames/<int:frame>
    exceptions/

commit 0ca1ef4
Merge: dbe5356 5802b91
Author: Nikita Manovich <[email protected]>
Date:   Tue Jan 22 12:42:05 2019 +0300

    Merge remote-tracking branch 'origin/develop' into restapi

commit dbe5356
Merge: 7af7452 45cc8a4
Author: Nikita Manovich <[email protected]>
Date:   Sat Jan 19 22:20:08 2019 +0300

    Merge branch 'restapi' of https://github.com/opencv/cvat into restapi

commit 7af7452
Merge: 18b6ffb 4b36f14
Author: Nikita Manovich <[email protected]>
Date:   Sat Jan 19 21:46:18 2019 +0300

    Merge remote-tracking branch 'origin/develop' into restapi

commit 45cc8a4
Author: Nikita Manovich <[email protected]>
Date:   Tue Jan 15 18:46:46 2019 +0300

    REST API implementation is in progress.

commit 62976e4
Author: Nikita Manovich <[email protected]>
Date:   Tue Jan 15 13:57:52 2019 +0300

    Update REST API.

commit 18b6ffb
Author: Nikita Manovich <[email protected]>
Date:   Mon Jan 14 22:26:03 2019 +0300

    Improve settings for Django REST API.

commit 326fc98
Author: Nikita Manovich <[email protected]>
Date:   Mon Jan 14 21:55:47 2019 +0300

    Added previous for REST API

commit 0a89c9b
Author: Nikita Manovich <[email protected]>
Date:   Mon Jan 14 21:43:16 2019 +0300

    initial REST API
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants