Author: andre
Date: 2010-06-14 12:00:20 +0200 (Mon, 14 Jun 2010)
New Revision: 42541
Modified:
mmbase/trunk/applications/media/src/main/config/media/mimemapping.xml
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/Codec.java
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/Format.java
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs.properties
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs_nl.properties
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/formats.properties
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/formats_nl.properties
Log:
adding format and codec for WebM/VP8
Modified: mmbase/trunk/applications/media/src/main/config/media/mimemapping.xml
===================================================================
--- mmbase/trunk/applications/media/src/main/config/media/mimemapping.xml
2010-06-14 09:51:14 UTC (rev 42540)
+++ mmbase/trunk/applications/media/src/main/config/media/mimemapping.xml
2010-06-14 10:00:20 UTC (rev 42541)
@@ -18,6 +18,8 @@
<map format="oga" codec="*">audio/ogg</map>
<map format="ogv" codec="*">video/ogg</map>
+ <map format="webm" codec="*">video/webm</map>
+
<map format="aif" codec="*">audio/x-aif</map>
<map format="asf" codec="*">video/x-ms-asf</map>
<map format="avi" codec="*">video/avi</map>
@@ -43,7 +45,7 @@
<map format="mpeg" codec="*">video/mpeg</map>
<map format="mp3" codec="*">audio/mpeg</map>
<map format="mpg" codec="*">video/mpeg</map>
- <map format="ts" codec="*">video/MP2T</map>
+ <map format="ts" codec="*">video/MP2T</map>
<map format="m3u" codec="*">audio/x-mpegurl</map>
<map format="m3u8" codec="*">application/x-mpegurl</map>
Modified:
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/Codec.java
===================================================================
---
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/Codec.java
2010-06-14 09:51:14 UTC (rev 42540)
+++
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/Codec.java
2010-06-14 10:00:20 UTC (rev 42541)
@@ -57,8 +57,9 @@
WMV1(110), // Windows Media Video 7
WMV2(111), // Windows Media Video 8
WMV3(112), // Windows Media Video 9
- XVID(113);
-
+ XVID(113),
+ VPX(114);
+
private static Logger log = Logging.getLoggerInstance(Codec.class);
public final static String RESOURCE =
"org.mmbase.applications.media.resources.codecs";
Modified:
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/Format.java
===================================================================
---
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/Format.java
2010-06-14 09:51:14 UTC (rev 42540)
+++
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/Format.java
2010-06-14 10:00:20 UTC (rev 42541)
@@ -63,6 +63,8 @@
OGV (31),
OGA (32),
+
+ WEBM (40),
PODCAST(50),
VODCAST(51),
@@ -83,7 +85,7 @@
/* a few more audio formats */
AAC(200),
FLAC(201),
-
+
/* others */
M3U(501),
M3U8(502),
@@ -169,7 +171,7 @@
{
put("AIF", "AIFF");
put("JPG", "JPEG");
- put("TIF", "TIFF");
+ put("TIF", "TIFF");
}
};
@@ -203,7 +205,7 @@
public boolean isWindowsMedia() {
return windowsMedia.contains(this);
}
-
+
public List<Format> getSimilar() {
if (isReal()) {
return real;
Modified:
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs.properties
===================================================================
---
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs.properties
2010-06-14 09:51:14 UTC (rev 42540)
+++
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs.properties
2010-06-14 10:00:20 UTC (rev 42541)
@@ -31,3 +31,4 @@
WMV2=mwv2
WMV3=wmv3
XVID=xvid
+VPX=vpx
Modified:
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs_nl.properties
===================================================================
---
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs_nl.properties
2010-06-14 09:51:14 UTC (rev 42540)
+++
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/codecs_nl.properties
2010-06-14 10:00:20 UTC (rev 42541)
@@ -31,3 +31,4 @@
WMV2=mwv2
WMV3=wmv3
XVID=xvid
+VPX=vpx
Modified:
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/formats.properties
===================================================================
---
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/formats.properties
2010-06-14 09:51:14 UTC (rev 42540)
+++
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/formats.properties
2010-06-14 10:00:20 UTC (rev 42541)
@@ -31,6 +31,7 @@
MID=Midi
OGV=OGV (Theora)
OGA=OGA (Vorbis)
+WEBM=WebM (WebM/VP8)
PODCAST=Podcast
VODCAST=Vodcast
M4A=m4a
Modified:
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/formats_nl.properties
===================================================================
---
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/formats_nl.properties
2010-06-14 09:51:14 UTC (rev 42540)
+++
mmbase/trunk/applications/media/src/main/java/org/mmbase/applications/media/resources/formats_nl.properties
2010-06-14 10:00:20 UTC (rev 42541)
@@ -31,6 +31,7 @@
MID=Midi
OGV=OGV (Theora)
OGA=OGA (Vorbis)
+WEBM=WebM (WebM/VP8)
PODCAST=Podcast
VODCAST=Vodcast
M4A=m4a
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
