Skip to content

Commit 6049e04

Browse files
committed
✨(backend) use peertube transcoding pipeline by default
The BigBlueButton VODs are still using the AWS transcoding pipeline by default. Switching to use the Peertube transcoding pipeline.
1 parent c800fe3 commit 6049e04

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Versioning](https://semver.org/spec/v2.0.0.html).
1616

1717
- Increase connection timeout on Nginx for peertube runner success request
1818
- Allow disabling Cloudfront signed URLs
19+
- Use Peertube pipeline by default for BBB VOD transcoding
1920

2021
## [5.5.3] - 2025-01-09
2122

src/backend/marsha/bbb/api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,7 @@ def create_vod(self, request, pk=None, classroom_id=None):
763763
classroom_recording.vod = Video.objects.create(
764764
title=request.data.get("title"),
765765
playlist=classroom_recording.classroom.playlist,
766-
transcode_pipeline=defaults.AWS_PIPELINE,
766+
transcode_pipeline=defaults.PEERTUBE_PIPELINE,
767767
)
768768
classroom_recording.save()
769769

src/backend/marsha/bbb/tests/api/classroom/recordings/test_create_vod.py

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@ def test_api_classroom_recording_create_vod_instructor_or_admin(self):
163163
status=200,
164164
)
165165

166-
with mock.patch(
167-
"marsha.bbb.api.invoke_lambda_convert"
168-
) as mock_invoke_lambda_convert, mock.patch.object(
169-
timezone, "now", return_value=now
170-
), self.assertNumQueries(
171-
9
166+
with (
167+
mock.patch(
168+
"marsha.bbb.api.invoke_lambda_convert"
169+
) as mock_invoke_lambda_convert,
170+
mock.patch.object(timezone, "now", return_value=now),
171+
self.assertNumQueries(9),
172172
):
173173
response = self.client.post(
174174
f"/api/classrooms/{recording.classroom.id}/recordings/{recording.id}/create-vod/",
@@ -177,7 +177,7 @@ def test_api_classroom_recording_create_vod_instructor_or_admin(self):
177177
)
178178

179179
self.assertEqual(Video.objects.count(), 1)
180-
self.assertEqual(Video.objects.first().transcode_pipeline, "AWS")
180+
self.assertEqual(Video.objects.first().transcode_pipeline, "peertube")
181181
self.assertEqual(response.status_code, 201)
182182

183183
recording.refresh_from_db()
@@ -225,9 +225,10 @@ def test_api_classroom_recording_create_vod_instructor_or_admin_unknown_recordin
225225

226226
now = timezone.now()
227227

228-
with mock.patch.object(
229-
timezone, "now", return_value=now
230-
), self.assertNumQueries(1):
228+
with (
229+
mock.patch.object(timezone, "now", return_value=now),
230+
self.assertNumQueries(1),
231+
):
231232
response = self.client.post(
232233
f"/api/classrooms/{recording.classroom.id}"
233234
f"/recordings/{recording.classroom.id}/create-vod/",
@@ -331,7 +332,7 @@ def test_api_classroom_recording_create_vod_user_access_token_organization_admin
331332

332333
self.assertEqual(response.status_code, 201)
333334
self.assertEqual(Video.objects.count(), 1)
334-
self.assertEqual(Video.objects.first().transcode_pipeline, "AWS")
335+
self.assertEqual(Video.objects.first().transcode_pipeline, "peertube")
335336

336337
@responses.activate
337338
def test_api_classroom_recording_create_vod_from_standalone_site_no_consumer_site(
@@ -410,7 +411,7 @@ def test_api_classroom_recording_create_vod_from_standalone_site_no_consumer_sit
410411

411412
self.assertEqual(response.status_code, 201)
412413
self.assertEqual(Video.objects.count(), 1)
413-
self.assertEqual(Video.objects.first().transcode_pipeline, "AWS")
414+
self.assertEqual(Video.objects.first().transcode_pipeline, "peertube")
414415

415416
def test_api_classroom_recording_create_vod_from_standalone_site_inactive_conversion(
416417
self,
@@ -510,7 +511,7 @@ def test_api_classroom_recording_create_vod_user_access_token_playlist_admin(
510511

511512
self.assertEqual(response.status_code, 201)
512513
self.assertEqual(Video.objects.count(), 1)
513-
self.assertEqual(Video.objects.first().transcode_pipeline, "AWS")
514+
self.assertEqual(Video.objects.first().transcode_pipeline, "peertube")
514515

515516
@responses.activate
516517
def test_api_classroom_recording_create_vod_user_access_token_playlist_instructor(
@@ -584,7 +585,7 @@ def test_api_classroom_recording_create_vod_user_access_token_playlist_instructo
584585

585586
self.assertEqual(response.status_code, 201)
586587
self.assertEqual(Video.objects.count(), 1)
587-
self.assertEqual(Video.objects.first().transcode_pipeline, "AWS")
588+
self.assertEqual(Video.objects.first().transcode_pipeline, "peertube")
588589

589590
def test_api_classroom_recording_create_vod_user_access_token_playlist_student(
590591
self,
@@ -666,12 +667,12 @@ def test_api_classroom_recording_create_vod_instructor_or_admin_inactive_convers
666667

667668
now = timezone.now()
668669

669-
with mock.patch(
670-
"marsha.bbb.api.invoke_lambda_convert"
671-
) as mock_invoke_lambda_convert, mock.patch.object(
672-
timezone, "now", return_value=now
673-
), self.assertNumQueries(
674-
1
670+
with (
671+
mock.patch(
672+
"marsha.bbb.api.invoke_lambda_convert"
673+
) as mock_invoke_lambda_convert,
674+
mock.patch.object(timezone, "now", return_value=now),
675+
self.assertNumQueries(1),
675676
):
676677
response = self.client.post(
677678
f"/api/classrooms/{recording.classroom.id}/recordings/{recording.id}/create-vod/",

0 commit comments

Comments
 (0)