author | Wolfgang Rosenauer <wr@rosenauer.org> |
Sun, 13 Jan 2013 14:26:10 +0100 | |
branch | firefox18 |
changeset 603 | cfcae96df099 |
parent 573 | 71cf05d3ee57 |
permissions | -rw-r--r-- |
573
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
# Parent 09328afa274e7cf6354f446ae37735218b796e7f |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
# User Wolfgang Rosenauer <wr@rosenauer.org> |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
Bug 803287 - Don't use GStreamer (when enabled) for Ogg/WebM if builtin backends present. (TM: 19) |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
--- a/content/base/src/nsContentUtils.cpp |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
+++ b/content/base/src/nsContentUtils.cpp |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
@@ -6676,71 +6676,55 @@ nsContentUtils::FindInternalContentViewe |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
else |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
*aLoaderType = TYPE_UNKNOWN; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
return docFactory.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
#ifdef MOZ_MEDIA |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
#ifdef MOZ_OGG |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
- if (nsHTMLMediaElement::IsOggEnabled()) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
- for (unsigned int i = 0; i < ArrayLength(nsHTMLMediaElement::gOggTypes); ++i) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
- const char* type = nsHTMLMediaElement::gOggTypes[i]; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
- if (!strcmp(aType, type)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
- docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
- if (docFactory && aLoaderType) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
- *aLoaderType = TYPE_CONTENT; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
- } |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
- return docFactory.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
- } |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
+ if (nsHTMLMediaElement::IsOggType(nsDependentCString(aType))) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
+ docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
30 |
+ if (docFactory && aLoaderType) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
31 |
+ *aLoaderType = TYPE_CONTENT; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
32 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
33 |
+ return docFactory.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
34 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
35 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
36 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
37 |
#ifdef MOZ_WEBM |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
38 |
- if (nsHTMLMediaElement::IsWebMEnabled()) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
39 |
- for (unsigned int i = 0; i < ArrayLength(nsHTMLMediaElement::gWebMTypes); ++i) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
40 |
- const char* type = nsHTMLMediaElement::gWebMTypes[i]; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
41 |
- if (!strcmp(aType, type)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
42 |
- docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
43 |
- if (docFactory && aLoaderType) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
44 |
- *aLoaderType = TYPE_CONTENT; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
45 |
- } |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
46 |
- return docFactory.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
47 |
- } |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
48 |
+ if (nsHTMLMediaElement::IsWebMType(nsDependentCString(aType))) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
49 |
+ docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
50 |
+ if (docFactory && aLoaderType) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
51 |
+ *aLoaderType = TYPE_CONTENT; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
52 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
53 |
+ return docFactory.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
54 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
55 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
56 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
57 |
#ifdef MOZ_GSTREAMER |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
58 |
- if (nsHTMLMediaElement::IsH264Enabled()) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
59 |
- for (unsigned int i = 0; i < ArrayLength(nsHTMLMediaElement::gH264Types); ++i) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
60 |
- const char* type = nsHTMLMediaElement::gH264Types[i]; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
61 |
- if (!strcmp(aType, type)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
62 |
- docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
63 |
- if (docFactory && aLoaderType) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
64 |
- *aLoaderType = TYPE_CONTENT; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
65 |
- } |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
66 |
- return docFactory.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
67 |
- } |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
68 |
+ if (nsHTMLMediaElement::IsGStreamerSupportedType(nsDependentCString(aType))) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
69 |
+ docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
70 |
+ if (docFactory && aLoaderType) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
71 |
+ *aLoaderType = TYPE_CONTENT; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
72 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
73 |
+ return docFactory.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
74 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
75 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
76 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
77 |
#ifdef MOZ_MEDIA_PLUGINS |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
78 |
if (nsHTMLMediaElement::IsMediaPluginsEnabled() && |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
79 |
nsHTMLMediaElement::IsMediaPluginsType(nsDependentCString(aType))) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
80 |
docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
81 |
if (docFactory && aLoaderType) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
82 |
*aLoaderType = TYPE_CONTENT; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
83 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
84 |
return docFactory.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
85 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
86 |
#endif // MOZ_MEDIA_PLUGINS |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
87 |
- |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
88 |
#endif // MOZ_MEDIA |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
89 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
90 |
return NULL; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
91 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
92 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
93 |
// static |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
94 |
bool |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
95 |
nsContentUtils::IsPatternMatching(nsAString& aValue, nsAString& aPattern, |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
96 |
diff --git a/content/html/content/public/nsHTMLMediaElement.h b/content/html/content/public/nsHTMLMediaElement.h |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
97 |
--- a/content/html/content/public/nsHTMLMediaElement.h |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
98 |
+++ b/content/html/content/public/nsHTMLMediaElement.h |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
99 |
@@ -303,17 +303,18 @@ public: |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
100 |
#ifdef MOZ_WEBM |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
101 |
static bool IsWebMEnabled(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
102 |
static bool IsWebMType(const nsACString& aType); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
103 |
static const char gWebMTypes[2][11]; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
104 |
static char const *const gWebMCodecs[4]; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
105 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
106 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
107 |
#ifdef MOZ_GSTREAMER |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
108 |
- static bool IsH264Enabled(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
109 |
+ static bool IsGStreamerEnabled(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
110 |
+ static bool IsGStreamerSupportedType(const nsACString& aType); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
111 |
static bool IsH264Type(const nsACString& aType); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
112 |
static const char gH264Types[3][16]; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
113 |
static char const *const gH264Codecs[7]; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
114 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
115 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
116 |
#ifdef MOZ_WIDGET_GONK |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
117 |
static bool IsOmxEnabled(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
118 |
static bool IsOmxSupportedType(const nsACString& aType); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
119 |
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
120 |
--- a/content/html/content/src/nsHTMLMediaElement.cpp |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
121 |
+++ b/content/html/content/src/nsHTMLMediaElement.cpp |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
122 |
@@ -2148,34 +2148,29 @@ char const *const nsHTMLMediaElement::gH |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
123 |
#ifdef MOZ_GSTREAMER |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
124 |
const char nsHTMLMediaElement::gH264Types[3][16] = { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
125 |
"video/mp4", |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
126 |
"video/3gpp", |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
127 |
"video/quicktime", |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
128 |
}; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
129 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
130 |
bool |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
131 |
-nsHTMLMediaElement::IsH264Enabled() |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
132 |
+nsHTMLMediaElement::IsGStreamerEnabled() |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
133 |
{ |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
134 |
- return Preferences::GetBool("media.h264.enabled"); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
135 |
+ return Preferences::GetBool("media.gstreamer.enabled"); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
136 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
137 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
138 |
bool |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
139 |
nsHTMLMediaElement::IsH264Type(const nsACString& aType) |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
140 |
{ |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
141 |
- if (!IsH264Enabled()) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
142 |
- return false; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
143 |
- } |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
144 |
- |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
145 |
for (uint32_t i = 0; i < ArrayLength(gH264Types); ++i) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
146 |
if (aType.EqualsASCII(gH264Types[i])) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
147 |
return true; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
148 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
149 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
150 |
- |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
151 |
return false; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
152 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
153 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
154 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
155 |
#ifdef MOZ_WIDGET_GONK |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
156 |
const char nsHTMLMediaElement::gOmxTypes[5][16] = { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
157 |
"audio/mpeg", |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
158 |
"audio/mp4", |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
159 |
@@ -2424,34 +2419,63 @@ nsHTMLMediaElement::CanPlayType(const ns |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
160 |
default: |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
161 |
case CANPLAY_MAYBE: |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
162 |
aResult.AssignLiteral("maybe"); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
163 |
break; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
164 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
165 |
return NS_OK; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
166 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
167 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
168 |
+#ifdef MOZ_GSTREAMER |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
169 |
+bool |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
170 |
+nsHTMLMediaElement::IsGStreamerSupportedType(const nsACString& aMimeType) |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
171 |
+{ |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
172 |
+ if (!IsGStreamerEnabled()) |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
173 |
+ return false; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
174 |
+ if (IsH264Type(aMimeType)) |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
175 |
+ return true; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
176 |
+ if (!Preferences::GetBool("media.prefer-gstreamer", false)) |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
177 |
+ return false; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
178 |
+#ifdef MOZ_WEBM |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
179 |
+ if (IsWebMType(aMimeType)) |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
180 |
+ return true; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
181 |
+#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
182 |
+#ifdef MOZ_OGG |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
183 |
+ if (IsOggType(aMimeType)) |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
184 |
+ return true; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
185 |
+#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
186 |
+ return false; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
187 |
+} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
188 |
+#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
189 |
+ |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
190 |
already_AddRefed<nsMediaDecoder> |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
191 |
nsHTMLMediaElement::CreateDecoder(const nsACString& aType) |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
192 |
{ |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
193 |
+#ifdef MOZ_GSTREAMER |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
194 |
+ // When enabled, use GStreamer for H.264, but not for codecs handled by our |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
195 |
+ // bundled decoders, unless the "media.prefer-gstreamer" pref is set. |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
196 |
+ if (IsGStreamerSupportedType(aType)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
197 |
+ nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
198 |
+ if (decoder->Init(this)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
199 |
+ return decoder.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
200 |
+ } |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
201 |
+ } |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
202 |
+#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
203 |
+ |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
204 |
#ifdef MOZ_RAW |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
205 |
if (IsRawType(aType)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
206 |
nsRefPtr<nsRawDecoder> decoder = new nsRawDecoder(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
207 |
if (decoder->Init(this)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
208 |
return decoder.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
209 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
210 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
211 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
212 |
#ifdef MOZ_OGG |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
213 |
if (IsOggType(aType)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
214 |
-#ifdef MOZ_GSTREAMER |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
215 |
- nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
216 |
-#else |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
217 |
nsRefPtr<nsOggDecoder> decoder = new nsOggDecoder(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
218 |
-#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
219 |
if (decoder->Init(this)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
220 |
return decoder.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
221 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
222 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
223 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
224 |
#ifdef MOZ_WAVE |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
225 |
if (IsWaveType(aType)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
226 |
nsRefPtr<nsWaveDecoder> decoder = new nsWaveDecoder(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
227 |
@@ -2473,44 +2497,32 @@ nsHTMLMediaElement::CreateDecoder(const |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
228 |
nsRefPtr<nsMediaPluginDecoder> decoder = new nsMediaPluginDecoder(aType); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
229 |
if (decoder->Init(this)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
230 |
return decoder.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
231 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
232 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
233 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
234 |
#ifdef MOZ_WEBM |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
235 |
if (IsWebMType(aType)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
236 |
-#ifdef MOZ_GSTREAMER |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
237 |
- nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
238 |
-#else |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
239 |
nsRefPtr<nsWebMDecoder> decoder = new nsWebMDecoder(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
240 |
-#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
241 |
if (decoder->Init(this)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
242 |
return decoder.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
243 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
244 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
245 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
246 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
247 |
#ifdef MOZ_DASH |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
248 |
if (IsDASHMPDType(aType)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
249 |
nsRefPtr<nsDASHDecoder> decoder = new nsDASHDecoder(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
250 |
if (decoder->Init(this)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
251 |
return decoder.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
252 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
253 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
254 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
255 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
256 |
-#ifdef MOZ_GSTREAMER |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
257 |
- if (IsH264Type(aType)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
258 |
- nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
259 |
- if (decoder->Init(this)) { |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
260 |
- return decoder.forget(); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
261 |
- } |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
262 |
- } |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
263 |
-#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
264 |
return nullptr; |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
265 |
} |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
266 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
267 |
nsresult nsHTMLMediaElement::InitializeDecoderAsClone(nsMediaDecoder* aOriginal) |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
268 |
{ |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
269 |
NS_ASSERTION(mLoadingSrc, "mLoadingSrc must already be set"); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
270 |
NS_ASSERTION(mDecoder == nullptr, "Shouldn't have a decoder"); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
271 |
|
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
272 |
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
273 |
--- a/modules/libpref/src/init/all.js |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
274 |
+++ b/modules/libpref/src/init/all.js |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
275 |
@@ -164,17 +164,17 @@ pref("media.wave.enabled", true); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
276 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
277 |
#ifdef MOZ_WEBM |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
278 |
pref("media.webm.enabled", true); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
279 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
280 |
#ifdef MOZ_DASH |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
281 |
pref("media.dash.enabled", true); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
282 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
283 |
#ifdef MOZ_GSTREAMER |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
284 |
-pref("media.h264.enabled", true); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
285 |
+pref("media.gstreamer.enabled", true); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
286 |
#endif |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
287 |
#ifdef MOZ_WEBRTC |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
288 |
pref("media.navigator.enabled", false); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
289 |
pref("media.peerconnection.enabled", false); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
290 |
pref("media.navigator.permission.disabled", false); |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
291 |
#else |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
292 |
#ifdef ANDROID |
71cf05d3ee57
added mozilla-gstreamer-803287.patch (TM: mozilla19) as replacement for mozilla-gstreamer.patch
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
293 |
pref("media.navigator.enabled", true); |