py-tgcalls 2.1.0.dev1__py3-none-any.whl → 2.1.0.dev2__py3-none-any.whl

{py_tgcalls-2.1.0.dev1.dist-info → py_tgcalls-2.1.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: py-tgcalls
-Version: 2.1.0.dev1
+Version: 2.1.0.dev2
 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.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.9.3
-Requires-Dist: ntgcalls<1.4.0,>=1.3.0b1
+Requires-Dist: ntgcalls<1.4.0,>=1.3.0b3
 Requires-Dist: deprecation
 Provides-Extra: hydrogram
 Requires-Dist: hydrogram>=0.1.4; extra == "hydrogram"

{py_tgcalls-2.1.0.dev1.dist-info → py_tgcalls-2.1.0.dev2.dist-info}/RECORD

@@ -1,9 +1,9 @@
 pytgcalls/__init__.py,sha256=qbfwN7rYwIdCegMOzdcbvwazeNjDzgmowgcqLFNqKIM,308
-pytgcalls/__version__.py,sha256=-xsToRR0G_8PEZroy9YUubqvaJO6GE3JysoRHsKVBo0,27
+pytgcalls/__version__.py,sha256=wNJAWxZJ5nqnvr7CcRnjak-Pcnydu3AaK30sXJNnIZU,27
 pytgcalls/environment.py,sha256=ctCHACvG6l8SdpPewSBhOvc70kbwpv18maC0TwLvZ08,1924
 pytgcalls/exceptions.py,sha256=0MmAktc53ajYAc7ThjD2tJ9PDyibUi0iHZMfUy2IoKs,4109
 pytgcalls/ffmpeg.py,sha256=uAqFDPwWoABW_WfubxeulpIh5vWpylxFARgYokn3ff8,8640
-pytgcalls/filters.py,sha256=xAjMGfAnvIU1ZySYrE6OZ3l2KoGPan-4G88hb37Vq2Q,6038
+pytgcalls/filters.py,sha256=dHRXgxhQoLaLsSAsYYaq4jCwVran9sBWBG1txKWIOjY,6039
 pytgcalls/mtproto_required.py,sha256=6B-31p5qH_6oekUgypV4nK3hqPS6Nr-pA8S81wjnbaY,630
 pytgcalls/mutex.py,sha256=Frjji5Ctzlk4AXEBuBLnDK-7HbtreoV6zuyKpFpMNI4,236
 pytgcalls/pytgcalls.py,sha256=oBcWgBwusnXmjHrLEE99VVXARReVyrXdn9SyeBWHbVo,1479
@@ -47,10 +47,10 @@ pytgcalls/methods/utilities/idle.py,sha256=MDdzHTv1ws2yBhsvhBUnssGdghkZ2KwR0HUCP
 pytgcalls/methods/utilities/ping.py,sha256=hhIMSHk2BzMB-IKpwLdZFVrsEvGm2ftJwKLs1k4anh8,244
 pytgcalls/methods/utilities/resolve_chat_id.py,sha256=92x2LHbUlnJMm-kS3fXOYmzYpY2TZbqtQD2rw3eBXDY,382
 pytgcalls/methods/utilities/run.py,sha256=cnYQd2xB5Cr_WS0Q2cXJZPGiN6JOCULzj1r4xXVyrlg,152
-pytgcalls/methods/utilities/start.py,sha256=6opHd0FM1H_FOmIOdVEZaSKBu4ViAd7TxxYy2gegbEY,13279
+pytgcalls/methods/utilities/start.py,sha256=ObY79b_2qxDSAytQEYeHKK4k4JRD2_iyLCPyGyKpH-E,13340
 pytgcalls/methods/utilities/stream_params.py,sha256=g-DmwTY_aYTWhhZ4RDthORQXz_VrhK1JQKPFYmB64II,2992
 pytgcalls/mtproto/__init__.py,sha256=X4zvzFG7km7qHyE0fdvA550WcOVO_xl_p__gvIfDGmw,130
-pytgcalls/mtproto/bridged_client.py,sha256=OAjDlWcuT_VoYn-toD8vRMoXpOibYomlLj4A4SXlmgU,5824
+pytgcalls/mtproto/bridged_client.py,sha256=OlFCV7Xe2a9I0_AAWfrWJciAe1b7WtVocVjl1EsBMyY,5843
 pytgcalls/mtproto/client_cache.py,sha256=Mt0827e_T8DXJHOTkXhkIQUT9EUBWjoLcFcXP1gBnZY,5973
 pytgcalls/mtproto/hydrogram_client.py,sha256=3oMeEQN85yYkjeNA9oMCZvuniLTjdRdP_GJMJiOXfkI,22813
 pytgcalls/mtproto/mtproto_client.py,sha256=3TN2MfFYr8Lfd5AKp_u8G64XHSfCtpy59h4_SACa8G4,7564
@@ -82,18 +82,18 @@ pytgcalls/types/raw/audio_parameters.py,sha256=1DsBPwdn_Ukd2Tbkb3whP_ILo9xJY_3XN
 pytgcalls/types/raw/audio_stream.py,sha256=oN7Sx9oLbNFuNXiGYpoNabMwqWKGquLiHEywef28o7c,488
 pytgcalls/types/raw/stream.py,sha256=xJ3w77ofKFnLIA4cAWIuw2yREpMPvTzIvtei-3xEbJQ,666
 pytgcalls/types/raw/video_parameters.py,sha256=nUl9gkfYTVU0iLNGTtlZ5cZg8K6F7odIi9n8POJXCK4,639
-pytgcalls/types/raw/video_stream.py,sha256=YLjkKrI9neTrVkDOXeWIoeDRTTc_WIwgKUAVUxcs7-I,445
+pytgcalls/types/raw/video_stream.py,sha256=uE3jU9kJsrAoefXtDtEKNqTjcYGaQbZ1gbJ1SfiVWIc,488
 pytgcalls/types/stream/__init__.py,sha256=a-3kNWnp4Vpja_x_Un6misT3VVVllChpeinc3w6Yd1k,457
 pytgcalls/types/stream/audio_quality.py,sha256=4X94ErmTeLP4TVcE3eLtPPdtluSPxgxbgTosuNJOVhc,141
 pytgcalls/types/stream/device.py,sha256=lnWrChNArFl3Sk-DqVEs61K-YXl2rqRAQq6PSPgjBCU,578
 pytgcalls/types/stream/direction.py,sha256=_Q1SNb-47krKuZs7B5dw1mqDhQ9_CTb_Jr96-MAfv28,395
-pytgcalls/types/stream/media_stream.py,sha256=GER8EpTMRrlQcjvK7ON3DtlAXzHavaqgs8J6T9cmf7Y,9164
+pytgcalls/types/stream/media_stream.py,sha256=_gevQrmDJyLxGQCGk9qAfxe7949S8w51X2aF2rNCYM0,10222
 pytgcalls/types/stream/record_stream.py,sha256=FNwreJsEHHn7k_nZYbdnfC7D9-5LyPWNFQVwHYkRzio,2961
 pytgcalls/types/stream/stream_ended.py,sha256=xR_kZwFf03hA6rw_nvI7Be7GwoCKzQf_1MKaGpPDXqY,716
 pytgcalls/types/stream/stream_frame.py,sha256=TMoJUbC2tsMDL1tt4oWCkaMsHoeYKj8dnV6JIs7EoEk,797
 pytgcalls/types/stream/video_quality.py,sha256=HBfWq005kh-D19MaVE9VzVdnODzrXf4IJUimCfslfiU,231
-py_tgcalls-2.1.0.dev1.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-py_tgcalls-2.1.0.dev1.dist-info/METADATA,sha256=gVxB8ePO9ohhiKygAlWLLHRRxrzC9C-6sCs_dgvvOKU,14380
-py_tgcalls-2.1.0.dev1.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-py_tgcalls-2.1.0.dev1.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
-py_tgcalls-2.1.0.dev1.dist-info/RECORD,,
+py_tgcalls-2.1.0.dev2.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+py_tgcalls-2.1.0.dev2.dist-info/METADATA,sha256=x49Taxds_EKwrWUaD8LgzmYaHHVrM5uQ17V_KtsC2hE,14380
+py_tgcalls-2.1.0.dev2.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+py_tgcalls-2.1.0.dev2.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
+py_tgcalls-2.1.0.dev2.dist-info/RECORD,,

pytgcalls/__version__.py

@@ -1 +1 @@
-__version__ = '2.1.0.dev1'
+__version__ = '2.1.0.dev2'

pytgcalls/filters.py

@@ -158,6 +158,7 @@ class stream_end(Filter):
                 )
             )
 
+
 # noinspection PyPep8Naming
 class chat(Filter, set):
     def __init__(

pytgcalls/methods/utilities/start.py

@@ -107,7 +107,7 @@ class Start(Scaffold):
                             )
                         except ConnectionNotFound:
                             pass
-                    else:
+                    elif user_id in self._videos_id:
                         try:
                             await self._binding.remove_incoming_video(
                                 chat_id,
@@ -130,7 +130,7 @@ class Start(Scaffold):
                             )
                         except ConnectionNotFound:
                             pass
-                    else:
+                    elif user_id in self._presentations_id:
                         try:
                             await self._binding.remove_incoming_video(
                                 chat_id,

pytgcalls/mtproto/bridged_client.py

@@ -152,7 +152,7 @@ class BridgedClient(HandlersHolder):
             [
                 SsrcGroup(
                     source_group.semantics,
-                    source_group.sources,
+                    [ssrc for ssrc in source_group.sources],
                 )
                 for source_group in source.source_groups
             ],

pytgcalls/types/raw/video_stream.py

@@ -1,10 +1,11 @@
 from ntgcalls import MediaSource
 
 from ...statictypes import statictypes
+from ..py_object import PyObject
 from .video_parameters import VideoParameters
 
 
-class VideoStream:
+class VideoStream(PyObject):
     @statictypes
     def __init__(
         self,

pytgcalls/types/stream/media_stream.py

@@ -68,31 +68,36 @@ class MediaStream(Stream):
 
         self._media_path: Optional[str] = None
         self._audio_path: Optional[str] = None
+        self._is_media_device: bool = False
+        self._is_audio_device: bool = False
         if isinstance(media_path, str):
             self._media_path = media_path
         elif isinstance(media_path, Path):
             self._media_path = str(media_path)
-        elif isinstance(media_path, InputDevice):
+        elif isinstance(media_path, (InputDevice, ScreenDevice)):
+            print('MediaStream', media_path.is_video)
             if media_path.is_video:
                 self._media_path = media_path.metadata
+                self._is_media_device = True
             else:
                 self._audio_path = media_path.metadata
+                self._is_audio_device = True
 
         if isinstance(audio_path, str):
             self._audio_path = audio_path
         elif isinstance(audio_path, Path):
             self._audio_path = str(audio_path)
-        elif isinstance(audio_path, InputDevice):
+        elif isinstance(audio_path, (InputDevice, ScreenDevice)):
             if audio_path.is_video:
                 raise ValueError('Audio path must be an audio device')
             self._audio_path = audio_path.metadata
+            self._is_audio_device = True
 
         self._audio_flags = self._filter_flags(audio_flags)
         self._video_flags = self._filter_flags(video_flags)
         self._ffmpeg_parameters = ffmpeg_parameters
         self._ytdlp_parameters = ytdlp_parameters
         self._headers = headers
-
         super().__init__(
             microphone=None
             if self._audio_flags & MediaStream.Flags.IGNORE else
@@ -101,7 +106,7 @@ class MediaStream(Stream):
                 self._audio_path,
                 self._audio_parameters,
             )
-            if isinstance(audio_path, InputDevice) else
+            if self._is_audio_device else
             AudioStream(
                 MediaSource.SHELL,
                 ' '.join(
@@ -120,12 +125,12 @@ class MediaStream(Stream):
             camera=None
             if self._video_flags & MediaStream.Flags.IGNORE else
             VideoStream(
-                MediaSource.DESKTOP if isinstance(audio_path, ScreenDevice)
+                MediaSource.DESKTOP if isinstance(media_path, ScreenDevice)
                 else MediaSource.DEVICE,
                 self._media_path,
                 self._video_parameters,
             )
-            if isinstance(audio_path, InputDevice) else
+            if self._is_media_device else
             VideoStream(
                 MediaSource.SHELL,
                 ' '.join(
@@ -145,90 +150,103 @@ class MediaStream(Stream):
 
     async def check_stream(self):
         if not self._video_flags & MediaStream.Flags.IGNORE:
-            if YtDlp.is_valid(self._media_path):
-                links = await YtDlp.extract(
-                    self._media_path,
-                    self._video_parameters,
-                    self._ytdlp_parameters,
-                )
-                self._media_path = links[0]
-                if not self._audio_path:
-                    self._audio_path = links[1]
-            try:
-                image_commands = []
-                live_stream = False
-                try:
-                    await check_stream(
-                        self._ffmpeg_parameters,
+            if self._is_media_device:
+                if not self._media_path:
+                    self.camera = None
+            elif self._media_path:
+                if YtDlp.is_valid(self._media_path):
+                    links = await YtDlp.extract(
                         self._media_path,
                         self._video_parameters,
-                        [],
-                        self._headers,
+                        self._ytdlp_parameters,
                     )
-                except ImageSourceFound:
-                    image_commands = [
-                        '-loop',
-                        '1',
-                        '-framerate',
-                        '1',
-                    ]
-                except LiveStreamFound:
-                    live_stream = True
-                self.camera.path = ' '.join(
-                    build_command(
-                        'ffmpeg',
-                        self._ffmpeg_parameters,
-                        self._media_path,
-                        self._video_parameters,
-                        image_commands,
-                        self._headers,
-                        live_stream,
-                    ),
-                )
-            except NoVideoSourceFound as e:
-                if self._video_flags & MediaStream.Flags.REQUIRED:
-                    raise e
+                    self._media_path = links[0]
+                    if not self._audio_path:
+                        self._audio_path = links[1]
+                try:
+                    image_commands = []
+                    live_stream = False
+                    try:
+                        await check_stream(
+                            self._ffmpeg_parameters,
+                            self._media_path,
+                            self._video_parameters,
+                            [],
+                            self._headers,
+                        )
+                    except ImageSourceFound:
+                        image_commands = [
+                            '-loop',
+                            '1',
+                            '-framerate',
+                            '1',
+                        ]
+                    except LiveStreamFound:
+                        live_stream = True
+                    self.camera.path = ' '.join(
+                        build_command(
+                            'ffmpeg',
+                            self._ffmpeg_parameters,
+                            self._media_path,
+                            self._video_parameters,
+                            image_commands,
+                            self._headers,
+                            live_stream,
+                        ),
+                    )
+                except NoVideoSourceFound as e:
+                    if self._video_flags & MediaStream.Flags.REQUIRED:
+                        raise e
+                    self.camera = None
+            else:
                 self.camera = None
 
-        self._audio_path = self._audio_path \
-            if self._audio_path else self._media_path
+        if not self._is_media_device:
+            self._audio_path = self._audio_path \
+                if self._audio_path else self._media_path
 
         if not self._audio_flags & MediaStream.Flags.IGNORE:
-            if YtDlp.is_valid(self._audio_path):
-                self._audio_path = (
-                    await YtDlp.extract(
-                        self._audio_path,
-                        self._video_parameters,
-                        self._ytdlp_parameters,
-                    )
-                )[1]
+            if self._is_audio_device:
+                if not self._audio_path:
+                    self.microphone = None
+            elif self._audio_path:
+                if YtDlp.is_valid(self._audio_path):
+                    self._audio_path = (
+                        await YtDlp.extract(
+                            self._audio_path,
+                            self._video_parameters,
+                            self._ytdlp_parameters,
+                        )
+                    )[1]
 
-            try:
-                live_stream = False
                 try:
-                    await check_stream(
-                        self._ffmpeg_parameters,
-                        self._audio_path,
-                        self._audio_parameters,
-                        [],
-                        self._headers,
+                    live_stream = False
+                    try:
+                        await check_stream(
+                            self._ffmpeg_parameters,
+                            self._audio_path,
+                            self._audio_parameters,
+                            [],
+                            self._headers,
+                        )
+                    except LiveStreamFound:
+                        live_stream = True
+                    self.microphone.path = ' '.join(
+                        build_command(
+                            'ffmpeg',
+                            self._ffmpeg_parameters,
+                            self._audio_path,
+                            self._audio_parameters,
+                            [],
+                            self._headers,
+                            live_stream,
+                        ),
                     )
-                except LiveStreamFound:
-                    live_stream = True
-                self.microphone.path = ' '.join(
-                    build_command(
-                        'ffmpeg',
-                        self._ffmpeg_parameters,
-                        self._audio_path,
-                        self._audio_parameters,
-                        [],
-                        self._headers,
-                        live_stream,
-                    ),
-                )
-            except NoAudioSourceFound as e:
-                if self._audio_flags & MediaStream.Flags.REQUIRED:
-                    raise e
+                except NoAudioSourceFound as e:
+                    if self._audio_flags & MediaStream.Flags.REQUIRED:
+                        raise e
+                    self.microphone = None
+            else:
                 self.microphone = None
 
     @staticmethod