py-tgcalls 2.0.2__py3-none-any.whl → 2.0.3b1__py3-none-any.whl

{py_tgcalls-2.0.2.dist-info → py_tgcalls-2.0.3b1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-tgcalls
-Version: 2.0.2
+Version: 2.0.3b1
 Summary: Async client API for the Telegram Calls.
 Author-email: Laky-64 <iraci.matteo@gmail.com>
 License: GNU LESSER GENERAL PUBLIC LICENSE
@@ -187,7 +187,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp >=3.9.3
-Requires-Dist: ntgcalls >=1.2.0
+Requires-Dist: ntgcalls >=1.2.1
 Requires-Dist: psutil
 Requires-Dist: screeninfo
 Requires-Dist: deprecation

{py_tgcalls-2.0.2.dist-info → py_tgcalls-2.0.3b1.dist-info}/RECORD

@@ -1,8 +1,8 @@
 pytgcalls/__init__.py,sha256=TfZGf1enqqs50mBB406vygB6zYgn3vAjBYFUDO4Pviw,248
-pytgcalls/__version__.py,sha256=kumiGImhzOTlTrRM-6jDo2mNnVHGO_2vxtrhB0nzAiw,22
+pytgcalls/__version__.py,sha256=Dad7olVOHlrvQf3XgEEUbhKmJE563n_WQb074VssEMU,24
 pytgcalls/environment.py,sha256=ctCHACvG6l8SdpPewSBhOvc70kbwpv18maC0TwLvZ08,1924
 pytgcalls/exceptions.py,sha256=0MmAktc53ajYAc7ThjD2tJ9PDyibUi0iHZMfUy2IoKs,4109
-pytgcalls/ffmpeg.py,sha256=sut7ssGcvprC3NWFpCfyguyNKAXaeM0mv3lXSvDPRpM,8518
+pytgcalls/ffmpeg.py,sha256=xxtO1fokGjhPG4HDkPx3Qs-T4sXXX0zmuT5E0mU-BJg,8593
 pytgcalls/filters.py,sha256=HFMBBbo_NCw6wqTtseHoDRsspJHQ49BUHBA1cxm7u4g,4852
 pytgcalls/mtproto_required.py,sha256=6B-31p5qH_6oekUgypV4nK3hqPS6Nr-pA8S81wjnbaY,630
 pytgcalls/mutex.py,sha256=Frjji5Ctzlk4AXEBuBLnDK-7HbtreoV6zuyKpFpMNI4,236
@@ -12,7 +12,7 @@ pytgcalls/scaffold.py,sha256=LihXRBl1kSqJSQvEoH5rAXJXrbnnIqSMBYrhXpW5hHs,958
 pytgcalls/statictypes.py,sha256=CdlqgQNhTZ_uTE8-B8m01fJ7TlD2B42EI2QBPxDdAtA,3842
 pytgcalls/sync.py,sha256=IsOH3TD7cxUg_-zdGt12HoS8sBlXvcGayPZAoxxKM48,3396
 pytgcalls/version_manager.py,sha256=egeGgvb66zWlLTMuw2U-b0x8MfnRzMm1xAEVN87HF5c,296
-pytgcalls/ytdlp.py,sha256=VqeWts_jgPJTmcOM5_rckuKEOA0N2FujaBWvX3CyXE0,2196
+pytgcalls/ytdlp.py,sha256=jRA-mKQEXleWvaoGv9wtMa77aRjxsyQxn6_0tXI3-sA,2435
 pytgcalls/custom_api/__init__.py,sha256=ZT8d0lc2YrDuw_YSFAXXHHMewoXGFZ-ANOBIAr0vGFQ,60
 pytgcalls/custom_api/custom_api.py,sha256=Ko3aS6psrwPmOhRPxvG0fepXt4STrA0StvINSxz4Cj8,1890
 pytgcalls/handlers/__init__.py,sha256=pubbxI4pLqQpAKf8-toD6ija4cpSvbCJOQFjTiDjX1E,75
@@ -31,7 +31,7 @@ pytgcalls/methods/decorators/on_update.py,sha256=ZTL4YcQk0N4Ru56a5WItUvkSN5SAqr6
 pytgcalls/methods/stream/__init__.py,sha256=_4j-CEby4_2Kadva86tFMC4GSSzhBBjKLXfrgTk4gzo,343
 pytgcalls/methods/stream/mute_stream.py,sha256=auo2aAazfEC90Ab6MzaiPdddiJ1w4fN_9HaORkAeOBY,570
 pytgcalls/methods/stream/pause_stream.py,sha256=z_AIWABrQMHmTwvlah_PrH9EjXbro8gKxZni4Km5ICg,573
-pytgcalls/methods/stream/play.py,sha256=wU4WKEp4cMfJPVDW-aug69HrzXrMJHCKkqrv-pCxQkg,7307
+pytgcalls/methods/stream/play.py,sha256=38eWJSXFYgq7VRm4AH6e1NJfe6nYTyJ71PbK3mFijHs,7280
 pytgcalls/methods/stream/played_time.py,sha256=IkUdyHrqpzpRl9uf0uZhg1COo4zsHnQOPu3nipjVatI,570
 pytgcalls/methods/stream/resume_stream.py,sha256=z_DgP4cDExjEqEeX_ZL--50MXQ9lrATK876SIwE71PQ,576
 pytgcalls/methods/stream/unmute_stream.py,sha256=KUMhfMbhsPmZsmpF4cGWC1FVW7YwXha2MmQnqrBhM8s,576
@@ -78,16 +78,16 @@ pytgcalls/types/raw/__init__.py,sha256=ROHsKFeUMUtlFbx2rhfrdB-TuVm0zBuvNo29Ccn56
 pytgcalls/types/raw/audio_parameters.py,sha256=1DsBPwdn_Ukd2Tbkb3whP_ILo9xJY_3XNNmbO4_NO9Q,449
 pytgcalls/types/raw/audio_stream.py,sha256=wEMa93hHt0VBUSuS6gPJlFIGZp5GdNU94O2C2u4AXnY,476
 pytgcalls/types/raw/stream.py,sha256=jCvFUSAdHupqMqfG1E36CgKijKoy0o2LUbgcVjj5Mz0,491
-pytgcalls/types/raw/video_parameters.py,sha256=LXBpdaw5vyNayVfgtmF-gRkCY_ATwAnunRDs75FQJTw,545
+pytgcalls/types/raw/video_parameters.py,sha256=9TeZhg2jTayr5U3ttBgLKg1mfyT7OC8RbqLqinzlM4k,628
 pytgcalls/types/raw/video_stream.py,sha256=2Chrk7NFWF1H9V7hH71RZ5rF3iBhT53syFkHKw4-5gc,433
 pytgcalls/types/stream/__init__.py,sha256=xfF-9ZulOLk3E6G1nw1Ky0ZRWXlFuER0Uj8HQn3650w,338
 pytgcalls/types/stream/audio_quality.py,sha256=4X94ErmTeLP4TVcE3eLtPPdtluSPxgxbgTosuNJOVhc,141
-pytgcalls/types/stream/media_stream.py,sha256=ZtREk2bjrBRnyKWdJWgxCa8z_NX7Oa02wUITcoI80m8,8860
+pytgcalls/types/stream/media_stream.py,sha256=opMsQX7_XcUGrp_1b1xcYsojej8WSSdPpMB-RzVGclI,8926
 pytgcalls/types/stream/stream_audio_ended.py,sha256=2_EFa98F0vWu0d0jBmLtzp4NH_xBkDO_6yP9UtyKuCs,164
 pytgcalls/types/stream/stream_video_ended.py,sha256=9YFTTZPMDpB95eb815rGtgDrzBGfTeazJ5mZwP6Hvks,164
 pytgcalls/types/stream/video_quality.py,sha256=HBfWq005kh-D19MaVE9VzVdnODzrXf4IJUimCfslfiU,231
-py_tgcalls-2.0.2.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-py_tgcalls-2.0.2.dist-info/METADATA,sha256=0Fmju1o3_K53gft3sMZpLHnaPKlK6c4ioF660I5SYkM,14357
-py_tgcalls-2.0.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-py_tgcalls-2.0.2.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
-py_tgcalls-2.0.2.dist-info/RECORD,,
+py_tgcalls-2.0.3b1.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+py_tgcalls-2.0.3b1.dist-info/METADATA,sha256=7wW6XiNXXjOQyDi1ZaJcMk5hEMOqgstlS4fFsfsRN48,14359
+py_tgcalls-2.0.3b1.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+py_tgcalls-2.0.3b1.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
+py_tgcalls-2.0.3b1.dist-info/RECORD,,

{py_tgcalls-2.0.2.dist-info → py_tgcalls-2.0.3b1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.43.0)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

pytgcalls/__version__.py

@@ -1 +1 @@
-__version__ = '2.0.2'
+__version__ = '2.0.3b1'

pytgcalls/ffmpeg.py

@@ -95,7 +95,10 @@ async def check_stream(
         new_w = min(original_width, stream_parameters.width)
         new_h = int(new_w / ratio)
 
-        if new_h > stream_parameters.height:
+        if (
+            new_h > stream_parameters.height and
+            not stream_parameters.ratio_adjust
+        ):
             new_h = stream_parameters.height
             new_w = int(new_h * ratio)
 

pytgcalls/methods/stream/play.py

@@ -52,7 +52,7 @@ class Play(Scaffold):
             try:
                 return await self._binding.change_stream(
                     chat_id,
-                    await StreamParams.get_stream_params(stream),
+                    media_description,
                 )
             except FileError as e:
                 raise FileNotFoundError(e)

pytgcalls/types/raw/video_parameters.py

@@ -10,6 +10,7 @@ class VideoParameters(PyObject):
         width: int = 640,
         height: int = 360,
         frame_rate: int = 20,
+        ratio_adjust: bool = False,
     ):
         max_w, max_h, max_fps = max(
             VideoQuality, key=lambda x: x.value[0],
@@ -17,3 +18,4 @@ class VideoParameters(PyObject):
         self.width: int = min(width, max_w)
         self.height: int = min(height, max_h)
         self.frame_rate: int = min(frame_rate, max_fps)
+        self.ratio_adjust: bool = ratio_adjust

pytgcalls/types/stream/media_stream.py

@@ -62,7 +62,10 @@ class MediaStream(Stream):
         if isinstance(video_parameters, VideoParameters):
             self._video_parameters = video_parameters
         elif isinstance(video_parameters, VideoQuality):
-            self._video_parameters = VideoParameters(*video_parameters.value)
+            self._video_parameters = VideoParameters(
+                *video_parameters.value,
+                ratio_adjust=True,
+            )
 
         self._media_path: Optional[str] = None
         self._audio_path: Optional[str] = None

pytgcalls/ytdlp.py

@@ -1,4 +1,5 @@
 import asyncio
+import logging
 import re
 import shlex
 from typing import Optional
@@ -8,6 +9,8 @@ from .exceptions import YtDlpError
 from .ffmpeg import cleanup_commands
 from .types.raw import VideoParameters
 
+py_logger = logging.getLogger('pytgcalls')
+
 
 class YtDlp:
     YOUTUBE_REGX = re.compile(
@@ -34,8 +37,10 @@ class YtDlp:
             'yt-dlp',
             '-g',
             '-f',
-            f'best[width<=?{video_parameters.width}]'
-            f'[height<=?{video_parameters.height}]',
+            'bestvideo[vcodec~=\'(vp09|avc1)\']+m4a/best',
+            '-S',
+            'res:'
+            f'{min(video_parameters.width, video_parameters.height)}',
             '--no-warnings',
         ]
 
@@ -52,6 +57,10 @@ class YtDlp:
 
         commands.append(link)
 
+        py_logger.log(
+            logging.DEBUG,
+            f'Running with "{" ".join(commands)}" command',
+        )
         try:
             proc = await asyncio.create_subprocess_exec(
                 *commands,