author | Wolfgang Rosenauer <wr@rosenauer.org> |
Thu, 04 Oct 2012 11:53:54 +0200 | |
changeset 548 | 55cd16b450d2 |
parent 515 | 0f6539389500 |
child 568 | 2c74c5927ea2 |
permissions | -rw-r--r-- |
470
983544dc8af4
Crash with HTML 5 video with gstreamer enabled (bmo#761030)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
515 | 2 |
# Parent e4b87e710b1a5f0bb7db058911bc163b4bf30227 |
470
983544dc8af4
Crash with HTML 5 video with gstreamer enabled (bmo#761030)
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
# User Wolfgang Rosenauer <wr@rosenauer.org> |
512
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
4 |
No Bug - use GStreamer _only_ for MP4 (not WebM/OGG) |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
5 |
|
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
6 |
diff --git a/content/html/content/src/nsHTMLMediaElement.cpp b/content/html/content/src/nsHTMLMediaElement.cpp |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
7 |
--- a/content/html/content/src/nsHTMLMediaElement.cpp |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
8 |
+++ b/content/html/content/src/nsHTMLMediaElement.cpp |
515 | 9 |
@@ -2277,21 +2277,17 @@ nsHTMLMediaElement::CreateDecoder(const |
512
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
10 |
nsRefPtr<nsRawDecoder> decoder = new nsRawDecoder(); |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
11 |
if (decoder->Init(this)) { |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
12 |
return decoder.forget(); |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
13 |
} |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
14 |
} |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
15 |
#endif |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
16 |
#ifdef MOZ_OGG |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
17 |
if (IsOggType(aType)) { |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
18 |
-#ifdef MOZ_GSTREAMER |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
19 |
- nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
20 |
-#else |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
21 |
nsRefPtr<nsOggDecoder> decoder = new nsOggDecoder(); |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
22 |
-#endif |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
23 |
if (decoder->Init(this)) { |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
24 |
return decoder.forget(); |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
25 |
} |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
26 |
} |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
27 |
#endif |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
28 |
#ifdef MOZ_WAVE |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
29 |
if (IsWaveType(aType)) { |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
30 |
nsRefPtr<nsWaveDecoder> decoder = new nsWaveDecoder(); |
515 | 31 |
@@ -2305,21 +2301,17 @@ nsHTMLMediaElement::CreateDecoder(const |
512
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
32 |
nsRefPtr<nsMediaPluginDecoder> decoder = new nsMediaPluginDecoder(aType); |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
33 |
if (decoder->Init(this)) { |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
34 |
return decoder.forget(); |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
35 |
} |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
36 |
} |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
37 |
#endif |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
38 |
#ifdef MOZ_WEBM |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
39 |
if (IsWebMType(aType)) { |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
40 |
-#ifdef MOZ_GSTREAMER |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
41 |
- nsRefPtr<nsGStreamerDecoder> decoder = new nsGStreamerDecoder(); |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
42 |
-#else |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
43 |
nsRefPtr<nsWebMDecoder> decoder = new nsWebMDecoder(); |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
44 |
-#endif |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
45 |
if (decoder->Init(this)) { |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
46 |
return decoder.forget(); |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
47 |
} |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
48 |
} |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
49 |
#endif |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
50 |
|
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
51 |
#ifdef MOZ_GSTREAMER |
bab27818f3a5
use gstreamer only for MP4
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
470
diff
changeset
|
52 |
if (IsH264Type(aType)) { |