Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/environment-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,5 @@ dependencies:
- smart_open[all]>=6.4.0
- testcontainers>=3.7.1
- mir_eval>=0.7
- moviepy>=2.2.1
- moviepy>=2.2.1
- opencv-python

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mirdata is using MoviePy as a video dependency instead of OpenCV. Please check more details about the comment here from load_video.

3 changes: 0 additions & 3 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,3 @@ Please see :ref:`contributing` for guidelines.
:maxdepth: 1

source/faq



12 changes: 11 additions & 1 deletion docs/source/mirdata.rst
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,14 @@ salami
:inherited-members:


saraga_audiovisual
^^^^^^^^^^^^^^^^^^

.. automodule:: mirdata.datasets.saraga_audiovisual
:members:
:inherited-members:


saraga_carnatic
^^^^^^^^^^^^^^^

Expand Down Expand Up @@ -543,6 +551,8 @@ Annotation Types
:members:
.. autoclass:: mirdata.annotations.F0Data
:members:
.. autoclass:: mirdata.annotations.GestureData
:members:
.. autoclass:: mirdata.annotations.MultiF0Data
:members:
.. autoclass:: mirdata.annotations.NoteData
Expand Down Expand Up @@ -591,4 +601,4 @@ mirdata.download_utils
^^^^^^^^^^^^^^^^^^^^^^

.. automodule:: mirdata.download_utils
:members:
:members:
14 changes: 10 additions & 4 deletions docs/source/quick_reference.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Supported Datasets and Annotations
##################################

Dataset Quick Reference
Dataset Quick Reference
=======================

This table is provided as a guide for users to select appropriate datasets. The
Expand Down Expand Up @@ -51,8 +51,8 @@ types are implemented in Mirdata see :ref:`annotations`.

Events
^^^^^^
A generic annotation to indicate whether a particular event is happening at a given time.
It can be used, for instance, to indicate whether a particular instrument is playing at a
A generic annotation to indicate whether a particular event is happening at a given time.
It can be used, for instance, to indicate whether a particular instrument is playing at a
given time-step or whether a particular note is being played at a given time-step. In fact,
it is implicit in annotations such as F0_ or Vocal Notes_ (instrument is activated when the
melody is non-0). However, some datasets provide it as a standalone event annotation.
Expand Down Expand Up @@ -92,7 +92,7 @@ which may be encoded in a number of formats/granularities, including midi note n

Effect
^^^^^^
Effect applied to a track. It may refer to the effect applied to a single stroke or an entire track.
Effect applied to a track. It may refer to the effect applied to a single stroke or an entire track.
It can include the effect name, the effect type, the effect parameters, and the effect settings.

.. _genre:
Expand All @@ -102,6 +102,12 @@ Genre
A typically global "tag", indicating the genre of a recording. Note that the concept of genre is highly
subjective and we refer those new to this task to this `article`_.

.. _gesture:

Gesture
^^^^^^^
Keypoints and confindence scores of the pose estimation of a musician while playing an instrument.

.. _instruments:

Instruments
Expand Down
35 changes: 28 additions & 7 deletions docs/source/table.rst
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
:target: https://creativecommons.org/licenses/by-nc-sa/4.0

* - .. line-block::

(CompMusic)
Indian Tonic

Expand Down Expand Up @@ -253,9 +254,9 @@
- .. image:: https://licensebuttons.net/l/by-sa/4.0/80x15.png
:target: https://creativecommons.org/licenses/by-sa/4.0

* - .. line-block::
* - .. ::

Freesound One-Shot
Freesound One-Shot
Percussive Sounds

- - audio: ✅
Expand Down Expand Up @@ -392,6 +393,18 @@
- .. image:: https://img.shields.io/badge/License-MIT-blue.svg
:target: https://lbesson.mit-license.org/

* - .. ::

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mind if I ask why this is added again? It's already in line 460


MTG Jamendo
Autotagging Moodtheme

- - audio: ✅
- annotations: ✅
- - moodtheme annotations
- 18448
- .. image:: https://licensebuttons.net/l/by-nc-sa/4.0/80x15.png
:target: https://creativecommons.org/licenses/by-nc-sa/4.0

* - MAESTRO
- - audio: ✅
- annotations: ✅
Expand Down Expand Up @@ -442,9 +455,9 @@
- .. image:: https://licensebuttons.net/l/by/3.0/80x15.png
:target: https://creativecommons.org/licenses/by/3.0/

* - .. line-block::
* - .. ::

MTG Jamendo
MTG Jamendo
Autotagging Moodtheme

- - audio: ✅
Expand Down Expand Up @@ -530,6 +543,14 @@
- .. image:: https://licensebuttons.net/l/zero/1.0/80x15.png
:target: http://creativecommons.org/publicdomain/zero/1.0/

* - Saraga Audiovisual
- - audio: ✅
- annotations: ✅

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is indent error here. It should be same indent as audio above. You can check the error here

- - :ref:`gesture`
- 233
- .. image:: https://licensebuttons.net/l/by-nc-sa/4.0/80x15.png
:target: https://creativecommons.org/licenses/by-nc-sa/4.0

* - Saraga Carnatic
- - audio: ✅
- annotations: ✅
Expand All @@ -556,9 +577,9 @@
- 108
- .. image:: https://licensebuttons.net/l/by-nc-sa/4.0/80x15.png
:target: https://creativecommons.org/licenses/by-nc-sa/4.0
* - .. line-block::

* - .. ::

Saraga Carnatic
Melody Synth (SCMS)

Expand Down
16 changes: 16 additions & 0 deletions mirdata/annotations.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,22 @@ def __init__(
self.confidence = confidence


class GestureData(Annotation):

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: For gesture data (keypoints, scores), can't it be just a Track attribute instead of adding having a separate class for this? or am I missing some context?

"""GestureData Class

Attributes:
keypoints (np.ndarray):
scores (np.ndarray):
"""

def __init__(self, keypoints, scores):
validate_array_like(keypoints, np.ndarray, np.float32)
validate_array_like(scores, np.ndarray, np.float32)

self.keypoints = keypoints
self.scores = scores


class F0Data(Annotation):
"""F0Data class

Expand Down
Loading
Loading