mirror of
https://github.com/facefusion/facefusion.git
synced 2026-06-03 03:08:01 +02:00
Refactor RTC structure (#1113)
* refactor rtc part1 * skip for macos * merge create spd and create sdp offer * fix lint * add test for create_sdp_offer * better naming for negotiate method as we get an answer * extend tests based on mutations * remove dead code * rename rtc store and related methods * clean store, move sender logic to stream helper under apis * generate tests for rtc store
This commit is contained in:
@@ -13,6 +13,7 @@ from facefusion.apis.core import create_api
|
||||
from facefusion.core import common_pre_check
|
||||
from facefusion.download import conditional_download
|
||||
from facefusion.hash_helper import create_hash
|
||||
from facefusion.libraries import datachannel as datachannel_module
|
||||
from .assert_helper import get_test_example_file, get_test_examples_directory
|
||||
|
||||
|
||||
@@ -123,7 +124,7 @@ def test_stream_video(test_client : TestClient, create_event : threading.Event,
|
||||
'Authorization': 'Bearer ' + access_token
|
||||
})
|
||||
|
||||
with patch('facefusion.rtc_store.send_rtc_video', side_effect = partial(set_event, event = create_event)):
|
||||
with patch('facefusion.rtc.send_video_to_peers', side_effect = partial(set_event, event = create_event)):
|
||||
with test_client.websocket_connect('/stream?mode=video&codec=' + video_codec, subprotocols =
|
||||
[
|
||||
'access_token.' + access_token
|
||||
@@ -131,7 +132,11 @@ def test_stream_video(test_client : TestClient, create_event : threading.Event,
|
||||
websocket.send_bytes(chr(1).encode() + source_content)
|
||||
websocket.receive_text()
|
||||
|
||||
sdp_offer = rtc.create_sdp_offer()
|
||||
peer_connection = rtc.create_peer_connection(disable_auto_negotiation = True)
|
||||
rtc.add_video_track(peer_connection, 'recvonly', 'vp8', 96)
|
||||
rtc.add_audio_track(peer_connection, 'recvonly', 'opus', 111)
|
||||
sdp_offer = rtc.create_sdp_offer(peer_connection)
|
||||
datachannel_module.create_static_library().rtcDeletePeerConnection(peer_connection)
|
||||
stream_response = test_client.post('/stream', content = sdp_offer, headers =
|
||||
{
|
||||
'Authorization': 'Bearer ' + access_token,
|
||||
|
||||
+51
-20
@@ -16,12 +16,6 @@ def before_all() -> None:
|
||||
vpx_module.pre_check()
|
||||
|
||||
|
||||
# TODO: add test_parse_sdp_payload_types
|
||||
def test_build_media_description() -> None:
|
||||
assert rtc.build_media_description('audio', 111, 'opus/48000/2', 'sendonly', 1) == b'm=audio 9 UDP/TLS/RTP/SAVPF 111\r\na=rtpmap:111 opus/48000/2\r\na=rtcp-fb:111 nack\r\na=rtcp-fb:111 nack pli\r\na=sendonly\r\na=mid:1\r\na=rtcp-mux\r\n'
|
||||
assert rtc.build_media_description('video', 96, 'VP8/90000', 'recvonly', 0) == b'm=video 9 UDP/TLS/RTP/SAVPF 96\r\na=rtpmap:96 VP8/90000\r\na=rtcp-fb:96 nack\r\na=rtcp-fb:96 nack pli\r\na=recvonly\r\na=mid:0\r\na=rtcp-mux\r\n'
|
||||
|
||||
|
||||
def test_create_peer_connection() -> None:
|
||||
peer_connection = rtc.create_peer_connection()
|
||||
datachannel_library = datachannel_module.create_static_library()
|
||||
@@ -30,40 +24,41 @@ def test_create_peer_connection() -> None:
|
||||
assert datachannel_library.rtcDeletePeerConnection(peer_connection) == 0
|
||||
|
||||
|
||||
def test_add_audio_track() -> None:
|
||||
peer_connection = rtc.create_peer_connection()
|
||||
def test_create_sdp_offer() -> None:
|
||||
peer_connection = rtc.create_peer_connection(disable_auto_negotiation = True)
|
||||
rtc.add_video_track(peer_connection, 'sendonly', 'vp8', 96)
|
||||
rtc.add_audio_track(peer_connection, 'sendonly', 'opus', 111)
|
||||
sdp_offer = rtc.create_sdp_offer(peer_connection)
|
||||
|
||||
assert rtc.add_audio_track(peer_connection, 'sendonly', 'opus', 111) > 0
|
||||
assert sdp_offer
|
||||
assert 'm=video' in sdp_offer
|
||||
assert 'VP8/90000' in sdp_offer
|
||||
assert 'm=audio' in sdp_offer
|
||||
assert 'opus/48000/2' in sdp_offer
|
||||
|
||||
datachannel_module.create_static_library().rtcDeletePeerConnection(peer_connection)
|
||||
|
||||
|
||||
def test_add_video_track() -> None:
|
||||
peer_connection = rtc.create_peer_connection()
|
||||
|
||||
assert rtc.add_video_track(peer_connection, 'sendonly', 'vp8', 96) > 0
|
||||
|
||||
datachannel_module.create_static_library().rtcDeletePeerConnection(peer_connection)
|
||||
|
||||
|
||||
def test_negotiate_sdp() -> None:
|
||||
def test_negotiate_sdp_answer() -> None:
|
||||
datachannel_library = datachannel_module.create_static_library()
|
||||
|
||||
sender_connection = rtc.create_peer_connection()
|
||||
rtc.add_video_track(sender_connection, 'sendonly', 'vp8', 96)
|
||||
rtc.add_audio_track(sender_connection, 'sendonly', 'opus', 111)
|
||||
sdp_offer = rtc.create_sdp(sender_connection)
|
||||
sdp_offer = rtc.create_sdp_offer(sender_connection)
|
||||
|
||||
receiver_connection = rtc.create_peer_connection()
|
||||
rtc.add_video_track(receiver_connection, 'recvonly', 'vp8', 96)
|
||||
rtc.add_audio_track(receiver_connection, 'recvonly', 'opus', 111)
|
||||
sdp_answer = rtc.negotiate_sdp(receiver_connection, sdp_offer)
|
||||
sdp_answer = rtc.negotiate_sdp_answer(receiver_connection, sdp_offer)
|
||||
|
||||
assert sdp_answer
|
||||
assert 'm=video' in sdp_answer
|
||||
assert 'VP8/90000' in sdp_answer
|
||||
assert 'm=audio' in sdp_answer
|
||||
assert 'opus/48000/2' in sdp_answer
|
||||
# TODO: review
|
||||
assert 'a=recvonly' in sdp_answer
|
||||
|
||||
assert datachannel_library.rtcDeletePeerConnection(sender_connection) == 0
|
||||
assert datachannel_library.rtcDeletePeerConnection(receiver_connection) == 0
|
||||
@@ -84,3 +79,39 @@ def test_delete_peers() -> None:
|
||||
rtc.delete_peers(rtc_peers)
|
||||
|
||||
assert datachannel_library.rtcDeletePeerConnection(peer_connection) < 0
|
||||
|
||||
|
||||
def test_add_audio_track() -> None:
|
||||
peer_connection = rtc.create_peer_connection()
|
||||
audio_track = rtc.add_audio_track(peer_connection, 'sendonly', 'opus', 111)
|
||||
|
||||
assert audio_track > 0
|
||||
|
||||
# TODO: review
|
||||
sdp_offer = rtc.create_sdp_offer(peer_connection)
|
||||
|
||||
assert 'opus/48000/2' in sdp_offer
|
||||
|
||||
datachannel_module.create_static_library().rtcDeletePeerConnection(peer_connection)
|
||||
|
||||
|
||||
def test_add_video_track() -> None:
|
||||
peer_connection = rtc.create_peer_connection()
|
||||
video_track = rtc.add_video_track(peer_connection, 'sendonly', 'vp8', 96)
|
||||
|
||||
assert video_track > 0
|
||||
|
||||
# TODO: review
|
||||
sdp_offer = rtc.create_sdp_offer(peer_connection)
|
||||
|
||||
assert 'VP8/90000' in sdp_offer
|
||||
|
||||
datachannel_module.create_static_library().rtcDeletePeerConnection(peer_connection)
|
||||
|
||||
|
||||
def test_create_audio_description() -> None:
|
||||
assert rtc.create_audio_description('sendonly', 'opus', 111) == b'm=audio 9 UDP/TLS/RTP/SAVPF 111\r\na=rtpmap:111 opus/48000/2\r\na=rtcp-fb:111 nack\r\na=rtcp-fb:111 nack pli\r\na=sendonly\r\na=mid:1\r\na=rtcp-mux\r\n'
|
||||
|
||||
|
||||
def test_create_video_description() -> None:
|
||||
assert rtc.create_video_description('recvonly', 'vp8', 96) == b'm=video 9 UDP/TLS/RTP/SAVPF 96\r\na=rtpmap:96 VP8/90000\r\na=rtcp-fb:96 nack\r\na=rtcp-fb:96 nack pli\r\na=recvonly\r\na=mid:0\r\na=rtcp-mux\r\n'
|
||||
|
||||
+50
-7
@@ -1,7 +1,10 @@
|
||||
from typing import List
|
||||
|
||||
import pytest
|
||||
|
||||
from facefusion import state_manager
|
||||
from facefusion import rtc, rtc_store, state_manager
|
||||
from facefusion.libraries import datachannel as datachannel_module, opus as opus_module, vpx as vpx_module
|
||||
from facefusion.types import RtcPeer
|
||||
|
||||
|
||||
@pytest.fixture(scope = 'module', autouse = True)
|
||||
@@ -13,11 +16,51 @@ def before_all() -> None:
|
||||
vpx_module.pre_check()
|
||||
|
||||
|
||||
# TODO: test create_rtc_stream, get_rtc_stream, destroy_rtc_stream lifecycle
|
||||
def test_rtc_stream_lifecycle() -> None:
|
||||
pass
|
||||
@pytest.fixture(autouse = True)
|
||||
def before_each() -> None:
|
||||
rtc_store.RTC_STORE.clear()
|
||||
|
||||
|
||||
# TODO: test add_rtc_viewer with valid session and sdp offer
|
||||
def test_add_rtc_viewer() -> None:
|
||||
pass
|
||||
# TODO: needs review
|
||||
def test_create_rtc_peers() -> None:
|
||||
rtc_store.create_rtc_peers('test-session')
|
||||
|
||||
assert rtc_store.RTC_STORE.get('test-session') == []
|
||||
|
||||
|
||||
# TODO: needs review
|
||||
def test_get_rtc_peers() -> None:
|
||||
assert rtc_store.get_rtc_peers('test-session') is None
|
||||
|
||||
rtc_store.create_rtc_peers('test-session')
|
||||
|
||||
assert rtc_store.get_rtc_peers('test-session') == []
|
||||
|
||||
|
||||
# TODO: needs review
|
||||
def test_destroy_rtc_peers() -> None:
|
||||
rtc_store.create_rtc_peers('test-session')
|
||||
rtc_store.destroy_rtc_peers('test-session')
|
||||
|
||||
assert rtc_store.get_rtc_peers('test-session') is None
|
||||
|
||||
|
||||
# TODO: needs review
|
||||
def test_destroy_rtc_peers_with_connections() -> None:
|
||||
datachannel_library = datachannel_module.create_static_library()
|
||||
peer_connection = rtc.create_peer_connection()
|
||||
rtc_store.create_rtc_peers('test-session')
|
||||
rtc_peers : List[RtcPeer] =\
|
||||
[
|
||||
{
|
||||
'peer_connection': peer_connection,
|
||||
'video_track': 0,
|
||||
'audio_track': 0
|
||||
}
|
||||
]
|
||||
rtc_store.RTC_STORE['test-session'] = rtc_peers
|
||||
|
||||
rtc_store.destroy_rtc_peers('test-session')
|
||||
|
||||
assert rtc_store.get_rtc_peers('test-session') is None
|
||||
assert datachannel_library.rtcDeletePeerConnection(peer_connection) < 0
|
||||
|
||||
Reference in New Issue
Block a user