Skip to content

Commit 32afa96

Browse files
committed
✨(backend) revert default transcoding pipeline from Peertube to AWS
As the BBB VODs are fetched and processed by a Lambda, some deeper changes need to be done to change the default transcoding pipeline from AWS to Peertube. Reverting the changes so the default pipeline for VODs is AWS.
1 parent 6049e04 commit 32afa96

File tree

3 files changed

+21
-23
lines changed

3 files changed

+21
-23
lines changed

CHANGELOG.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ 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
2019

2120
## [5.5.3] - 2025-01-09
2221

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.PEERTUBE_PIPELINE,
766+
transcode_pipeline=defaults.AWS_PIPELINE,
767767
)
768768
classroom_recording.save()
769769

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

Lines changed: 20 additions & 21 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 (
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),
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
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, "peertube")
180+
self.assertEqual(Video.objects.first().transcode_pipeline, "AWS")
181181
self.assertEqual(response.status_code, 201)
182182

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

226226
now = timezone.now()
227227

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

333332
self.assertEqual(response.status_code, 201)
334333
self.assertEqual(Video.objects.count(), 1)
335-
self.assertEqual(Video.objects.first().transcode_pipeline, "peertube")
334+
self.assertEqual(Video.objects.first().transcode_pipeline, "AWS")
336335

337336
@responses.activate
338337
def test_api_classroom_recording_create_vod_from_standalone_site_no_consumer_site(
@@ -411,7 +410,7 @@ def test_api_classroom_recording_create_vod_from_standalone_site_no_consumer_sit
411410

412411
self.assertEqual(response.status_code, 201)
413412
self.assertEqual(Video.objects.count(), 1)
414-
self.assertEqual(Video.objects.first().transcode_pipeline, "peertube")
413+
self.assertEqual(Video.objects.first().transcode_pipeline, "AWS")
415414

416415
def test_api_classroom_recording_create_vod_from_standalone_site_inactive_conversion(
417416
self,
@@ -511,7 +510,7 @@ def test_api_classroom_recording_create_vod_user_access_token_playlist_admin(
511510

512511
self.assertEqual(response.status_code, 201)
513512
self.assertEqual(Video.objects.count(), 1)
514-
self.assertEqual(Video.objects.first().transcode_pipeline, "peertube")
513+
self.assertEqual(Video.objects.first().transcode_pipeline, "AWS")
515514

516515
@responses.activate
517516
def test_api_classroom_recording_create_vod_user_access_token_playlist_instructor(
@@ -585,7 +584,7 @@ def test_api_classroom_recording_create_vod_user_access_token_playlist_instructo
585584

586585
self.assertEqual(response.status_code, 201)
587586
self.assertEqual(Video.objects.count(), 1)
588-
self.assertEqual(Video.objects.first().transcode_pipeline, "peertube")
587+
self.assertEqual(Video.objects.first().transcode_pipeline, "AWS")
589588

590589
def test_api_classroom_recording_create_vod_user_access_token_playlist_student(
591590
self,
@@ -667,12 +666,12 @@ def test_api_classroom_recording_create_vod_instructor_or_admin_inactive_convers
667666

668667
now = timezone.now()
669668

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),
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
676675
):
677676
response = self.client.post(
678677
f"/api/classrooms/{recording.classroom.id}/recordings/{recording.id}/create-vod/",

0 commit comments

Comments
 (0)