Skip to content

Commit

Permalink
Bug 1175059: P1. Reject non-supported content-format. r=kentuckyfried…
Browse files Browse the repository at this point in the history
…takahe

The new MSE architecture currently only support mp4
  • Loading branch information
Jean-Yves Avenard committed Jun 19, 2015
1 parent 6a46cec commit 7a3cb46
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions dom/media/mediasource/TrackBuffersManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -751,8 +751,9 @@ TrackBuffersManager::CreateDemuxerforMIMEType()
}
mInputDemuxer = nullptr;
if (mType.LowerCaseEqualsLiteral("video/webm") || mType.LowerCaseEqualsLiteral("audio/webm")) {
MOZ_ASSERT(false, "Waiting on WebMDemuxer");
NS_WARNING("Waiting on WebMDemuxer");
// mInputDemuxer = new WebMDemuxer(mCurrentInputBuffer);
return;
}

#ifdef MOZ_FMP4
Expand All @@ -761,7 +762,8 @@ TrackBuffersManager::CreateDemuxerforMIMEType()
return;
}
#endif
MOZ_ASSERT(false, "Not supported (yet)");
NS_WARNING("Not supported (yet)");
return;
}

void
Expand All @@ -780,7 +782,8 @@ TrackBuffersManager::InitializationSegmentReceived()
}
CreateDemuxerforMIMEType();
if (!mInputDemuxer) {
MOZ_ASSERT(false, "TODO type not supported");
NS_WARNING("TODO type not supported");
RejectAppend(NS_ERROR_DOM_NOT_SUPPORTED_ERR, __func__);
return;
}
mDemuxerInitRequest.Begin(mInputDemuxer->Init()
Expand Down

0 comments on commit 7a3cb46

Please sign in to comment.