Граф коммитов

104 Коммитов

Автор SHA1 Сообщение Дата
Chris Peterson 8a9e2d2bd4 Bug 1272513 - Part 2: Remove redundant -Wshadow CXXFLAGS from moz.build files. r=glandium 2016-05-14 00:54:55 -07:00
Chris Pearce 46a1552995 Bug 1271242 - Remove GMPDecryptorCallback::SetCapabilities(). r=jwwang
Now that GMPParent detects whether gmp-clearkey can decode using AAC/H.264
using WMF before reporting gmp-clearkey's GMPParent can decode AAC/H.264, we
don't need the GMPDecryptorCallback::SetCapabilities() callback from the GMP to
signal to the PDMFactory that the GMP can decode. We can now trust what the
GMPService tells us.

So we can remove the "waiting for CDM caps" step in the state machine's startup
sequence. And all the plumbing. :)

If we need more caps, like for an decode-and-render path, we can declare those
as API strings in the info file.


MozReview-Commit-ID: E0QhU4cYhjo

--HG--
extra : rebase_source : 7d15ab6a45bac88c15c053f416d941b5fe0807b0
2016-05-10 10:28:38 +12:00
Jacek Caban 01fffbb313 Bug 1257270 - Use std::nullptr_t instead of nullptr_t in WMFUtils.h. r=cpearce 2016-03-17 10:39:46 +01:00
Mike Shal f33175df08 Bug 1254950 - Remove several media Makefile.ins; r=ted
MozReview-Commit-ID: 4dvngHQnH0b
2016-03-14 18:02:02 -04:00
Chris Pearce 966cf53003 Bug 1232527 - Call into WMF PDM to determine if WMF can decode instead of using GMPVideoDecoderTrialCreator. r=jwwang
Resurrect WMFDecoderModule::HasAAC() and HasH264(), and use those in
MediaKeySystemAccess.cpp to figure out whether we gmp-clearkey can decode,
rather than assuming Vista and later is always able to decode, as that's not
a valid assumption; Vista may not have the required Platfor Update installed,
or we may be on Windows N or KN without the Media Feature Pack.

--HG--
extra : commitid : 2QrVAGQ5OJa
extra : rebase_source : 8ad6e5c5f87cf2b2489f049543c021723927901a
2015-12-15 14:50:59 +13:00
Chris Pearce 9654972991 Bug 1230026 - Support 'webm' initDataType format for MP4 ClearKey initData. r=gerald 2015-12-04 07:24:11 +13:00
Chris Pearce 373cfa1365 Bug 1229508 - Support current and previous GMP_API_DECRYPTORs. r=gerald
To allow GMPs time to update to new GMPDecryptor versions, we support the
latest GMPDecryptor version, and the previous.

In order to support a consistent interface to Gecko, we adapt the previous
GMPDecryptor version to the latest in the GMP child process.  So Gecko always
thinks it's talking to the latest version.

We also make gmp-fake deliberately support the previous GMPDecryptor version,
to ensure this code path remains tested.
2015-12-02 15:37:09 +13:00
Chris Pearce d6743b5aff Bug 1186406 - Copy input to ClearKey's decoder, so we can return its containing shmem earlier. r=gerald
We're failing in the "Very rough kill-switch" case in
GMPVideoDecoderParent::Decode() we find that too many shmems are in use when we
come to send a "Decode" message to the GMP, and that causes an error which
percolates up to cause the test failure.

This patch changes gmp-clearkey to copy the input encrypted and compressed
sample and immediately return the shmem to the parent process. We are
copying the data anyway when we decrypt, so we can rejigg things so that we
don't actually end up doing a second copy.
2015-12-01 18:13:58 +13:00
Chris Pearce efc8956d13 Bug 1228461 - Implement keyids initData type for ClearKey. r=gerald 2015-11-27 17:13:40 +13:00
Chris Pearce ad73151891 Bug 1228461 - Don't assert we must have keys for keyIds we've seen in ~ClearKeySession(). r=gerald 2015-11-27 17:13:35 +13:00
Mike Hommey 6a40d83fb7 Bug 1224452 - Straighten up a couple things in some moz.builds. r=gps
We're going to change how e.g. CFLAGS are printed out in backend.mk, and
to fit that model, the data in the corresponding moz.build variables
need to be straightened up.
2015-11-26 08:50:52 +09:00
Chris Pearce f74bb6b010 Bug 1226430 - Remove alg from ClearKey license parser. r=gerald 2015-11-23 09:58:51 +13:00
Chris Pearce efe66b4aca Bug 1214469 - Ensure gmp-clearkey accounts for mNumInputTasks when flushing. r=gerald 2015-10-14 19:42:24 +13:00
Chris Peterson 71920a9550 Bug 1207030 - Enable -Wshadow flag in more directories that have no -Wshadow warnings. r=glandium 2015-09-22 21:39:03 -07:00
Edwin Flores e12b94321f Bug 1185388 - Limit the number of cores used by WMF in ClearKey CDM - r=cpearce 2015-09-01 17:31:48 +12:00
Nicholas Nethercote f44287005f Bug 1198334 (part 1) - Replace the opt-in FAIL_ON_WARNINGS with the opt-out ALLOW_COMPILER_WARNINGS. r=glandium.
The patch removes 455 occurrences of FAIL_ON_WARNINGS from moz.build files, and
adds 78 instances of ALLOW_COMPILER_WARNINGS. About half of those 78 are in
code we control and which should be removable with a little effort.

--HG--
extra : rebase_source : 82e3387abfbd5f1471e953961d301d3d97ed2973
2015-08-27 20:44:53 -07:00
Jacek Caban 8f93a52f18 Bug 1197282 - Include <atomic> in VideoDecoder.h. r=cpearce 2015-08-25 12:40:20 +02:00
Edwin Flores 970d4a0c2b Bug 1195939 - Flush decode queue on Reset() in gmp-clearkey - r=cpearce 2015-08-19 15:06:36 -07:00
Ryan VanderMeulen 10835ff78b Backed out changeset 18f274867bcc (bug 1195939) for Windows EME test failures.
CLOSED TREE
2015-08-18 23:06:55 -04:00
Edwin Flores 1c281c3c56 Bug 1195939 - Flush decode queue on Reset() in gmp-clearkey - r=cpearce
--HG--
extra : rebase_source : 50f989518611a723342193837fac89a9c2d9e14f
2015-08-18 13:48:38 -07:00
Birunthan Mohanathas a8939590de Bug 1182996 - Fix and add missing namespace comments. rs=ehsan
The bulk of this commit was generated by running:

  run-clang-tidy.py \
    -checks='-*,llvm-namespace-comment' \
    -header-filter=^/.../mozilla-central/.* \
    -fix
2015-07-13 08:25:42 -07:00
Gerald Squelart 0cf2393949 Bug 1182363 - Added missing 'else' to prevent wrong error logging. r=edwin 2015-07-09 18:22:00 +02:00
Chris Pearce e811a7d2e6 Bug 1181436 - Use 'gmp-api/' prefix consistently in includes in gmp-clearkey. r=gerald 2015-07-08 17:12:47 +12:00
Gerald Squelart f4ccd23df1 Bug 1173631 - [EME] Implement async shutdown in clearkey GMP. r=cpearce
--HG--
extra : rebase_source : d6e510b5e081d581524a38a684a9cc677a5bde34
2015-06-11 22:05:00 +02:00
Chris Pearce 461ef61358 Bug 1169129 - Test that an EME GMP can instantiate a plugin before report we support that keySystem. r=edwin 2015-06-05 21:55:51 +12:00
Botond Ballo 2e2a504271 Bug 1119980 - Use 'snprintf' instead of 'sprintf' to avoid a warning on Lollipop-based builds. r=froydnj
--HG--
extra : source : 7468f9a3aa03520a29e138d4df431f0b5d90967c
2015-05-26 14:33:55 -04:00
Phil Ringnalda 49dd872168 Back out 3 changesets (bug 1119980) for emulator-l bustage
CLOSED TREE

Backed out changeset 12ce98475c6e (bug 1119980)
Backed out changeset bdb8d05f8870 (bug 1119980)
Backed out changeset a68a18840492 (bug 1119980)
2015-05-25 18:48:51 -07:00
Botond Ballo 9934d127c1 Bug 1119980 - Use 'snprintf' instead of 'sprintf' to avoid a warning on Lollipop-based builds. r=froydnj
--HG--
extra : rebase_source : 4e915a12ba662ed45788238a5f0a45533888bd92
2015-05-25 20:45:17 -04:00
Chris Pearce 82d33ace6a Bug 1160914 - Use locks for gmp-clearkey threadsafe refcounting when std::atomic is not easily available. r=edwin 2015-05-06 11:40:42 +12:00
Chris Pearce 05f051d1ba Bug 1160914 - Make gmp-clearkey's decoders threadsafe refcounted, to handle DecodingComplete while GMPVideoHost::CreateFrame() is waiting. r=edwin 2015-05-06 11:40:40 +12:00
Wes Kocher b7143cd0e7 Backed out changeset ddb936f4e78a (bug 1160914) for build bustage CLOSED TREE 2015-05-04 16:32:41 -07:00
Chris Pearce b62f7d16fb Bug 1160914 - Make gmp-clearkey's decoders threadsafe refcounted, to handle DecodingComplete while GMPVideoHost::CreateFrame() is waiting. r=edwin 2015-05-05 11:21:55 +12:00
Jacek Caban 3a45303395 Bug 1156131 - mingw cross compilation fixup. 2015-04-29 17:39:35 +02:00
Chris Pearce fa0f746b0c Bug 1156131 - Use correct DLL on WinVista, 7, and 8 for WMF decoding in gmp-clearkey. r=edwin 2015-04-20 20:07:24 +12:00
Chris Pearce c7b1e2eadc Bug 1143278 - Support IYUV and I420 in gmp-clearkey on Windows, as Win 7 Enterprise N's H.264 decoder doesn't output I420. r=edwin 2015-04-13 13:39:56 +12:00
Chris Pearce 4ffa422c6e Bug 1143278 - Use a different CLSID to instantiate the H264 decoder MFT in gmp-clearkey, as Win 7 Enterprise N requires that. r=edwin 2015-04-13 13:39:53 +12:00
Chris Pearce bdd3e51ab8 Bug 1143278 - Add more null checks in gmp-clearkey's decoders. r=edwin 2015-04-13 13:39:49 +12:00
Chris Pearce e61fe5c00d Bug 1143278 - Make gmp-clearkey not require a Win8 only DLL to decode audio on Win7. r=edwin 2015-04-13 13:39:46 +12:00
Chris Pearce 1fa249bfb8 Bug 1150437 - Make gmp-clearkey consistently Apache2 licensed. r=edwin,jwwang,kentuckyfriedtakahe 2015-04-03 09:08:27 +13:00
Andrea Marchesini e6f385fb3d Bug 1148527 - Indentation fix after bug 1145631, r=ehsan 2015-03-27 18:52:19 +00:00
Edwin Flores d888a5c88f Bug 1147689 - Increment eme-decrypt API version to v7 - r=cpearce 2015-03-26 22:58:43 +13:00
Edwin Flores f99988363e Bug 1145405 - Add shutdown checks to main thread dispatches in ClearKey CDM - r=cpearce 2015-03-23 07:59:42 +13:00
Ehsan Akhgari 883849ee32 Bug 1145631 - Part 1: Replace MOZ_OVERRIDE and MOZ_FINAL with override and final in the tree; r=froydnj
This patch was automatically generated using the following script:

function convert() {
echo "Converting $1 to $2..."
find . \
       ! -wholename "*/.git*" \
       ! -wholename "obj-ff-dbg*" \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.c" \
         -o -iname "*.cc" \
         -o -iname "*.idl" \
         -o -iname "*.ipdl" \
         -o -iname "*.ipdlh" \
         -o -iname "*.mm" \) | \
    xargs -n 1 sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_OVERRIDE override
convert MOZ_FINAL final
2015-03-21 12:28:04 -04:00
Phil Ringnalda 571ce099b4 Back out 7f1f85ee4ba6 (bug 1143278) for Win7 near-permaorange in test_eme_canvas_blocked.html 2015-03-15 18:30:53 -07:00
Chris Pearce 151f899496 Bug 1143278 - Make gmp-clearkey not require a Win8 only DLL to decode audio on Win7. r=edwin 2015-03-15 11:30:24 +13:00
Chris Pearce 0dc4e2d797 Bug 1141386 - Test case for gmp-clearkey's base64 key/keyId decoding. r=edwin 2015-03-10 19:46:20 +13:00
Chris Pearce 2af0bf1fce Bug 1141386 - Don't always assume base64 encoded EME key/Ids have padding stripped. r=edwin 2015-03-10 19:46:09 +13:00
Chris Pearce cac8145b4b Bug 1141386 - Backout c2de53dd52d4 and 6fdc1033f217 for breaking the build. r=bustage. 2015-03-10 17:04:33 +13:00
Chris Pearce 11bfbec7ff Bug 1141386 - Test case for gmp-clearkey's base64 key/keyId decoding. r=edwin 2015-03-10 16:49:15 +13:00
Chris Pearce 896fc7df01 Bug 1141386 - Don't always assume base64 encoded EME key/Ids have padding stripped. r=edwin 2015-03-10 16:49:03 +13:00