Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(logs): Add extra logging for 3015 errors #4932

Merged
merged 2 commits into from
Jan 28, 2023
Merged

feat(logs): Add extra logging for 3015 errors #4932

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd4377c
Add extra logging for 3015 errors
PsychoSnake Jan 25, 2023
d25ab4c
Use right data order. Added docs for new parameter
PsychoSnake Jan 27, 2023
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
2 changes: 2 additions & 0 deletions lib/media/media_source_engine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1265,6 +1265,7 @@ shaka.media.MediaSourceEngine = class {
shaka.util.Error.Severity.CRITICAL,
shaka.util.Error.Category.MEDIA,
shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,
this.video_.error || 'No error in the media element',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be the second data item, not the first, so as to not change the order of the data items. E.g. so that people checking error.data[0] to find what the exception was won't suddenly be seeing the video error instead.

You should also update the documentation for this error code, in lib/util/error.js.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. Have changed it now

exception);
} finally {
// Unblock the queues.
Expand Down Expand Up @@ -1308,6 +1309,7 @@ shaka.media.MediaSourceEngine = class {
shaka.util.Error.Severity.CRITICAL,
shaka.util.Error.Category.MEDIA,
shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,
this.video_.error || 'No error in the media element',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

exception));
}
this.popFromQueue_(contentType);
Expand Down
4 changes: 3 additions & 1 deletion test/media/media_source_engine_unit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,11 +374,12 @@ describe('MediaSourceEngine', () => {

it('rejects promise when operation throws', async () => {
audioSourceBuffer.appendBuffer.and.throwError('fail!');
mockVideo.error = {code: 5};
mockVideo.error = {code: 5, message: 'something failed'};
const expected = Util.jasmineError(new shaka.util.Error(
shaka.util.Error.Severity.CRITICAL,
shaka.util.Error.Category.MEDIA,
shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,
{code: 5, message: 'something failed'},
jasmine.objectContaining({message: 'fail!'})));
await expectAsync(
mediaSourceEngine.appendBuffer(
Expand Down Expand Up @@ -712,6 +713,7 @@ describe('MediaSourceEngine', () => {
shaka.util.Error.Severity.CRITICAL,
shaka.util.Error.Category.MEDIA,
shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,
{code: 5},
jasmine.objectContaining({message: 'fail!'})));
await expectAsync(mediaSourceEngine.remove(ContentType.AUDIO, 1, 5))
.toBeRejectedWith(expected);
Expand Down