author | Wolfgang Rosenauer <wr@rosenauer.org> |
Fri, 26 Oct 2012 13:01:33 +0200 | |
changeset 568 | 2c74c5927ea2 |
parent 541 | 830e50bbfc79 |
child 573 | 71cf05d3ee57 |
permissions | -rw-r--r-- |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
From: Alessandro Decina <alessandro.d@gmail.com> |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
Bug 760140 - Query the GstRegistry for the required demuxers/decoders from canPlayType |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
--- a/content/base/src/nsContentUtils.cpp |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
+++ b/content/base/src/nsContentUtils.cpp |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
7 |
@@ -147,16 +147,19 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_ |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
#include "xpcprivate.h" // nsXPConnect |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
#include "nsScriptSecurityManager.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
#include "nsIChannelPolicy.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
#include "nsChannelPolicy.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
#include "nsIContentSecurityPolicy.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
#include "nsContentDLF.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
#ifdef MOZ_MEDIA |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
#include "nsHTMLMediaElement.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
+#ifdef MOZ_GSTREAMER |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
+#include "nsGStreamerDecoder.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
+#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
#include "nsDOMTouchEvent.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
#include "nsIContentViewer.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
#include "nsIObjectLoadingContent.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
#include "nsCCUncollectableMarker.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
#include "mozilla/Base64.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
#include "mozilla/Preferences.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
#include "nsDOMMutationObserver.h" |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
27 |
@@ -6706,26 +6709,23 @@ nsContentUtils::FindInternalContentViewe |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
return docFactory.forget(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
30 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
31 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
32 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
33 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
34 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
35 |
#ifdef MOZ_GSTREAMER |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
36 |
- if (nsHTMLMediaElement::IsH264Enabled()) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
37 |
- for (unsigned int i = 0; i < ArrayLength(nsHTMLMediaElement::gH264Types); ++i) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
38 |
- const char* type = nsHTMLMediaElement::gH264Types[i]; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
39 |
- if (!strcmp(aType, type)) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
40 |
- docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
41 |
- if (docFactory && aLoaderType) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
42 |
- *aLoaderType = TYPE_CONTENT; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
43 |
- } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
44 |
- return docFactory.forget(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
45 |
+ if (nsHTMLMediaElement::IsGStreamerEnabled()) { |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
46 |
+ if (nsGStreamerDecoder::CanHandleMediaType(aType, nullptr)) { |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
47 |
+ docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
48 |
+ if (docFactory && aLoaderType) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
49 |
+ *aLoaderType = TYPE_CONTENT; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
50 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
51 |
+ return docFactory.forget(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
52 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
53 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
54 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
55 |
|
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
56 |
#ifdef MOZ_MEDIA_PLUGINS |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
57 |
if (nsHTMLMediaElement::IsMediaPluginsEnabled() && |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
58 |
nsHTMLMediaElement::IsMediaPluginsType(nsDependentCString(aType))) { |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
59 |
docFactory = do_GetService("@mozilla.org/content/document-loader-factory;1"); |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
60 |
diff --git a/content/html/content/public/nsHTMLMediaElement.h b/content/html/content/public/nsHTMLMediaElement.h |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
61 |
--- a/content/html/content/public/nsHTMLMediaElement.h |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
62 |
+++ b/content/html/content/public/nsHTMLMediaElement.h |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
63 |
@@ -263,17 +263,19 @@ public: |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
64 |
void UpdateMediaSize(nsIntSize size); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
65 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
66 |
// Returns the CanPlayStatus indicating if we can handle this |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
67 |
// MIME type. The MIME type should not include the codecs parameter. |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
68 |
// If it returns anything other than CANPLAY_NO then it also |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
69 |
// returns a null-terminated list of supported codecs |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
70 |
// in *aSupportedCodecs. This list should not be freed, it is static data. |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
71 |
static CanPlayStatus CanHandleMediaType(const char* aMIMEType, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
72 |
- char const *const ** aSupportedCodecs); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
73 |
+ const char* aCodecs, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
74 |
+ char const *const ** aSupportedCodecs, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
75 |
+ bool* aCheckSupportedCodecs); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
76 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
77 |
// Returns the CanPlayStatus indicating if we can handle the |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
78 |
// full MIME type including the optional codecs parameter. |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
79 |
static CanPlayStatus GetCanPlay(const nsAString& aType); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
80 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
81 |
// Returns true if we should handle this MIME type when it appears |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
82 |
// as an <object> or as a toplevel page. If, in practice, our support |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
83 |
// for the type is more limited than appears in the wild, we should return |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
84 |
@@ -303,20 +305,17 @@ public: |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
85 |
#ifdef MOZ_WEBM |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
86 |
static bool IsWebMEnabled(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
87 |
static bool IsWebMType(const nsACString& aType); |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
88 |
static const char gWebMTypes[2][11]; |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
89 |
static char const *const gWebMCodecs[4]; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
90 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
91 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
92 |
#ifdef MOZ_GSTREAMER |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
93 |
- static bool IsH264Enabled(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
94 |
- static bool IsH264Type(const nsACString& aType); |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
95 |
- static const char gH264Types[3][16]; |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
96 |
- static char const *const gH264Codecs[7]; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
97 |
+ static bool IsGStreamerEnabled(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
98 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
99 |
|
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
100 |
#ifdef MOZ_WIDGET_GONK |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
101 |
static bool IsOmxEnabled(); |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
102 |
static bool IsOmxSupportedType(const nsACString& aType); |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
103 |
static const char gOmxTypes[5][16]; |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
104 |
static char const *const gH264Codecs[7]; |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
105 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
106 |
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
107 |
--- a/content/html/content/src/nsHTMLMediaElement.cpp |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
108 |
+++ b/content/html/content/src/nsHTMLMediaElement.cpp |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
109 |
@@ -2128,55 +2128,32 @@ nsHTMLMediaElement::IsWebMType(const nsA |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
110 |
return true; |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
111 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
112 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
113 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
114 |
return false; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
115 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
116 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
117 |
|
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
118 |
-#if defined(MOZ_GSTREAMER) || defined(MOZ_WIDGET_GONK) |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
119 |
+#ifdef MOZ_WIDGET_GONK |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
120 |
char const *const nsHTMLMediaElement::gH264Codecs[7] = { |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
121 |
"avc1.42E01E", |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
122 |
"avc1.42001E", |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
123 |
"avc1.58A01E", |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
124 |
"avc1.4D401E", |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
125 |
"avc1.64001E", |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
126 |
"mp4a.40.2", |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
127 |
nullptr |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
128 |
}; |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
129 |
#endif |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
130 |
|
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
131 |
#ifdef MOZ_GSTREAMER |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
132 |
-const char nsHTMLMediaElement::gH264Types[3][16] = { |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
133 |
- "video/mp4", |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
134 |
- "video/3gpp", |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
135 |
- "video/quicktime", |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
136 |
-}; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
137 |
- |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
138 |
-bool |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
139 |
-nsHTMLMediaElement::IsH264Enabled() |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
140 |
+bool nsHTMLMediaElement::IsGStreamerEnabled() |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
141 |
{ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
142 |
- return Preferences::GetBool("media.h264.enabled"); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
143 |
-} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
144 |
- |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
145 |
-bool |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
146 |
-nsHTMLMediaElement::IsH264Type(const nsACString& aType) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
147 |
-{ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
148 |
- if (!IsH264Enabled()) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
149 |
- return false; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
150 |
- } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
151 |
- |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
152 |
- for (uint32_t i = 0; i < ArrayLength(gH264Types); ++i) { |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
153 |
- if (aType.EqualsASCII(gH264Types[i])) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
154 |
- return true; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
155 |
- } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
156 |
- } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
157 |
- |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
158 |
- return false; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
159 |
+ return Preferences::GetBool("media.gstreamer.enabled"); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
160 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
161 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
162 |
|
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
163 |
#ifdef MOZ_WIDGET_GONK |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
164 |
const char nsHTMLMediaElement::gOmxTypes[5][16] = { |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
165 |
"audio/mpeg", |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
166 |
"audio/mp4", |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
167 |
"video/mp4", |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
168 |
@@ -2262,18 +2239,22 @@ nsHTMLMediaElement::IsDASHMPDType(const |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
169 |
|
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
170 |
return false; |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
171 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
172 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
173 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
174 |
/* static */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
175 |
nsHTMLMediaElement::CanPlayStatus |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
176 |
nsHTMLMediaElement::CanHandleMediaType(const char* aMIMEType, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
177 |
- char const *const ** aCodecList) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
178 |
+ const char *aCodecs, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
179 |
+ char const *const ** aCodecList, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
180 |
+ bool* aCheckCodecList) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
181 |
{ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
182 |
+ if (aCheckCodecList) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
183 |
+ *aCheckCodecList = true; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
184 |
#ifdef MOZ_RAW |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
185 |
if (IsRawType(nsDependentCString(aMIMEType))) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
186 |
*aCodecList = gRawCodecs; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
187 |
return CANPLAY_MAYBE; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
188 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
189 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
190 |
#ifdef MOZ_OGG |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
191 |
if (IsOggType(nsDependentCString(aMIMEType))) { |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
192 |
@@ -2297,20 +2278,22 @@ nsHTMLMediaElement::CanHandleMediaType(c |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
193 |
if (IsDASHMPDType(nsDependentCString(aMIMEType))) { |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
194 |
// DASH manifest uses WebM codecs only. |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
195 |
*aCodecList = gWebMCodecs; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
196 |
return CANPLAY_YES; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
197 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
198 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
199 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
200 |
#ifdef MOZ_GSTREAMER |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
201 |
- if (IsH264Type(nsDependentCString(aMIMEType))) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
202 |
- *aCodecList = gH264Codecs; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
203 |
- return CANPLAY_MAYBE; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
204 |
- } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
205 |
+ if (aCheckCodecList) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
206 |
+ *aCheckCodecList = false; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
207 |
+ if (aCodecList) |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
208 |
+ *aCodecList = nullptr; |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
209 |
+ if (nsGStreamerDecoder::CanHandleMediaType(aMIMEType, aCodecs)) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
210 |
+ return CANPLAY_YES; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
211 |
#endif |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
212 |
#ifdef MOZ_WIDGET_GONK |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
213 |
if (IsOmxSupportedType(nsDependentCString(aMIMEType))) { |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
214 |
*aCodecList = gH264Codecs; |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
215 |
return CANPLAY_MAYBE; |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
216 |
} |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
217 |
#endif |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
218 |
#ifdef MOZ_MEDIA_PLUGINS |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
219 |
@@ -2331,17 +2314,17 @@ bool nsHTMLMediaElement::ShouldHandleMed |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
220 |
if (IsOggType(nsDependentCString(aMIMEType))) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
221 |
return true; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
222 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
223 |
#ifdef MOZ_WEBM |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
224 |
if (IsWebMType(nsDependentCString(aMIMEType))) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
225 |
return true; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
226 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
227 |
#ifdef MOZ_GSTREAMER |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
228 |
- if (IsH264Type(nsDependentCString(aMIMEType))) |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
229 |
+ if (nsGStreamerDecoder::CanHandleMediaType(aMIMEType, nullptr)) |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
230 |
return true; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
231 |
#endif |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
232 |
#ifdef MOZ_WIDGET_GONK |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
233 |
if (IsOmxSupportedType(nsDependentCString(aMIMEType))) { |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
234 |
return true; |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
235 |
} |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
236 |
#endif |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
237 |
#ifdef MOZ_MEDIA_PLUGINS |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
238 |
@@ -2372,26 +2355,31 @@ nsHTMLMediaElement::GetCanPlay(const nsA |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
239 |
{ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
240 |
nsContentTypeParser parser(aType); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
241 |
nsAutoString mimeType; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
242 |
nsresult rv = parser.GetType(mimeType); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
243 |
if (NS_FAILED(rv)) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
244 |
return CANPLAY_NO; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
245 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
246 |
NS_ConvertUTF16toUTF8 mimeTypeUTF8(mimeType); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
247 |
+ nsAutoString codecs; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
248 |
+ rv = parser.GetParameter("codecs", codecs); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
249 |
+ NS_ConvertUTF16toUTF8 codecsUTF8(codecs); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
250 |
char const *const * supportedCodecs; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
251 |
+ bool checkSupportedCodecs = true; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
252 |
CanPlayStatus status = CanHandleMediaType(mimeTypeUTF8.get(), |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
253 |
- &supportedCodecs); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
254 |
+ codecsUTF8.get(), |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
255 |
+ &supportedCodecs, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
256 |
+ &checkSupportedCodecs); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
257 |
if (status == CANPLAY_NO) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
258 |
return CANPLAY_NO; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
259 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
260 |
- nsAutoString codecs; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
261 |
- rv = parser.GetParameter("codecs", codecs); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
262 |
- if (NS_FAILED(rv)) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
263 |
- // Parameter not found or whatever |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
264 |
+ if (codecs.IsEmpty() || !checkSupportedCodecs) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
265 |
+ /* no codecs to check for or they were already checked in CanHandleMediaType |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
266 |
+ * above */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
267 |
return status; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
268 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
269 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
270 |
CanPlayStatus result = CANPLAY_YES; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
271 |
// See http://www.rfc-editor.org/rfc/rfc4281.txt for the description |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
272 |
// of the 'codecs' parameter |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
273 |
nsCharSeparatedTokenizer tokenizer(codecs, ','); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
274 |
bool expectMoreTokens = false; |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
275 |
@@ -2486,17 +2474,19 @@ nsHTMLMediaElement::CreateDecoder(const |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
276 |
nsRefPtr<nsDASHDecoder> decoder = new nsDASHDecoder(); |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
277 |
if (decoder->Init(this)) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
278 |
return decoder.forget(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
279 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
280 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
281 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
282 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
283 |
#ifdef MOZ_GSTREAMER |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
284 |
- if (IsH264Type(aType)) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
285 |
+ const char *type; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
286 |
+ NS_CStringGetData(aType, &type, NULL); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
287 |
+ if (nsGStreamerDecoder::CanHandleMediaType(type, NULL)) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
288 |
nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
289 |
if (decoder->Init(this)) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
290 |
return decoder.forget(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
291 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
292 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
293 |
#endif |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
294 |
return nullptr; |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
295 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
296 |
diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
297 |
--- a/content/media/gstreamer/Makefile.in |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
298 |
+++ b/content/media/gstreamer/Makefile.in |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
299 |
@@ -17,16 +17,17 @@ LIBXUL_LIBRARY = 1 |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
300 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
301 |
EXPORTS += \ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
302 |
nsGStreamerDecoder.h \ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
303 |
$(NULL) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
304 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
305 |
CPPSRCS = \ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
306 |
nsGStreamerReader.cpp \ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
307 |
nsGStreamerDecoder.cpp \ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
308 |
+ nsGStreamerFormatHelper.cpp \ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
309 |
$(NULL) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
310 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
311 |
FORCE_STATIC_LIB = 1 |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
312 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
313 |
include $(topsrcdir)/config/rules.mk |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
314 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
315 |
CFLAGS += $(GSTREAMER_CFLAGS) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
316 |
CXXFLAGS += $(GSTREAMER_CFLAGS) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
317 |
diff --git a/content/media/gstreamer/nsGStreamerDecoder.cpp b/content/media/gstreamer/nsGStreamerDecoder.cpp |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
318 |
--- a/content/media/gstreamer/nsGStreamerDecoder.cpp |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
319 |
+++ b/content/media/gstreamer/nsGStreamerDecoder.cpp |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
320 |
@@ -2,13 +2,19 @@ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
321 |
/* vim:set ts=2 sw=2 sts=2 et cindent: */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
322 |
/* This Source Code Form is subject to the terms of the Mozilla Public |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
323 |
* License, v. 2.0. If a copy of the MPL was not distributed with this file, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
324 |
* You can obtain one at http://mozilla.org/MPL/2.0/. */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
325 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
326 |
#include "nsBuiltinDecoderStateMachine.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
327 |
#include "nsGStreamerReader.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
328 |
#include "nsGStreamerDecoder.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
329 |
+#include "nsGStreamerFormatHelper.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
330 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
331 |
nsDecoderStateMachine* nsGStreamerDecoder::CreateStateMachine() |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
332 |
{ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
333 |
return new nsBuiltinDecoderStateMachine(this, new nsGStreamerReader(this)); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
334 |
} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
335 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
336 |
+bool nsGStreamerDecoder::CanHandleMediaType(const char* aMIMEType, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
337 |
+ const char* aCodecs) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
338 |
+ return nsGStreamerFormatHelper::Instance()->CanHandleMediaType(aMIMEType, aCodecs); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
339 |
+} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
340 |
diff --git a/content/media/gstreamer/nsGStreamerDecoder.h b/content/media/gstreamer/nsGStreamerDecoder.h |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
341 |
--- a/content/media/gstreamer/nsGStreamerDecoder.h |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
342 |
+++ b/content/media/gstreamer/nsGStreamerDecoder.h |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
343 |
@@ -9,11 +9,12 @@ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
344 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
345 |
#include "nsBuiltinDecoder.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
346 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
347 |
class nsGStreamerDecoder : public nsBuiltinDecoder |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
348 |
{ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
349 |
public: |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
350 |
virtual nsMediaDecoder* Clone() { return new nsGStreamerDecoder(); } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
351 |
virtual nsDecoderStateMachine* CreateStateMachine(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
352 |
+ static bool CanHandleMediaType(const char* aMIMEType, const char* aCodecs); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
353 |
}; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
354 |
|
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
355 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
356 |
diff --git a/content/media/gstreamer/nsGStreamerFormatHelper.cpp b/content/media/gstreamer/nsGStreamerFormatHelper.cpp |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
357 |
new file mode 100644 |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
358 |
--- /dev/null |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
359 |
+++ b/content/media/gstreamer/nsGStreamerFormatHelper.cpp |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
360 |
@@ -0,0 +1,149 @@ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
361 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
362 |
+/* vim:set ts=2 sw=2 sts=2 et cindent: */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
363 |
+/* This Source Code Form is subject to the terms of the Mozilla Public |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
364 |
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
365 |
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
366 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
367 |
+#include "nsGStreamerFormatHelper.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
368 |
+#include "nsCharSeparatedTokenizer.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
369 |
+#include "nsXPCOMStrings.h" |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
370 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
371 |
+#define ENTRY_FORMAT(entry) entry[0] |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
372 |
+#define ENTRY_CAPS(entry) entry[1] |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
373 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
374 |
+nsGStreamerFormatHelper* nsGStreamerFormatHelper::gInstance = NULL; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
375 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
376 |
+nsGStreamerFormatHelper *nsGStreamerFormatHelper::Instance() { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
377 |
+ if (!gInstance) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
378 |
+ gst_init(NULL, NULL); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
379 |
+ gInstance = new nsGStreamerFormatHelper(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
380 |
+ } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
381 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
382 |
+ return gInstance; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
383 |
+} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
384 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
385 |
+nsGStreamerFormatHelper::nsGStreamerFormatHelper() |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
386 |
+ : mFactories(NULL), |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
387 |
+ mCookie(0) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
388 |
+{ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
389 |
+ const char *containers[3][2] = { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
390 |
+ {"video/mp4", "video/quicktime"}, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
391 |
+ {"audio/mp4", "audio/mpeg, mpegversion=(int)4"}, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
392 |
+ {"audio/mpeg", "audio/mpeg, mpegversion=(int)1"}, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
393 |
+ }; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
394 |
+ memcpy(mContainers, containers, sizeof(containers)); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
395 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
396 |
+ const char *codecs[7][2] = { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
397 |
+ {"avc1.42E01E", "video/x-h264"}, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
398 |
+ {"avc1.42001E", "video/x-h264"}, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
399 |
+ {"avc1.58A01E", "video/x-h264"}, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
400 |
+ {"avc1.4D401E", "video/x-h264"}, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
401 |
+ {"avc1.64001E", "video/x-h264"}, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
402 |
+ {"mp4a.40.2", "audio/mpeg, mpegversion=(int)4"}, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
403 |
+ {"mp3", "audio/mpeg, mpegversion=(int)1"}, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
404 |
+ }; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
405 |
+ memcpy(mCodecs, codecs, sizeof(codecs)); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
406 |
+} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
407 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
408 |
+nsGStreamerFormatHelper::~nsGStreamerFormatHelper() { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
409 |
+ if (mFactories) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
410 |
+ g_list_free(mFactories); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
411 |
+} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
412 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
413 |
+bool nsGStreamerFormatHelper::CanHandleMediaType(const char* aMIMEType, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
414 |
+ const char *aCodecs) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
415 |
+ GstCaps *caps = ConvertFormatsToCaps(aMIMEType, aCodecs); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
416 |
+ if (!caps) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
417 |
+ return false; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
418 |
+ } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
419 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
420 |
+ bool ret = HaveElementsToProcessCaps(caps); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
421 |
+ gst_caps_unref(caps); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
422 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
423 |
+ return ret; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
424 |
+} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
425 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
426 |
+GstCaps *nsGStreamerFormatHelper::ConvertFormatsToCaps(const char *aMIMEType, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
427 |
+ const char *aCodecs) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
428 |
+ unsigned int i; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
429 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
430 |
+ /* convert aMIMEType to gst container caps */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
431 |
+ const char *capsString = NULL; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
432 |
+ for (i = 0; i < G_N_ELEMENTS(mContainers); i++) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
433 |
+ if (!strcmp(ENTRY_FORMAT(mContainers[i]), aMIMEType)) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
434 |
+ capsString = ENTRY_CAPS(mContainers[i]); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
435 |
+ break; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
436 |
+ } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
437 |
+ } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
438 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
439 |
+ if (!capsString) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
440 |
+ /* we couldn't find any matching caps */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
441 |
+ return NULL; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
442 |
+ } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
443 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
444 |
+ GstCaps *caps = gst_caps_from_string(capsString); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
445 |
+ /* container only */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
446 |
+ if (!aCodecs) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
447 |
+ return caps; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
448 |
+ } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
449 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
450 |
+ nsDependentCSubstring codecs(aCodecs, strlen(aCodecs)); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
451 |
+ nsCCharSeparatedTokenizer tokenizer(codecs, ','); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
452 |
+ while (tokenizer.hasMoreTokens()) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
453 |
+ const nsCSubstring& codec = tokenizer.nextToken(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
454 |
+ capsString = NULL; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
455 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
456 |
+ for (i = 0; i < G_N_ELEMENTS(mCodecs); i++) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
457 |
+ if (codec.Equals(ENTRY_FORMAT(mCodecs[i]))) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
458 |
+ capsString = ENTRY_CAPS(mCodecs[i]); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
459 |
+ break; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
460 |
+ } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
461 |
+ } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
462 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
463 |
+ if (!capsString) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
464 |
+ gst_caps_unref(caps); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
465 |
+ return NULL; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
466 |
+ } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
467 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
468 |
+ GstCaps *tmp = gst_caps_from_string(capsString); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
469 |
+ /* appends and frees tmp */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
470 |
+ gst_caps_append(caps, tmp); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
471 |
+ } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
472 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
473 |
+ return caps; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
474 |
+} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
475 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
476 |
+bool nsGStreamerFormatHelper::HaveElementsToProcessCaps(GstCaps *aCaps) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
477 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
478 |
+ GList *factories = GetFactories(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
479 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
480 |
+ GList *list; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
481 |
+ /* here aCaps contains [containerCaps, [codecCaps1, [codecCaps2, ...]]] so process |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
482 |
+ * caps structures individually as we want one element for _each_ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
483 |
+ * structure */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
484 |
+ for (unsigned int i = 0; i < gst_caps_get_size(aCaps); i++) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
485 |
+ GstStructure *s = gst_caps_get_structure(aCaps, i); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
486 |
+ GstCaps *caps = gst_caps_new_full(gst_structure_copy(s), NULL); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
487 |
+ list = gst_element_factory_list_filter (factories, caps, GST_PAD_SINK, FALSE); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
488 |
+ gst_caps_unref(caps); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
489 |
+ if (!list) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
490 |
+ return false; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
491 |
+ } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
492 |
+ g_list_free(list); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
493 |
+ } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
494 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
495 |
+ return true; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
496 |
+} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
497 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
498 |
+GList * nsGStreamerFormatHelper::GetFactories() { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
499 |
+ uint32_t cookie = gst_default_registry_get_feature_list_cookie (); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
500 |
+ if (cookie != mCookie) { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
501 |
+ g_list_free(mFactories); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
502 |
+ mFactories = gst_element_factory_list_get_elements |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
503 |
+ (GST_ELEMENT_FACTORY_TYPE_DEMUXER | GST_ELEMENT_FACTORY_TYPE_DECODER, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
504 |
+ GST_RANK_MARGINAL); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
505 |
+ mCookie = cookie; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
506 |
+ } |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
507 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
508 |
+ return mFactories; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
509 |
+} |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
510 |
diff --git a/content/media/gstreamer/nsGStreamerFormatHelper.h b/content/media/gstreamer/nsGStreamerFormatHelper.h |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
511 |
new file mode 100644 |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
512 |
--- /dev/null |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
513 |
+++ b/content/media/gstreamer/nsGStreamerFormatHelper.h |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
514 |
@@ -0,0 +1,37 @@ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
515 |
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
516 |
+/* vim:set ts=2 sw=2 sts=2 et cindent: */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
517 |
+/* This Source Code Form is subject to the terms of the Mozilla Public |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
518 |
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
519 |
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
520 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
521 |
+#if !defined(nsGStreamerFormatHelper_h_) |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
522 |
+#define nsGStreamerFormatHelper_h_ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
523 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
524 |
+#include <gst/gst.h> |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
525 |
+#include <mozilla/Types.h> |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
526 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
527 |
+class nsGStreamerFormatHelper { |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
528 |
+ public: |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
529 |
+ static nsGStreamerFormatHelper *Instance(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
530 |
+ ~nsGStreamerFormatHelper(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
531 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
532 |
+ bool CanHandleMediaType(const char *aMIMEType, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
533 |
+ const char *aCodecs); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
534 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
535 |
+ private: |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
536 |
+ nsGStreamerFormatHelper(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
537 |
+ GstCaps *ConvertFormatsToCaps(const char *aMIMEType, |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
538 |
+ const char *aCodecs); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
539 |
+ char * const *CodecListFromCaps(GstCaps *aCaps); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
540 |
+ bool HaveElementsToProcessCaps(GstCaps *aCaps); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
541 |
+ GList *GetFactories(); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
542 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
543 |
+ static nsGStreamerFormatHelper *gInstance; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
544 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
545 |
+ const char *mContainers[3][2]; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
546 |
+ const char *mCodecs[7][2]; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
547 |
+ GList *mFactories; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
548 |
+ uint32_t mCookie; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
549 |
+}; |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
550 |
+ |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
551 |
+#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
552 |
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
553 |
--- a/modules/libpref/src/init/all.js |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
554 |
+++ b/modules/libpref/src/init/all.js |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
555 |
@@ -164,17 +164,17 @@ pref("media.wave.enabled", true); |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
556 |
#endif |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
557 |
#ifdef MOZ_WEBM |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
558 |
pref("media.webm.enabled", true); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
559 |
#endif |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
560 |
#ifdef MOZ_DASH |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
561 |
pref("media.dash.enabled", true); |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
562 |
#endif |
529
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
563 |
#ifdef MOZ_GSTREAMER |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
564 |
-pref("media.h264.enabled", true); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
565 |
+pref("media.gstreamer.enabled", true); |
4812378b5646
import GStreamer improvement from bmo#760140 (support mpeg audio)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
566 |
#endif |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
567 |
#ifdef MOZ_WEBRTC |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
568 |
pref("media.navigator.enabled", false); |
568
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
569 |
pref("media.peerconnection.enabled", false); |
2c74c5927ea2
first working Aurora 18 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
541
diff
changeset
|
570 |
pref("media.navigator.permission.disabled", false); |
541
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
571 |
#else |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
572 |
#ifdef ANDROID |
830e50bbfc79
working Aurora 17.0 build
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
529
diff
changeset
|
573 |
pref("media.navigator.enabled", true); |