Tiny refactor of codecs (#1121)

* improve performance using pointers

* simplify decoder's collect

* simplify decoder's collect

* add threading to decoders

* fix test

* switch back to return bytes

* fix macos

tests/test_codec_aom_decoder.py

@@ -5,9 +5,11 @@ import pytest
 from tests.assert_helper import get_test_example_file, get_test_examples_directory
 
 from facefusion import state_manager
-from facefusion.codecs.aom_decoder import create, decode, destroy, read_resolution
+from facefusion.codecs.aom_decoder import create, decode, destroy
 from facefusion.codecs.aom_encoder import create as create_encoder, encode
+from facefusion.common_helper import is_macos
 from facefusion.download import conditional_download
+from facefusion.hash_helper import create_hash
 from facefusion.libraries import aom as aom_module
 from facefusion.vision import read_video_frame
 
@@ -21,40 +23,33 @@ def before_all() -> None:
 	aom_module.pre_check()
 
 
-#TODO: needs review
 def test_create() -> None:
-	assert create()
+	assert create(1)
+
+	with patch('facefusion.codecs.aom_decoder.aom_module.create_static_library', return_value = None):
+		assert create(1) is None
 
 
-#TODO: needs review
 def test_decode() -> None:
 	vision_frame = read_video_frame(get_test_example_file('target-240p.mp4'))
 	video_buffer = cv2.cvtColor(vision_frame, cv2.COLOR_BGR2YUV_I420).tobytes()
 	video_resolution = (vision_frame.shape[1], vision_frame.shape[0])
 	aom_encoder = create_encoder(video_resolution, 1000, 1, 0)
 	encoded_buffer = encode(aom_encoder, video_buffer, video_resolution, 0)
-	decode_resolution = read_resolution(create(), encoded_buffer)
+	aom_pointer = decode(create(1), encoded_buffer)
 
-	assert len(decode(create(), encoded_buffer)) == decode_resolution[0] * decode_resolution[1] * 3 // 2
-	assert decode(create(), bytes()) == bytes()
+	assert aom_pointer is not None
+	assert aom_pointer.get('resolution')[0] >= video_resolution[0]
+	assert aom_pointer.get('resolution')[1] >= video_resolution[1]
+	assert len(aom_pointer.get('buffer')) == aom_pointer.get('resolution')[0] * aom_pointer.get('resolution')[1] * 3 // 2
+	assert decode(create(1), bytes()) is None
+
+	if is_macos():
+		assert create_hash(bytes(aom_pointer.get('buffer'))) == 'c8c6fdaa'
 
 
-#TODO: needs review
-def test_read_resolution() -> None:
-	vision_frame = read_video_frame(get_test_example_file('target-240p.mp4'))
-	video_buffer = cv2.cvtColor(vision_frame, cv2.COLOR_BGR2YUV_I420).tobytes()
-	video_resolution = (vision_frame.shape[1], vision_frame.shape[0])
-	aom_encoder = create_encoder(video_resolution, 1000, 1, 0)
-	encoded_buffer = encode(aom_encoder, video_buffer, video_resolution, 0)
-
-	assert read_resolution(create(), encoded_buffer)[0] >= video_resolution[0]
-	assert read_resolution(create(), encoded_buffer)[1] >= video_resolution[1]
-	assert read_resolution(create(), bytes()) is None
-
-
-#TODO: needs review
 def test_destroy() -> None:
-	aom_decoder = create()
+	aom_decoder = create(1)
 
 	with patch.object(aom_module.create_static_library(), 'aom_codec_destroy') as mock:
 		destroy(aom_decoder)

tests/test_codec_opus_decoder.py

@@ -7,8 +7,10 @@ from tests.assert_helper import get_test_example_file, get_test_examples_directo
 from facefusion import state_manager
 from facefusion.codecs.opus_decoder import create, decode, destroy
 from facefusion.codecs.opus_encoder import create as create_encoder, encode
+from facefusion.common_helper import is_macos
 from facefusion.download import conditional_download
 from facefusion.ffmpeg import read_audio_buffer
+from facefusion.hash_helper import create_hash
 from facefusion.libraries import opus as opus_module
 
 
@@ -21,24 +23,25 @@ def before_all() -> None:
 	opus_module.pre_check()
 
 
-#TODO: needs review
 def test_create() -> None:
 	assert create(48000, 2)
 	assert create(0, 0) is None
 
 
-#TODO: needs review
 def test_decode() -> None:
 	audio_buffer = read_audio_buffer(get_test_example_file('source.mp3'), 48000, 16, 2)
 	audio_sample = numpy.frombuffer(audio_buffer, dtype = numpy.int16).astype(numpy.float32) / 32768.0
 	opus_encoder = create_encoder(48000, 2)
 	encoded_buffer = encode(opus_encoder, audio_sample.tobytes(), 960)
 	opus_decoder = create(48000, 2)
+	decoded_buffer = decode(opus_decoder, encoded_buffer, 960, 2)
 
-	assert len(decode(opus_decoder, encoded_buffer, 960, 2)) == 960 * 2 * 4
+	assert len(decoded_buffer) == 960 * 2 * 4
+
+	if is_macos():
+		assert create_hash(decoded_buffer) == '92f7997d'
 
 
-#TODO: needs review
 def test_destroy() -> None:
 	opus_decoder = create(48000, 2)
 

tests/test_codec_vpx_decoder.py

@@ -5,9 +5,11 @@ import pytest
 from tests.assert_helper import get_test_example_file, get_test_examples_directory
 
 from facefusion import state_manager
-from facefusion.codecs.vpx_decoder import create, decode, destroy, read_resolution
+from facefusion.codecs.vpx_decoder import create, decode, destroy
 from facefusion.codecs.vpx_encoder import create as create_encoder, encode
+from facefusion.common_helper import is_macos
 from facefusion.download import conditional_download
+from facefusion.hash_helper import create_hash
 from facefusion.libraries import vpx as vpx_module
 from facefusion.vision import read_video_frame
 
@@ -21,40 +23,32 @@ def before_all() -> None:
 	vpx_module.pre_check()
 
 
-#TODO: needs review
 def test_create() -> None:
-	assert create()
+	assert create(1)
+
+	with patch('facefusion.codecs.vpx_decoder.vpx_module.create_static_library', return_value = None):
+		assert create(1) is None
 
 
-#TODO: needs review
 def test_decode() -> None:
 	vision_frame = read_video_frame(get_test_example_file('target-240p.mp4'))
 	video_buffer = cv2.cvtColor(vision_frame, cv2.COLOR_BGR2YUV_I420).tobytes()
 	video_resolution = (vision_frame.shape[1], vision_frame.shape[0])
 	vpx_encoder = create_encoder(video_resolution, 1000, 1, 0)
 	encoded_buffer = encode(vpx_encoder, video_buffer, video_resolution, 0)
-	vpx_decoder = create()
+	vpx_pointer = decode(create(1), encoded_buffer)
 
-	assert len(decode(vpx_decoder, encoded_buffer)) == video_resolution[0] * video_resolution[1] * 3 // 2
-	assert decode(vpx_decoder, bytes()) == bytes()
+	assert vpx_pointer is not None
+	assert vpx_pointer.get('resolution') == video_resolution
+	assert len(vpx_pointer.get('buffer')) == video_resolution[0] * video_resolution[1] * 3 // 2
+	assert decode(create(1), bytes()) is None
+
+	if is_macos():
+		assert create_hash(bytes(vpx_pointer.get('buffer'))) == '87450f70'
 
 
-#TODO: needs review
-def test_read_resolution() -> None:
-	vision_frame = read_video_frame(get_test_example_file('target-240p.mp4'))
-	video_buffer = cv2.cvtColor(vision_frame, cv2.COLOR_BGR2YUV_I420).tobytes()
-	video_resolution = (vision_frame.shape[1], vision_frame.shape[0])
-	vpx_encoder = create_encoder(video_resolution, 1000, 1, 0)
-	encoded_buffer = encode(vpx_encoder, video_buffer, video_resolution, 0)
-	vpx_decoder = create()
-
-	assert read_resolution(vpx_decoder, encoded_buffer) == video_resolution
-	assert read_resolution(vpx_decoder, bytes()) is None
-
-
-#TODO: needs review
 def test_destroy() -> None:
-	vpx_decoder = create()
+	vpx_decoder = create(1)
 
 	with patch.object(vpx_module.create_static_library(), 'vpx_codec_destroy') as mock:
 		destroy(vpx_decoder)