Commit 39a9aa00 authored by Mickaël Desfrênes's avatar Mickaël Desfrênes
Browse files

better hls encoding, vue-jama3 upgrade

parent c4612ce4

src/jama/__init__.py

+1 −1
Original line number Diff line number Diff line 
__version__ = "0.1.69"
 
__version__ = "0.1.72"

src/resources/helpers.py

+5 −5
Original line number Diff line number Diff line
@@ -195,9 +195,9 @@ def make_hls(f: Union[models.File, int], force: bool = False): 
                "-filter_complex",

                (

                    "[0:v]split=3[v1][v2][v3];"

                    "[v1]scale=w=1920:h=1080[v1out];"

                    "[v2]scale=w=1280:h=720[v2out];"

                    "[v3]scale=w=854:h=480[v3out]"

                    "[v1]scale=1920:1080:force_original_aspect_ratio=decrease,pad=1920:1080:(ow-iw)/2:(oh-ih)/2:black[v1out];"

                    "[v2]scale=1280:720:force_original_aspect_ratio=decrease,pad=1280:720:(ow-iw)/2:(oh-ih)/2:black[v2out];"

                    "[v3]scale=854:480:force_original_aspect_ratio=decrease,pad=854:480:(ow-iw)/2:(oh-ih)/2:black[v3out]"

                ),

                # Video streams

                # video 1
@@ -271,7 +271,7 @@ def make_hls(f: Union[models.File, int], force: bool = False): 
                "-f",

                "hls",

                "-hls_time",

                "10",

                "3",

                "-hls_playlist_type",

                "vod",

                "-hls_flags",
@@ -288,7 +288,7 @@ def make_hls(f: Union[models.File, int], force: bool = False): 
                f"{hls_destination_dir}stream_%v{os.path.sep}playlist.m3u8",

            ]



            subprocess.run(ffmpeg_cmd, check=False)

            subprocess.run(ffmpeg_cmd, check=True)





def make_iiif(f: Union[models.File, int], force: bool = False):

src/ui/front/package.json

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
    "preview": "vite preview"

  },

  "dependencies": {

    "@pdn-certic/vue3-jama": "^0.7.0",

    "@pdn-certic/vue3-jama": "^0.7.1",

    "vue": "^3.5.25"

  },

  "devDependencies": {

src/ui/front/yarn.lock

+4 −4
Original line number Diff line number Diff line
@@ -299,10 +299,10 @@ 
  resolved "https://registry.yarnpkg.com/@mdi/font/-/font-7.4.47.tgz#2ae522867da3a5c88b738d54b403eb91471903af"

  integrity sha512-43MtGpd585SNzHZPcYowu/84Vz2a2g31TvPMTm9uTiCSWzaheQySUcSyUH/46fPnuPQWof2yd0pGBtzee/IQWw==



"@pdn-certic/vue3-jama@^0.7.0":

  version "0.7.0"

  resolved "https://git.unicaen.fr/api/v4/projects/855/packages/npm/@pdn-certic/vue3-jama/-/@pdn-certic/vue3-jama-0.7.0.tgz#1f53313b6a43b5183598360ba22f5caf1619e9d8"

  integrity sha1-H1MxO2pDtRg1mDYLoi9crxYZ6dg=

"@pdn-certic/vue3-jama@^0.7.1":

  version "0.7.1"

  resolved "https://git.unicaen.fr/api/v4/projects/855/packages/npm/@pdn-certic/vue3-jama/-/@pdn-certic/vue3-jama-0.7.1.tgz#baddc7332aab7a2bca3308e763b11443c8496825"

  integrity sha1-ut3HMyqreivKMwjnY7EUQ8hJaCU=

  dependencies:

    "@certic/certic-ouai" "0.0.26"

    "@mdi/font" "^7.4.47"