Skip to content

Commit

Permalink
Merge branch 'main' into m64279_isobmff_nalu
Browse files Browse the repository at this point in the history
  • Loading branch information
DenizUgur authored Nov 8, 2024
2 parents 371b54b + 3699435 commit 2c2a84c
Show file tree
Hide file tree
Showing 130 changed files with 75,315 additions and 13 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/post-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ on:
branches:
- main

permissions:
pull-requests: write
contents: write

jobs:
move:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -42,3 +46,4 @@ jobs:
This PR moves the conformance files submitted in #${{ github.event.number }} from under consideration to published.
branch: move-files-${{ github.event.pull_request.head.ref }}
delete-branch: true
draft: always-true
1 change: 1 addition & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
- synchronize
- reopened
- labeled
- ready_for_review

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand Down
34 changes: 34 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,40 @@
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"json.schemas": [
{
"fileMatch": ["data/file_features/**/*_gpac.ext.json"],
"url": "./data/schemas/gpac-extension.schema.json"
},
{
"fileMatch": ["data/file_features/**/*_gpac.json"],
"url": "./data/schemas/gpac.schema.json"
},
{
"fileMatch": [
"data/file_features/**/*.json",
"!data/file_features/**/*_gpac.ext.json",
"!data/file_features/**/*_gpac.json"
],
"url": "./data/schemas/file-metadata.schema.json"
},
{
"fileMatch": ["data/standard_features/**/spec_info.json"],
"url": "./data/schemas/spec-info.schema.json"
},
{
"fileMatch": ["data/standard_features/**/user_defined.json"],
"url": "./data/schemas/user-defined.schema.json"
},
{
"fileMatch": [
"data/standard_features/**/*.json",
"!data/standard_features/**/spec_info.json",
"!data/standard_features/**/user_defined.json"
],
"url": "./data/schemas/standard.schema.json"
}
],
"eslint.workingDirectories": [
{
"directory": "./conformance-search",
Expand Down
14 changes: 14 additions & 0 deletions data/file_features/under_consideration/cenc/audio_cbcs.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"contributor": "Telecom Paris",
"description": "",
"mdms_number": "m56755",
"license": "",
"md5": "cd5b8a0dd0f11ab61cf0b76433101596",
"rel_filepath": "./audio_cbcs.mp4",
"version": 1,
"published": false,
"associated_files": ["./drm_cfg/cbcs.xml"],
"features": [],
"notes": "",
"conforms_to": []
}
3 changes: 3 additions & 0 deletions data/file_features/under_consideration/cenc/audio_cbcs.mp4
Git LFS file not shown
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"contributor": "Telecom Paris",
"description": "",
"mdms_number": "m56755",
"license": "",
"md5": "ca9bca68d33971977c3bec09cb3b874a",
"rel_filepath": "./audio_cbcs_const_iv.mp4",
"version": 1,
"published": false,
"associated_files": ["./drm_cfg/cbcs_const_iv.xml"],
"features": [],
"notes": "",
"conforms_to": []
}
Git LFS file not shown
Loading

0 comments on commit 2c2a84c

Please sign in to comment.