Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions tests/test_media_player.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,36 @@ def test_stop_terminates_process(self, mock_popen):
self.assertIsNone(self.player.process)


class TestVLCMediaPlayer(unittest.TestCase):
def setUp(self):
with patch.object(VLCMediaPlayer, '__init__', return_value=None):
self.player = VLCMediaPlayer()

self.mock_media = MagicMock()
self.mock_vlc_player = MagicMock()
self.mock_vlc_player.get_media.return_value = self.mock_media
self.player.player = self.mock_vlc_player

self.patch_settings = patch('viewer.media_player.settings')
self.patch_device_type = patch(
'viewer.media_player.get_device_type', return_value='pi4'
)

self.mock_settings = self.patch_settings.start()
self.mock_settings.__getitem__.return_value = 'hdmi'
self.patch_device_type.start()

def tearDown(self):
self.patch_settings.stop()
self.patch_device_type.stop()

def test_set_asset_invokes_parse(self):
self.player.set_asset('file:///test/video.mp4', 30)

self.mock_vlc_player.get_media.assert_called_once()
self.mock_media.parse.assert_called_once()


class TestMediaPlayerProxy(unittest.TestCase):
def setUp(self):
MediaPlayerProxy.INSTANCE = None
Expand Down
5 changes: 5 additions & 0 deletions viewer/media_player.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ def set_asset(self, uri, duration):
self.player.audio_output_device_set(
'alsa', self.get_alsa_audio_device()
)
# Use synchronous parse() to pre-load file metadata before play() is
# called. parse_with_options() is async and returns before metadata is
# ready, which negates the pre-loading benefit and causes the same
# startup gap we're trying to reduce.
self.player.get_media().parse()
Comment thread
nicomiguelino marked this conversation as resolved.
Comment thread
nicomiguelino marked this conversation as resolved.

def play(self):
self.player.play()
Expand Down
Loading