From 43470083d171c9f11cbbda954920ad8eafdcaaf3 Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 25 May 2018 10:33:40 -0500 Subject: Perform null check earlier in OggCodecState.cpp --- dom/media/ogg/OggCodecState.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'dom/media') diff --git a/dom/media/ogg/OggCodecState.cpp b/dom/media/ogg/OggCodecState.cpp index e7e1ca4a3..d03508411 100644 --- a/dom/media/ogg/OggCodecState.cpp +++ b/dom/media/ogg/OggCodecState.cpp @@ -1229,12 +1229,13 @@ already_AddRefed OpusState::PacketOutAsMediaRawData() { ogg_packet* packet = PacketPeek(); - uint32_t frames = 0; - const int64_t endFrame = packet->granulepos; - if (!packet) { return nullptr; } + + uint32_t frames = 0; + const int64_t endFrame = packet->granulepos; + if (packet->e_o_s) { frames = GetOpusDeltaGP(packet); } -- cgit v1.2.3 From 6ca361bd5b2394b2613ac0f67cf87723ecad4501 Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 25 May 2018 10:34:21 -0500 Subject: Null check the right pointer in RecvReadback --- dom/media/ipc/VideoDecoderManagerParent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dom/media') diff --git a/dom/media/ipc/VideoDecoderManagerParent.cpp b/dom/media/ipc/VideoDecoderManagerParent.cpp index a111b5e53..4ff9acf19 100644 --- a/dom/media/ipc/VideoDecoderManagerParent.cpp +++ b/dom/media/ipc/VideoDecoderManagerParent.cpp @@ -194,7 +194,7 @@ VideoDecoderManagerParent::RecvReadback(const SurfaceDescriptorGPUVideo& aSD, Su } RefPtr source = image->GetAsSourceSurface(); - if (!image) { + if (!source) { *aResult = null_t(); return true; } -- cgit v1.2.3 From f2d541d3ea44b56d3c4ce47fe7b326e58abc786f Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 25 May 2018 10:35:10 -0500 Subject: Revoke MediaDataDecoder callback after RemoteVideoDecoder has been shut down --- dom/media/ipc/VideoDecoderChild.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'dom/media') diff --git a/dom/media/ipc/VideoDecoderChild.cpp b/dom/media/ipc/VideoDecoderChild.cpp index d1b1d23fc..f01d3c659 100644 --- a/dom/media/ipc/VideoDecoderChild.cpp +++ b/dom/media/ipc/VideoDecoderChild.cpp @@ -238,6 +238,7 @@ VideoDecoderChild::Shutdown() SendShutdown(); } mInitialized = false; + mCallback = nullptr; } bool -- cgit v1.2.3