equal
deleted
inserted
replaced
1 # HG changeset patch |
1 # HG changeset patch |
2 # Parent 95d077d47f452a241c5826b5aea762b549bb24ff |
2 # Parent fbca0d2a522cd1ab78001476293d3d79bfabb4cf |
3 |
3 |
4 <!DOCTYPE html> |
4 <!DOCTYPE html> |
5 <html lang='en'> |
5 <html lang='en'> |
6 <head> |
6 <head> |
7 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> |
7 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> |
518 } |
518 } |
519 |
519 |
520 diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp |
520 diff --git a/dom/media/gmp/GMPParent.cpp b/dom/media/gmp/GMPParent.cpp |
521 --- a/dom/media/gmp/GMPParent.cpp |
521 --- a/dom/media/gmp/GMPParent.cpp |
522 +++ b/dom/media/gmp/GMPParent.cpp |
522 +++ b/dom/media/gmp/GMPParent.cpp |
523 @@ -868,18 +868,31 @@ RefPtr<GenericPromise> GMPParent::ParseC |
523 @@ -871,16 +871,30 @@ RefPtr<GenericPromise> GMPParent::ParseC |
524 mLibs = "dxva2.dll"_ns; |
524 mLibs = "dxva2.dll"_ns; |
525 #endif |
525 #endif |
526 } else { |
526 } else { |
527 GMP_PARENT_LOG_DEBUG("%s: Unrecognized key system: %s, failing.", |
527 GMP_PARENT_LOG_DEBUG("%s: Unrecognized key system: %s, failing.", |
528 __FUNCTION__, mDisplayName.get()); |
528 __FUNCTION__, mDisplayName.get()); |
541 + } |
541 + } |
542 + mLibs.AppendLiteral("libdl.so.2, libpthread.so.0, librt.so.1"); |
542 + mLibs.AppendLiteral("libdl.so.2, libpthread.so.0, librt.so.1"); |
543 + } |
543 + } |
544 +#endif |
544 +#endif |
545 + |
545 + |
546 GMPCapability video; |
|
547 - |
|
548 nsCString codecsString = NS_ConvertUTF16toUTF8(m.mX_cdm_codecs); |
546 nsCString codecsString = NS_ConvertUTF16toUTF8(m.mX_cdm_codecs); |
549 nsTArray<nsCString> codecs; |
547 nsTArray<nsCString> codecs; |
550 SplitAt(",", codecsString, codecs); |
548 SplitAt(",", codecsString, codecs); |
551 |
549 |
552 // Parse the codec strings in the manifest and map them to strings used |
550 // Parse the codec strings in the manifest and map them to strings used |