IVF fix warnings, improve framerate

Author: JamesHeinrich

getid3/getid3.php

@@ -387,7 +387,7 @@ class getID3
 	 */
 	protected $startup_warning = '';
 
-	const VERSION           = '1.9.24-202510171248';
+	const VERSION           = '1.9.24-202510231324';
 	const FREAD_BUFFER_SIZE = 32768;
 
 	const ATTACHMENTS_NONE   = false;
@@ -1951,6 +1951,12 @@ public function ChannelsBitratePlaytimeCalculations() {
 		if (!empty($this->info['playtime_seconds']) && empty($this->info['playtime_string'])) {
 			$this->info['playtime_string'] = getid3_lib::PlaytimeString($this->info['playtime_seconds']);
 		}
+
+		// Look up codec name if fourcc is set but codec is not
+		if (!empty($this->info['video']['fourcc']) && !isset($this->info['video']['codec'])) {
+			$this->include_module('audio-video.riff');
+			$this->info['video']['codec'] = getid3_riff::fourccLookup($this->info['video']['fourcc']);
+		}
 	}
 
 	/**

getid3/module.audio-video.ivf.php

@@ -33,7 +33,7 @@ public function Analyze() {
 
 		if (substr($IVFheader, 0, 4) == 'DKIF') {
 
-			// https://wiki.multimedia.cx/index.php/IVF
+			// https://wiki.multimedia.cx/index.php/Duck_IVF
 			$info['ivf']['header']['signature']            =                              substr($IVFheader,  0, 4);
 			$info['ivf']['header']['version']              = getid3_lib::LittleEndian2Int(substr($IVFheader,  4, 2)); // should be 0
 			$info['ivf']['header']['headersize']           = getid3_lib::LittleEndian2Int(substr($IVFheader,  6, 2));
@@ -51,10 +51,6 @@ public function Analyze() {
 				$this->warning('Expecting IVF header version 0, found version '.$info['ivf']['header']['version'].', results may not be accurate');
 			}
 
-			$info['video']['resolution_x']    =         $info['ivf']['header']['resolution_x'];
-			$info['video']['resolution_y']    =         $info['ivf']['header']['resolution_y'];
-			$info['video']['codec']           =         $info['ivf']['header']['fourcc'];
-
 			$info['ivf']['frame_count'] = 0;
 			$timestamp                  = 0;
 			while (!$this->feof()) {
@@ -65,9 +61,17 @@ public function Analyze() {
 					$info['ivf']['frame_count']++;
 				}
 			}
-			if ($info['ivf']['frame_count'] && $info['playtime_seconds']) {
-				$info['playtime_seconds']    = $timestamp / 100000;
-				$info['video']['frame_rate'] = (float) $info['ivf']['frame_count'] / $info['playtime_seconds'];
+			//if ($info['ivf']['frame_count'] && $timestamp) {
+			//	$info['playtime_seconds']    = $timestamp / 100000;
+			//	$info['video']['frame_rate'] = (float) $info['ivf']['frame_count'] / $info['playtime_seconds'];
+			//}
+
+			$info['video']['resolution_x'] = $info['ivf']['header']['resolution_x'];
+			$info['video']['resolution_y'] = $info['ivf']['header']['resolution_y'];
+			$info['video']['fourcc']       = $info['ivf']['header']['fourcc'];
+			if ($info['ivf']['header']['frame_count'] && $info['ivf']['header']['frame_rate']) {
+				$info['video']['frame_rate'] = (float) $info['ivf']['header']['frame_rate'];
+				$info['playtime_seconds']    = (float) $info['ivf']['frame_count'] / $info['ivf']['header']['frame_rate'];
 			}
 
 		} else {

getid3/module.audio-video.riff.php

@@ -2825,6 +2825,10 @@ public static function fourccLookup($fourcc) {
 			VLV1	VideoLogic/PURE Digital Videologic Capture
 			VP30	On2 VP3.0
 			VP31	On2 VP3.1
+			VP50	On2 VP5
+			VP60	On2 VP6
+			VP70	On2 VP7
+			VP80	On2 VP8
 			VP6F	On2 TrueMotion VP6
 			VX1K	Lucent VX1000S Video Codec
 			VX2K	Lucent VX2000S Video Codec