Removed the (faulty) fps extraction completely

riotfamily · Nov 7, 2012 · d3078d1 · d3078d1
1 parent 46ee6d3
commit d3078d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/media/src/org/riotfamily/media/processing/FFmpeg.java b/media/src/org/riotfamily/media/processing/FFmpeg.java
@@ -40,7 +40,7 @@ public class FFmpeg implements InitializingBean {
 			"bitrate: (\\d+) kb/s");
 
 	private static final Pattern VIDEO_PATTERN = Pattern.compile(
-			"Video: (\\w+).*?(\\d+)x(\\d+).*?(\\d+\\.?\\d?k?) (fps|tb\\(r\\)|tbr)");
+			"Video: (\\w+).*?(\\d+)x(\\d+)");
 
 	private static final Pattern AUDIO_PATTERN = Pattern.compile(
 			"Audio: (\\w+).*?(\\d+) Hz, (mono|stereo)");
@@ -108,7 +108,6 @@ public VideoMetaData identify(File file) throws IOException {
 			meta.setVideoCodec(m.group(1));
 			meta.setWidth(Integer.parseInt(m.group(2)));
 			meta.setHeight(Integer.parseInt(m.group(3)));
-			meta.setFps(Float.parseFloat(m.group(4)));
 		}
 
 		m = AUDIO_PATTERN.matcher(out);

diff --git a/media/src/org/riotfamily/media/riot/form/VideoUpload$PreviewElement.ftl b/media/src/org/riotfamily/media/riot/form/VideoUpload$PreviewElement.ftl
@@ -6,7 +6,7 @@
 			<tbody>
 				<tr><td class="label">Name</td><td class="value">${element.video.fileName}</td></tr>
 				<tr><td class="label">Size</td><td class="value">${element.video.width} &times; ${element.video.height} (${element.video.formatedSize})</td></tr>
-				<tr><td class="label">Video</td><td class="value">${element.video.videoCodec!} ${element.video.fps} fps</td></tr>
+				<tr><td class="label">Video</td><td class="value">${element.video.videoCodec!}</td></tr>
 				<#if element.video.audioCodec??>
 					<tr><td class="label">Audio</td><td class="value">${element.video.audioCodec} ${element.video.samplingRate} Hz ${element.video.stereo?string('Stereo','Mono')}</td></tr>
 				</#if>