Upgrade ffmpeg #1246

FBrosset · 2025-01-09T14:21:04Z

Remplacement de vsync par -fps_mode passthrough dans les fichiers main/configuration.json
et modifs demandées dans le backlog sur le fichier /pod/video_encode_transcript/encoding_studio.py

* Upgrade securtity dependances * Remove deprecated django-tagging * Add new django-tagulous * Elasticsearch default version is Now 8 (remove compatibility with ES 6) * Replace deprecated ugettext_lazy by gettext_lazy * Add some temporary deprecations Hacks for cas-client & Chunked-upload * Replace deprecated url() by re_path() * Disable all Pods apps by default * Correct error handling for ElasticSearch

# Conflicts: # pod/settings.py

* Replace some re_path() by path() * Replace remaining ugettext by gettext * Replace admin.site.register() call by @admin.register decorator * Replace HTTP_X_REQUESTED_WITH by `headers={"x-requested-with"` * Replace request.META by headers * Replace `assertQuerysetEqual` by `assertQuerySetEqual` * Replace force_text by force_str * Remove default_app_config in __init__.py

…select2 CSS calls) * Correct Enrichment form validation process

* Replace Django 3.2 by 4.2 in all links

# Conflicts: # pod/settings.py

…ated

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

* Disable Shib Middleware tests as it seems deprecated

+ remove some ES deprecations

+ Store tag list in CACHE + add a reindex_videos script to recreate ES video index

+ pod_main action now use ES 8

… pod_V4

…ionalError: database table is locked"

…lity

…en/dev/releases/4.2.17 )

Badatos · 2025-01-09T14:24:33Z

pod/main/configuration.json

@@ -4230,7 +4230,7 @@
                            "pod_version_init": "3.1.0"
                        },
                        "FFMPEG_MP4_ENCODE": {
-                            "default_value": "-map 0:v:0 %(map_audio)s -c:v %(libx)s -vf \"scale=-2:%(height)s\" -preset %(preset)s -profile:v %(profile)s -pix_fmt yuv420p -level %(level)s -crf %(crf)s -maxrate %(maxrate)s -bufsize %(bufsize)s -sc_threshold 0 -force_key_frames \"expr:gte(t,n_forced*1)\" -max_muxing_queue_size 4000 -c:a aac -ar 48000 -b:a %(ba)s -movflags faststart -y -vsync 0 \"%(output)s\"",
+                            "default_value": "-map 0:v:0 %(map_audio)s -c:v %(libx)s -vf \"scale=-2:%(height)s\" -preset %(preset)s -profile:v %(profile)s -pix_fmt yuv420p -level %(level)s -crf %(crf)s -maxrate %(maxrate)s -bufsize %(bufsize)s -sc_threshold 0 -force_key_frames \"expr:gte(t,n_forced*1)\" -max_muxing_queue_size 4000 -c:a aac -ar 48000 -b:a %(ba)s -movflags faststart -y -fps_mode passthrough \"%(output)s\"",
                            "description": {


Juste pour comprendre, ca signifie que vsync 0 et vsync vfr étaient équivalents ?

non voilà l'explication de notre ami ChatGPT

-vsync 0 : Pour préserver exactement les horodatages d'entrée dans la sortie, utile dans les scénarios de remuxage ou d'encodage spécifique.
-vsync vfr : Lors de l'encodage pour des fréquences d'images variables ou si la chronologie des images d'entrée doit être respectée, mais la sortie ne nécessite pas des intervalles d'images fixes.

du coup, est-ce judicieux de remplacer "vsync 0" et "vsync vfr" par "fps_mode passthrough", ou y aurait-t-il un autre fps_mode plus adapté ?

Badatos · 2025-01-09T14:25:32Z

pod/video_encode_transcript/encoding_studio.py

-            + '"[0:v]scale=-2:%(height)s[pres];[1:v]scale=-2:%(sh)s[pip];'
+            + '"[0:v]bwdif=mode=send_field:parity=auto:deint=all[presdeint];'
+            + '[1:v]bwdif=mode=send_field:parity=auto:deint=all[pipdeint];'
+            + '[presdeint]scale=-2:%(height)s[pres];[pipdeint]scale=-2:%(sh)s[pip];'


Ca fait beaucoup de lignes en plus ^^. Tu saurais expliquer à un néophite le changement ?

J'ai seulement suivi les propositions issues du Backlog. Je ne suis pas un spécialiste sur ffmpeg mais je peux creuser.

Si tu peux creuser ce serait pas mal merci. Je suis pas fan de pousser des modifs si personne ne sait ce qu'elle font ^^.

Tu sais qui est à l'origine de ces modifs ?

C'est Ulysseus, mais il me semble qu'il me disait avoir juste fait du "bidouillage" sur FFMPEG, c'est pourquoi j'ai préféré le confier à une personne s'y connaissant un minimum en encodage ^^.

Badatos

Merci pour cette PR 🙏
Quelques remarques :

Badatos · 2025-01-09T14:29:17Z

pod/video_encode_transcript/encoding_settings.py

Je pense qu'il faudrait aussi remplacer les "vsync" qu'on trouve dans "FFMPEG_CREATE_THUMBNAIL", "FFMPEG_CREATE_OVERVIEW" et "FFMPEG_DRESSING_OUTPUT" dans ce fichier

Ok je vais regarder.

Badatos · 2025-01-09T14:33:51Z

pod/video_encode_transcript/encoding_studio.py

@@ -94,9 +94,11 @@ def get_sub_cmd(height_presentation_video, height_presenter_video, presenter):
        # -vsync 0 outputVideo.mp4


Il reste encore un subcmd = " -vsync 0 " (ligne 75)
et ptet en profiter pour virer les commentaires lignes 91-94 et 108-111 ?

Badatos and others added 30 commits October 24, 2024 12:10

Merge branch 'develop' into pod_V4

e50187e

# Conflicts: # pod/settings.py

Remove USE_L10N from test_settings

af15471

Merge branch 'develop' into pod_V4

7c01d4b

* Correct video_edit slect2 display with tagulous (remove duplicated …

a721a03

…select2 CSS calls) * Correct Enrichment form validation process

* Remove Python 3.8 from compatible py versions, and add 3.12

4deb722

* Replace Django 3.2 by 4.2 in all links

Merge branch 'develop' into pod_V4

b2975a6

# Conflicts: # pod/settings.py

Upgrade dependencies

645b930

several corrections for 4.0. Prepare to say goodbye to CKEditor

7c5d362

correct video/models.py

917a006

Remove Compatibility with ES 6

9a4ab7f

Replace js_asset by django.templatetags.static, as js_asset is deprec…

097edab

…ated

Fix code scanning alert no. 81: URL redirection from remote source

151af7c

Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>

Improve security in pod playlists, as suggested by CodeQL

ccfebc3

Disable some video_tags functions

5941015

Flake8 compliance

bf7dc21

Disable Debug in test_settings

cb32056

only add debug toolbar when not in testing mode

c9de8e1

Add title_en to sample videos.json

d28b3dc

Reset ES-INDEX for tests as "Pod"

6bd0164

Use Elasticsearch 7 in github workflows

3c17c09

set Video tags as "not required" + correct bug on video tags indexing

b54952b

Adapt Video views and video-info to Tagulous

fd9fbaa

adapt video get_json_to_index() function to Tagulous

bf5cabd

Adapt Video Recorder to Tagulous

92ac5b2

Only do dressing tests when `USE_DRESSING==True

cecec76

* Only run cut tests when USE_CUT==True

f7d1a21

* Disable Shib Middleware tests as it seems deprecated

Merge branch 'develop' into pod_V4

44a9a5b

+ Upgrade all py packages

dfd0662

+ remove some ES deprecations

Badatos and others added 25 commits December 3, 2024 09:30

replace "order" by "date_added" in channel video sorting

e6ed3f7

Display a tag cloud with tags assigned to videos

abd6cdc

+ Store tag list in CACHE + add a reindex_videos script to recreate ES video index

apply GH actions "pod_dev" and "code_formatting" on pod_V4 branch

4698507

+ pod_main action now use ES 8

Fixup. Format code with Prettier

2501b45

Fixup. Format code with Black

a18ea13

Auto-update configuration files

76e6191

Merge branch 'main' into pod_V4

7b58f99

Bump ELASTICSEARCH_TAG to 8.16.1

c2d1011

Change elastic-github-actions to master to avoid ES 8 issue

b5fc92a

Set ES_VERSION=8 in settings_local_docker

92fa056

Fixup. Format code with Black

4853cdd

test ES with CURL after create_pod_index

12d0c3f

Merge branch 'pod_V4' of https://github.com/EsupPortail/Esup-Pod into…

e62575b

… pod_V4

test with es1:9200 url

68d7f5f

Return to elasticsearch.localhost url

3216702

add --insecure to curl command

6eeedd4

Disable elastic-github-actions security

8cfc848

replace https by http in curl

50c5437

increase sqlite timeout in test settings to have less "sqlite3.Operat…

7343fa0

…ionalError: database table is locked"

Replace assertNotEqualsby assertNotEqualfor Python 3.12 compatibi…

5115cb4

…lity

Replace remaining assertEquals by assertEqual

2f928f9

Bump Django to 4.2.17 (fix 2 CVE, see https://docs.djangoproject.com/…

ec9addf

…en/dev/releases/4.2.17 )

Update encoding_studio.py

aa648f0

Update encoding_settings.py

ec3c779

Update configuration.json

5d2944f

Badatos assigned FBrosset Jan 9, 2025

Badatos reviewed Jan 9, 2025

View reviewed changes

Badatos requested changes Jan 9, 2025

View reviewed changes

Badatos changed the base branch from pod_V4 to main February 7, 2025 10:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade ffmpeg #1246

Upgrade ffmpeg #1246

FBrosset commented Jan 9, 2025

Badatos Jan 9, 2025

FBrosset Jan 13, 2025

Badatos Jan 13, 2025

Badatos Jan 9, 2025

FBrosset Jan 13, 2025

Badatos Jan 13, 2025

FBrosset Jan 13, 2025

Badatos Jan 13, 2025

Badatos left a comment

Badatos Jan 9, 2025

FBrosset Jan 13, 2025

Badatos Jan 9, 2025

		@@ -94,9 +94,11 @@ def get_sub_cmd(height_presentation_video, height_presenter_video, presenter):
		# -vsync 0 outputVideo.mp4

Upgrade ffmpeg #1246

Are you sure you want to change the base?

Upgrade ffmpeg #1246

Conversation

FBrosset commented Jan 9, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Badatos left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment