py-tgcalls 2.1.0rc2__py3-none-any.whl → 2.1.0rc4__py3-none-any.whl

{py_tgcalls-2.1.0rc2.dist-info → py_tgcalls-2.1.0rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: py-tgcalls
-Version: 2.1.0rc2
+Version: 2.1.0rc4
 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.0b10
+Requires-Dist: ntgcalls<1.4.0,>=1.3.0b14
 Requires-Dist: deprecation
 Provides-Extra: pyrogram
 Requires-Dist: pyrogram>=1.2.20; extra == "pyrogram"

{py_tgcalls-2.1.0rc2.dist-info → py_tgcalls-2.1.0rc4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pytgcalls/__init__.py,sha256=qbfwN7rYwIdCegMOzdcbvwazeNjDzgmowgcqLFNqKIM,308
-pytgcalls/__version__.py,sha256=WU7MaPYaL-4qk-Vw8tQb_V5TySok6KjTjFI9Q3dw75k,26
+pytgcalls/__version__.py,sha256=bQyjq0CUvIVmXyMKMECcV2-QIaZZRwtmrdC0uwmXqC4,26
 pytgcalls/environment.py,sha256=ctCHACvG6l8SdpPewSBhOvc70kbwpv18maC0TwLvZ08,1924
 pytgcalls/exceptions.py,sha256=0MmAktc53ajYAc7ThjD2tJ9PDyibUi0iHZMfUy2IoKs,4109
 pytgcalls/ffmpeg.py,sha256=tm6DBxyNfPh3h3an-b2s9x1UyX-cvkCdov9prlXxVZY,8649
@@ -8,7 +8,7 @@ pytgcalls/mtproto_required.py,sha256=6B-31p5qH_6oekUgypV4nK3hqPS6Nr-pA8S81wjnbaY
 pytgcalls/mutex.py,sha256=Frjji5Ctzlk4AXEBuBLnDK-7HbtreoV6zuyKpFpMNI4,236
 pytgcalls/pytgcalls.py,sha256=oBcWgBwusnXmjHrLEE99VVXARReVyrXdn9SyeBWHbVo,1479
 pytgcalls/pytgcalls_session.py,sha256=_BGJWvf7t3mki2DhlEPjh9cypvYuSFkMSxzTsfepwUk,2719
-pytgcalls/scaffold.py,sha256=cOG1_-MtGhBuyJmUXPmThC0VUF65TmdwnMCbgIozJoY,1159
+pytgcalls/scaffold.py,sha256=SwePuT9V8LdOFy0KRlAnRSbsB2zeGQ4fs9ilrq7HZYI,1353
 pytgcalls/statictypes.py,sha256=CdlqgQNhTZ_uTE8-B8m01fJ7TlD2B42EI2QBPxDdAtA,3842
 pytgcalls/sync.py,sha256=IsOH3TD7cxUg_-zdGt12HoS8sBlXvcGayPZAoxxKM48,3396
 pytgcalls/version_manager.py,sha256=egeGgvb66zWlLTMuw2U-b0x8MfnRzMm1xAEVN87HF5c,296
@@ -27,29 +27,32 @@ pytgcalls/methods/__init__.py,sha256=hk1blAT5u_Isemdrg0nqInLsdRzTTZnak5NdAfkBPAk
 pytgcalls/methods/calls/__init__.py,sha256=xg4DZZClEnxwaj-DAq3e8gSR-g-MiYBdUEBth64lSXA,214
 pytgcalls/methods/calls/change_volume_call.py,sha256=viA3yHVxPJ421yE1dfFTh-kNEFTxMlaVFxVjC-PeX-0,719
 pytgcalls/methods/calls/get_participants.py,sha256=gKUAzvha1RpvbtSI_n-GlBQkOONxzibCaCr4aA17Mag,567
-pytgcalls/methods/calls/leave_call.py,sha256=dJg5JWmbTIKQJsCccvea4Ma-SaSKVZcRVRqkmsWOLx8,1376
+pytgcalls/methods/calls/leave_call.py,sha256=ay07za5mNKmXGzmpeU6gJJmHVrLeXRtRmFT4QP94pGA,1475
 pytgcalls/methods/decorators/__init__.py,sha256=TCGaEVZnHjtOwv-3PNfaCVm0kyFhJApUPUNntt6MwyM,78
 pytgcalls/methods/decorators/on_update.py,sha256=ZTL4YcQk0N4Ru56a5WItUvkSN5SAqr6_RDZvXmZMIHs,316
 pytgcalls/methods/stream/__init__.py,sha256=dBx5cqvVyvhqykIuT_2rYCAvIzuPM1J4Hh4sZ083UXU,412
 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=1NiAIKBdSsiighc74EKHQv_Fl_ehWLYgGPq5x62s0sE,10189
-pytgcalls/methods/stream/record.py,sha256=toW1LtgUMiaw-KGe9DnWTRsGYLhoKlG0r8eJphMhGIA,1212
+pytgcalls/methods/stream/play.py,sha256=-Ld5TQWLhU_ktKrb7q1Xrym36UGrWhaenIbjj-3mM3k,7524
+pytgcalls/methods/stream/record.py,sha256=28mFK2azDv6gUziwcj4ybvrYka9P9VXnUXnuAa1aQ5w,1466
 pytgcalls/methods/stream/resume_stream.py,sha256=z_DgP4cDExjEqEeX_ZL--50MXQ9lrATK876SIwE71PQ,576
 pytgcalls/methods/stream/send_frame.py,sha256=Kj9R8OqUM-g7pt-FiWP-US7sCFkH5ciPr9S8v-WPtLg,1062
 pytgcalls/methods/stream/time.py,sha256=5y9TMBf_d6YPLbMcGx3yMZQUZdo8zb5fQb9STsh7R3Y,656
 pytgcalls/methods/stream/unmute_stream.py,sha256=KUMhfMbhsPmZsmpF4cGWC1FVW7YwXha2MmQnqrBhM8s,576
-pytgcalls/methods/utilities/__init__.py,sha256=JcKwqNo6fFXXfuab94fNEraKF1P9fnSSgr0WQDRjF2w,339
+pytgcalls/methods/utilities/__init__.py,sha256=HHAkTQEX_23uwo1fxnCIoE2rLBm7fKSQa52SwBLudTI,522
 pytgcalls/methods/utilities/cache_peer.py,sha256=Ylt0wCCJOoNKf1wZEXjfE8aBZKUIIgdRUFOMTGA5DfE,140
 pytgcalls/methods/utilities/call_holder.py,sha256=MhIbwCG6DROd9_bHGa6aqu-rB0y4sngzPBj82zLtAXU,1068
 pytgcalls/methods/utilities/compose.py,sha256=Nzdv8orMmka5NIBZ1SW1nsqXRzArZl4m6FdZU7syaR4,334
 pytgcalls/methods/utilities/cpu_usage.py,sha256=Mbga4MFCIwuh7WC8sqBbv1Pa6ALcp5AIDyfYMH_Bix4,162
 pytgcalls/methods/utilities/idle.py,sha256=MDdzHTv1ws2yBhsvhBUnssGdghkZ2KwR0HUCPOwV38o,814
+pytgcalls/methods/utilities/join_presentation.py,sha256=HLpVjhDkbMB6mIsCwdaGy-Ct7IaV44fM5-zOQ9M7bLU,1551
+pytgcalls/methods/utilities/log_retries.py,sha256=6nD9J3350t82I0PKzK1pVx3ZaCBHATReiXYMs3PuVhQ,342
 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=b3S3x5GpCL0FTisUysVlkmg_AvJqqSD2bFO_ybn-3tQ,13529
-pytgcalls/methods/utilities/stream_params.py,sha256=WfKffrxMDoDLb8k7CB3n5IuN4wo6PebGEX0rLP3OaLk,2883
+pytgcalls/methods/utilities/start.py,sha256=unc-O5XsUztJY7t7wu40F0uSthgq9YutcXRqcTTzhhA,14393
+pytgcalls/methods/utilities/stream_params.py,sha256=OE673Bt1CiyCBFQGMPtC05zv3nObP3zirrh4OD9USdg,3109
+pytgcalls/methods/utilities/update_sources.py,sha256=ISF6u3rk4IcVrPOEOB-uZUDfnwUp2_y1_2g9GboXpWM,1562
 pytgcalls/mtproto/__init__.py,sha256=X4zvzFG7km7qHyE0fdvA550WcOVO_xl_p__gvIfDGmw,130
 pytgcalls/mtproto/bridged_client.py,sha256=hktnfpfBK7PEL2n7Y0kBZzI7dkLlsdrDwkYliZki8zQ,5915
 pytgcalls/mtproto/client_cache.py,sha256=Mt0827e_T8DXJHOTkXhkIQUT9EUBWjoLcFcXP1gBnZY,5973
@@ -67,11 +70,12 @@ pytgcalls/types/participant_list.py,sha256=LmGjU63MK1v3SS2_4xNbk04OOjmukNdAXYLRn
 pytgcalls/types/py_object.py,sha256=VlazuMP0cFpExKimW8BtWR66LDewnNdQSLC7r_t7JIM,842
 pytgcalls/types/update.py,sha256=wPCzWLhrsScZ3ksRTyt8IuDaaG5YI-ItG_Yw-OqzK2Y,157
 pytgcalls/types/user_agent.py,sha256=sSfeGqUe0v0wqBgdVszNFK0iOC_0Tdyto9CglBXlY4U,1086
-pytgcalls/types/calls/__init__.py,sha256=6O2wp7I3d2YGLNeMgXTRyG37Y6BESafneLdr9n37_4s,346
+pytgcalls/types/calls/__init__.py,sha256=f0zMKm_mwvNsDRPgs8IopuCEefU3V0-kuHAFsTMBoAc,403
 pytgcalls/types/calls/call.py,sha256=n7LW7FRNT2qJzbYC3D312judOlVUuocQ1eW9l9scGCo,546
 pytgcalls/types/calls/call_config.py,sha256=b6P43YTGF2t7E2CyD1mSYPJDUBvYYeHoxB3hSbTVyOY,120
 pytgcalls/types/calls/call_data.py,sha256=-qPj2QhWv32Xs7LyFQY4hiWDqJ21B8VBvdzREK8bDvY,544
 pytgcalls/types/calls/call_protocol.py,sha256=OVIQs1VgdY-DWbZbNr41hjLA4pGQvHx8Rgom1_NhJxQ,408
+pytgcalls/types/calls/call_sources.py,sha256=sBhumPgEaN8uAKjBwb1Zf_Ag0qrceti2mURXqMhBusg,107
 pytgcalls/types/calls/group_call_config.py,sha256=auKH-hZJWj8PhTkyeQ_VK2z9NpNvNC7Scl_IhEUMnQM,353
 pytgcalls/types/calls/raw_call_update.py,sha256=hpNw6HrTW8Z36Lh2HinS-wzprryRtsIxyIFbIfjGgeI,795
 pytgcalls/types/chats/__init__.py,sha256=v8pUp_vbr2kQpyHtAQc80N-YqzmXHe9SbllUsa6njkU,261
@@ -90,13 +94,13 @@ pytgcalls/types/stream/device.py,sha256=EdoDg6lPE7fgoZI04Nr0E9zbIk-iRIBgYYAzVqoC
 pytgcalls/types/stream/direction.py,sha256=gd10wUmpfsqx87kCAPZt6u8pFiPb09WZfHKcMWAZokU,394
 pytgcalls/types/stream/external_media.py,sha256=RiuSX5tZGdNsQZ8LIRk5Lp4Ksv9oTvaccmInJRZYo4M,114
 pytgcalls/types/stream/frame.py,sha256=TXo5HZVHbbaVNBqulMhTqGODXH3bpBVlN_of1rosNUQ,586
-pytgcalls/types/stream/media_stream.py,sha256=sFlP8BMmCjhYp_A8U7XkGV4jbxR7PYsmJiII5Fxs0_A,11971
-pytgcalls/types/stream/record_stream.py,sha256=dE8nLrQaHu-L7G6FbTTwJgMIUy5qwycOwgeYO3ta28A,3035
+pytgcalls/types/stream/media_stream.py,sha256=jNWNJppX2ji4CrHdkF2b6FFLeiS9KKjVDGvcWPmPrvc,11917
+pytgcalls/types/stream/record_stream.py,sha256=VEKB2rSnb4U1EyoPdNteWxJ65feV58EGu5QmDEJiB2E,3037
 pytgcalls/types/stream/stream_ended.py,sha256=xR_kZwFf03hA6rw_nvI7Be7GwoCKzQf_1MKaGpPDXqY,716
 pytgcalls/types/stream/stream_frames.py,sha256=028ZhNV-mN3BGqMlmxusAV1xDQpXRYCeM0WXBZhRUhA,446
 pytgcalls/types/stream/video_quality.py,sha256=HBfWq005kh-D19MaVE9VzVdnODzrXf4IJUimCfslfiU,231
-py_tgcalls-2.1.0rc2.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-py_tgcalls-2.1.0rc2.dist-info/METADATA,sha256=va30-VM4T6aYlTTXnFFrN83jLGFRgo3CBfoefeKXZ6o,14398
-py_tgcalls-2.1.0rc2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-py_tgcalls-2.1.0rc2.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
-py_tgcalls-2.1.0rc2.dist-info/RECORD,,
+py_tgcalls-2.1.0rc4.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+py_tgcalls-2.1.0rc4.dist-info/METADATA,sha256=H6X5VamKCIuV6ApcU3YNwt8ADVD9FIdBKDxO7-VQA6M,14398
+py_tgcalls-2.1.0rc4.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+py_tgcalls-2.1.0rc4.dist-info/top_level.txt,sha256=IUDUwn0KkcbUYZbCe9R5AUb2Ob-lmllNUGQqyeXXd8A,10
+py_tgcalls-2.1.0rc4.dist-info/RECORD,,

pytgcalls/__version__.py

@@ -1 +1 @@
-__version__ = '2.1.0.rc2'
+__version__ = '2.1.0.rc4'

pytgcalls/methods/calls/leave_call.py

@@ -46,3 +46,5 @@ class LeaveCall(Scaffold):
             return
         if chat_id < 0:  # type: ignore
             self._need_unmute.discard(chat_id)
+            self._presentations.discard(chat_id)
+            self._call_sources.pop(chat_id, None)

pytgcalls/methods/stream/play.py

@@ -1,5 +1,6 @@
 import asyncio
 import logging
+from pathlib import Path
 from typing import Optional
 from typing import Union
 
@@ -12,7 +13,7 @@ from ntgcalls import TransportParseException
 from ...exceptions import NoActiveGroupCall
 from ...exceptions import TimedOutAnswer
 from ...exceptions import UnMuteNeeded
-from ...mtproto import BridgedClient
+from ...media_devices.input_device import InputDevice
 from ...mtproto_required import mtproto_required
 from ...mutex import mutex
 from ...scaffold import Scaffold
@@ -34,14 +35,9 @@ class Play(Scaffold):
     async def play(
         self,
         chat_id: Union[int, str],
-        stream: Optional[Stream] = None,
+        stream: Optional[Union[str, Path, InputDevice, Stream]] = None,
         config: Optional[Union[CallConfig, GroupCallConfig]] = None,
     ):
-        def log_retries(r: int):
-            (py_logger.warning if r >= 1 else py_logger.info)(
-                f'Telegram is having some internal server issues. '
-                f'Retrying {r + 1} of 3',
-            )
         chat_id = await self.resolve_chat_id(chat_id)
         is_p2p = chat_id > 0  # type: ignore
         if config is None:
@@ -168,7 +164,7 @@ class Play(Scaffold):
                 except TelegramServerError:
                     if retries == 3 or is_p2p:
                         raise
-                    log_retries(retries)
+                    self._log_retries(retries)
                 except Exception:
                     try:
                         await self._binding.stop(chat_id)
@@ -179,64 +175,11 @@ class Play(Scaffold):
                     self._wait_connect.pop(chat_id, None)
 
             if isinstance(config, GroupCallConfig):
-                if media_description.screen is not None:
-                    for retries in range(4):
-                        try:
-                            self._wait_connect[
-                                chat_id
-                            ] = self.loop.create_future()
-                            payload = await self._binding.init_presentation(
-                                chat_id,
-                            )
-                            result_params = await self._app.join_presentation(
-                                chat_id,
-                                payload,
-                            )
-                            await self._binding.connect(
-                                chat_id,
-                                result_params,
-                                True,
-                            )
-                            await self._wait_connect[chat_id]
-                            self._presentations.add(chat_id)
-                        except TelegramServerError:
-                            if retries == 3:
-                                raise
-                            log_retries(retries)
-                        finally:
-                            self._wait_connect.pop(chat_id, None)
-                elif chat_id in self._presentations:
-                    await self._binding.stop_presentation(chat_id)
-                    await self._app.leave_presentation(chat_id)
-                    self._presentations.discard(chat_id)
-
-            if isinstance(config, GroupCallConfig):
-                participants = await self._app.get_group_call_participants(
+                await self._join_presentation(
                     chat_id,
+                    media_description.screen is not None,
                 )
-                for x in participants:
-                    if x.video_info is not None:
-                        self._videos_id[
-                            chat_id
-                        ] = x.video_info.endpoint
-                        self._binding.add_incoming_video(
-                            chat_id,
-                            x.video_info.endpoint,
-                            x.video_info.sources,
-                        )
-                    if x.presentation_info is not None:
-                        self._presentations_id[
-                            chat_id
-                        ] = x.presentation_info.endpoint
-                        self._binding.add_incoming_video(
-                            chat_id,
-                            x.presentation_info.endpoint,
-                            x.presentation_info.sources,
-                        )
-                    if x.user_id == BridgedClient.chat_id(
-                        self._cache_local_peer,
-                    ) and x.muted_by_admin:
-                        self._need_unmute.add(chat_id)
+                await self._update_sources(chat_id)
         except FileError as e:
             raise FileNotFoundError(e)
         except TransportParseException:

pytgcalls/methods/stream/record.py

@@ -32,10 +32,16 @@ class Record(Scaffold):
         if chat_id not in await self._binding.calls():
             await self.play(chat_id, config=config)
         try:
-            return await self._binding.set_stream_sources(
+            await self._binding.set_stream_sources(
                 chat_id,
                 StreamMode.PLAYBACK,
                 media_description,
             )
+            if isinstance(chat_id, int) and chat_id < 0:
+                await self._join_presentation(
+                    chat_id,
+                    media_description.screen is not None,
+                )
+                await self._update_sources(chat_id)
         except FileError as e:
             raise FileNotFoundError(e)

pytgcalls/methods/utilities/__init__.py

@@ -1,19 +1,25 @@
 from .cache_peer import CachePeer
 from .call_holder import CallHolder
 from .cpu_usage import CpuUsage
+from .join_presentation import JoinPresentation
+from .log_retries import LogRetries
 from .ping import Ping
 from .resolve_chat_id import ResolveChatID
 from .run import Run
 from .start import Start
+from .update_sources import UpdateSources
 
 
 class Utilities(
     CachePeer,
     CallHolder,
     CpuUsage,
+    JoinPresentation,
+    LogRetries,
     Ping,
     ResolveChatID,
     Run,
     Start,
+    UpdateSources,
 ):
     pass

pytgcalls/methods/utilities/join_presentation.py

@@ -0,0 +1,46 @@
+from typing import Union
+
+from ntgcalls import TelegramServerError
+
+from ...scaffold import Scaffold
+
+
+class JoinPresentation(Scaffold):
+    async def _join_presentation(
+        self,
+        chat_id: Union[int, str],
+        join: bool,
+    ):
+        if join:
+            if chat_id in self._presentations:
+                return
+            for retries in range(4):
+                try:
+                    self._wait_connect[
+                        chat_id
+                    ] = self.loop.create_future()
+                    payload = await self._binding.init_presentation(
+                        chat_id,
+                    )
+                    result_params = await self._app.join_presentation(
+                        chat_id,
+                        payload,
+                    )
+                    await self._binding.connect(
+                        chat_id,
+                        result_params,
+                        True,
+                    )
+                    await self._wait_connect[chat_id]
+                    self._presentations.add(chat_id)
+                    break
+                except TelegramServerError:
+                    if retries == 3:
+                        raise
+                    self._log_retries(retries)
+                finally:
+                    self._wait_connect.pop(chat_id, None)
+        elif chat_id in self._call_sources:
+            await self._binding.stop_presentation(chat_id)
+            await self._app.leave_presentation(chat_id)
+            self._presentations.discard(chat_id)

pytgcalls/methods/utilities/log_retries.py

@@ -0,0 +1,14 @@
+import logging
+
+from ...scaffold import Scaffold
+
+py_logger = logging.getLogger('pytgcalls')
+
+
+class LogRetries(Scaffold):
+    @staticmethod
+    def _log_retries(r: int):
+        (py_logger.warning if r >= 1 else py_logger.info)(
+            f'Telegram is having some internal server issues. '
+            f'Retrying {r + 1} of 3',
+        )

pytgcalls/methods/utilities/start.py

@@ -94,54 +94,66 @@ class Start(Scaffold):
                 action = participant.action
                 chat_peer = self._cache_user_peer.get(chat_id)
                 user_id = participant.user_id
-                was_camera = user_id in self._videos_id
-                was_screen = user_id in self._presentations_id
+                if chat_id in self._call_sources:
+                    call_sources = self._call_sources[chat_id]
+                    was_camera = user_id in call_sources.camera
+                    was_screen = user_id in call_sources.presentation
 
-                if was_camera != participant.video_camera:
-                    if participant.video_info:
-                        self._videos_id[
-                            user_id
-                        ] = participant.video_info.endpoint
-                        try:
-                            await self._binding.add_incoming_video(
-                                chat_id,
-                                participant.video_info.endpoint,
-                                participant.video_info.sources,
-                            )
-                        except ConnectionNotFound:
-                            pass
-                    elif user_id in self._videos_id:
-                        try:
-                            await self._binding.remove_incoming_video(
-                                chat_id,
-                                self._videos_id[user_id],
+                    if was_camera != participant.video_camera:
+                        if participant.video_info:
+                            self._call_sources[chat_id].camera[
+                                user_id
+                            ] = participant.video_info.endpoint
+                            try:
+                                await self._binding.add_incoming_video(
+                                    chat_id,
+                                    participant.video_info.endpoint,
+                                    participant.video_info.sources,
+                                )
+                            except (ConnectionNotFound, ConnectionError):
+                                pass
+                        elif user_id in self._call_sources[chat_id].camera:
+                            try:
+                                await self._binding.remove_incoming_video(
+                                    chat_id,
+                                    self._call_sources[
+                                        chat_id
+                                    ].camera[user_id],
+                                )
+                            except (ConnectionNotFound, ConnectionError):
+                                pass
+                            self._call_sources[chat_id].camera.pop(
+                                user_id, None,
                             )
-                        except ConnectionNotFound:
-                            pass
-                        self._videos_id.pop(user_id, None)
 
-                if was_screen != participant.screen_sharing:
-                    if participant.presentation_info:
-                        self._presentations_id[
-                            user_id
-                        ] = participant.presentation_info.endpoint
-                        try:
-                            await self._binding.add_incoming_video(
-                                chat_id,
-                                participant.presentation_info.endpoint,
-                                participant.presentation_info.sources,
-                            )
-                        except ConnectionNotFound:
-                            pass
-                    elif user_id in self._presentations_id:
-                        try:
-                            await self._binding.remove_incoming_video(
-                                chat_id,
-                                self._presentations_id[user_id],
+                    if was_screen != participant.screen_sharing:
+                        if participant.presentation_info:
+                            self._call_sources[chat_id].presentation[
+                                user_id
+                            ] = participant.presentation_info.endpoint
+                            try:
+                                await self._binding.add_incoming_video(
+                                    chat_id,
+                                    participant.presentation_info.endpoint,
+                                    participant.presentation_info.sources,
+                                )
+                            except (ConnectionNotFound, ConnectionError):
+                                pass
+                        elif user_id in self._call_sources[
+                            chat_id
+                        ].presentation:
+                            try:
+                                await self._binding.remove_incoming_video(
+                                    chat_id,
+                                    self._call_sources[
+                                        chat_id
+                                    ].presentation[user_id],
+                                )
+                            except (ConnectionNotFound, ConnectionError):
+                                pass
+                            self._call_sources[chat_id].presentation.pop(
+                                user_id, None,
                             )
-                        except ConnectionNotFound:
-                            pass
-                        self._presentations_id.pop(user_id, None)
 
                 if chat_peer:
                     is_self = BridgedClient.chat_id(

pytgcalls/methods/utilities/stream_params.py

@@ -1,3 +1,4 @@
+from pathlib import Path
 from typing import Optional
 from typing import Union
 
@@ -5,6 +6,7 @@ from ntgcalls import AudioDescription
 from ntgcalls import MediaDescription
 from ntgcalls import VideoDescription
 
+from ...media_devices.input_device import InputDevice
 from ...types import RecordStream
 from ...types.raw import AudioStream
 from ...types.raw import Stream
@@ -15,9 +17,11 @@ from ...types.stream.media_stream import MediaStream
 class StreamParams:
     @staticmethod
     async def get_stream_params(
-        stream: Optional[Stream],
+        stream: Optional[Union[str, Path, InputDevice, Stream]],
     ) -> MediaDescription:
         if stream is not None:
+            if isinstance(stream, (str, Path, InputDevice)):
+                stream = MediaStream(stream)
             if isinstance(stream, MediaStream):
                 await stream.check_stream()
             elif isinstance(stream, RecordStream):
@@ -52,7 +56,7 @@ class StreamParams:
 
     @staticmethod
     def _parse_stream_description(
-        stream: Stream,
+        stream: Optional[Stream],
     ) -> MediaDescription:
         return MediaDescription(
             microphone=StreamParams._parse_media_description(

pytgcalls/methods/utilities/update_sources.py

@@ -0,0 +1,42 @@
+from typing import Union
+
+from ...mtproto import BridgedClient
+from ...scaffold import Scaffold
+from ...types.calls import CallSources
+
+
+class UpdateSources(Scaffold):
+    async def _update_sources(
+        self,
+        chat_id: Union[int, str],
+    ):
+        participants = await self._app.get_group_call_participants(
+            chat_id,
+        )
+        if chat_id not in self._call_sources:
+            self._call_sources[chat_id] = CallSources()
+        for x in participants:
+            if x.video_info is not None and \
+                    x.user_id not in self._call_sources[chat_id].camera:
+                self._call_sources[chat_id].camera[
+                    x.user_id
+                ] = x.video_info.endpoint
+                await self._binding.add_incoming_video(
+                    chat_id,
+                    x.video_info.endpoint,
+                    x.video_info.sources,
+                )
+            if x.presentation_info is not None and \
+                    x.user_id not in self._call_sources[chat_id].presentation:
+                self._call_sources[chat_id].presentation[
+                    x.user_id
+                ] = x.presentation_info.endpoint
+                await self._binding.add_incoming_video(
+                    chat_id,
+                    x.presentation_info.endpoint,
+                    x.presentation_info.sources,
+                )
+            if x.user_id == BridgedClient.chat_id(
+                self._cache_local_peer,
+            ) and x.muted_by_admin:
+                self._need_unmute.add(chat_id)

pytgcalls/scaffold.py

@@ -22,8 +22,7 @@ class Scaffold(HandlersHolder):
         self.loop = None
         self._need_unmute = set()
         self._p2p_configs = dict()
-        self._videos_id = dict()
-        self._presentations_id = dict()
+        self._call_sources = dict()
         self._wait_connect = dict()
         self._presentations = set()
 
@@ -42,5 +41,15 @@ class Scaffold(HandlersHolder):
     async def play(self, chat_id: Union[int, str], stream=None, config=None):
         pass
 
+    async def _update_sources(self, chat_id: Union[int, str]):
+        pass
+
+    async def _join_presentation(self, chat_id: Union[int, str], join: bool):
+        pass
+
+    @staticmethod
+    def _log_retries(r: int):
+        pass
+
     def on_update(self, filters=None):
         pass

pytgcalls/types/calls/__init__.py

@@ -2,6 +2,7 @@ from .call import Call
 from .call_config import CallConfig
 from .call_data import CallData
 from .call_protocol import CallProtocol
+from .call_sources import CallSources
 from .group_call_config import GroupCallConfig
 from .raw_call_update import RawCallUpdate
 
@@ -10,6 +11,7 @@ __all__ = (
     'CallData',
     'CallConfig',
     'CallProtocol',
+    'CallSources',
     'GroupCallConfig',
     'RawCallUpdate',
 )

pytgcalls/types/calls/call_sources.py

@@ -0,0 +1,4 @@
+class CallSources:
+    def __init__(self):
+        self.camera = dict()
+        self.presentation = dict()

pytgcalls/types/stream/media_stream.py

@@ -91,7 +91,6 @@ class MediaStream(Stream):
             if media_path & ExternalMedia.VIDEO:
                 self._is_video_external = True
         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

pytgcalls/types/stream/record_stream.py

@@ -86,8 +86,8 @@ class RecordStream(Stream):
                 media_source=MediaSource.EXTERNAL,
                 path='',
                 parameters=VideoParameters(
-                    width=0,
-                    height=0,
+                    width=-1,
+                    height=-1,
                     frame_rate=0,
                 ),
             )