--- amv.pl	2007/08/18 11:21:40	27
+++ amv.pl	2007/10/02 19:12:07	36
@@ -46,11 +46,13 @@
 my $path = shift @ARGV || die "usage: $0 movie.amv\n";
 
 # by default, flip frames
-#$jpegtran = '-flip vertical' unless defined($jpegtran);
+$jpegtran = '-flip vertical' unless defined($jpegtran);
 
 rmtree $dump_dir if -e $dump_dir;
 mkpath $dump_dir || die "can't create $dump_dir: $!";
 
+$| = 1;
+
 open(my $fh, '<', $path) || die "can't open $path: $!";
 
 # offset in file
@@ -121,16 +123,20 @@
 	}
 }
 
+# my $len = next_part( 'boob' );
+# my ( $len, $part ) = next_part();
+
 sub next_part {
 	my ( $expected_part, $expected_len, $skip ) = @_;
 	my ( $part, $len ) = x(8,'A4V');
 	return unless $len;
-	confess "not $expected_part but $part" if $expected_part ne $part;
+	confess "not $expected_part but $part" if $expected_part && $expected_part ne $part;
 	if ( $expected_len ) {
 		confess "expected $expected_len bytes for $part got $len" if $len != $expected_len;
 	}
 	printf "## next_part %s - %d 0x%x bytes\n", $part, $len, $len if $debug;
 	x($len) if $skip;
+	return ( $len, $part )  if wantarray;
 	return $len;
 }
 
@@ -157,69 +163,6 @@
 	return $out;
 }
 
-sub mp3_frame {
-	my $frame = join('',
-		# Frame sync (all bits set)
-		1 x 11 .
-		# MPEG Audio version ID
-		# 00 - MPEG Version 2.5 (unofficial)
-		# 01 - reserved
-		# 10 - MPEG Version 2 (ISO/IEC 13818-3)
-		# 11 - MPEG Version 1 (ISO/IEC 11172-3)
-		1,0,
-		# Layer description
-		# 00 - reserved
-		# 01 - Layer III
-		# 10 - Layer II
-		# 11 - Layer I
-		0,1,
-		# Protection bit
-		# 0 - Protected by CRC (16bit crc follows header)
-		# 1 - Not protected
-		0,
-		# Bitrate index
-		0,0,0,0,
-		# Sampling rate frequency index (22050)
-		0,0,
-		# Padding bit
-		# 0 - frame is not padded
-		# 1 - frame is padded with one extra slot
-		0,
-		# Private bit
-		0,
-		# Channel Mode
-		# 00 - Stereo
-		# 01 - Joint stereo (Stereo)
-		# 10 - Dual channel (2 mono channels)
-		# 11 - Single channel (Mono)
-		1,1,
-		# Mode extension (Only if Joint stereo)
-		0,0,
-		# Copyright
-		0,
-		# Original
-		0,
-		# Emphasis
-		# 00 - none
-		# 01 - 50/15 ms
-		# 10 - reserved
-		# 11 - CCIT J.17
-		0,0,
-	);
-
-	die "frame must have 32 bits, not ", length($frame), " for $frame" if length($frame) != 32;
-
-	my $bits = pack("b32", $frame);
-
-	die "packed bits must be 4 bytes, not $bits" if length($bits) != 4;
-
-	my $t = $frame;
-	$t =~ s/(.{8})/$1 /g;
-	warn "## mp3 frame frame = $t\n";
-
-	return $bits;
-}
-
 my @subframes;
 my $frame_nr = 1;
 
@@ -387,47 +330,121 @@
 	print ">> created $frame_nr ", $no_jpeg_header ? 'raw' : '', " jpeg $path ", -s $path, " bytes\n" if $verbose;
 }
 
-my ( $riff, $amv ) = x(12, 'Z4x4Z4');
-die "$path not RIFF but $riff" if $riff ne 'RIFF';
-die "$path not AMV but $amv" if $amv ne 'AMV ';
+#
+# IMA ADPCM decoder
+#
+
+my @index_adjust = ( -1, -1, -1, -1, 2, 4, 6, 8 );
+
+my @step_size = (
+	7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
+	19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
+	50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
+	130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
+	337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
+	876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
+	2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
+	5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
+	15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
+);
 
-my $apath = "$dump_dir/audio.wav";
-open(my $audio_fh, '>', $apath) || die "can't open audio file $apath: $!";
+my $pred_val = 0;
+my $step_idx = 0;
 
-print $audio_fh pack 'a4Va4a4VvvVVv4', (
-	# header 'RIFF', size
-	'RIFF',-1,
-	# type: 'WAVE'
-	'WAVE',
-	'fmt ',0x14,
-	# format: DVI (IMA) ADPCM Wave Type
-	0x11,
-	# channels
-	1,
-	# samples/sec
+# This code is "borrowed" from the ALSA library 
+# http://www.alsa-project.org
+
+sub adpcm_decode_sample {
+	my $code = shift;
+
+	my $pred_diff;	# Predicted difference to next sample
+	my $step;		# holds previous step_size value
+
+	# Separate sign and magnitude
+	my $sign = $code & 0x8;
+	$code &= 0x7;
+
+	# Computes pred_diff = (code + 0.5) * step / 4,
+	# but see comment in adpcm_coder.
+
+	$step = $step_size[$step_idx] || die "no step_size[$step_idx]";
+
+	# Compute difference and new predicted value 
+	$pred_diff = $step >> 3;
+	my $i = 0x4;
+	while( $i ) {
+		if ($code & $i) {
+			$pred_diff += $step;
+		}
+		$i >>= 1;
+		$step >>= 1;
+	}
+	$pred_val += $sign ? -$pred_diff : $pred_diff;
+
+	# Clamp output value 
+	if ($pred_val > 32767) {
+		$pred_val = 32767;
+	} elsif ($pred_val < -32768) {
+		$pred_val = -32768;
+	}
+
+	# Find new step_size index value
+	$step_idx += $index_adjust[$code];
+
+	if ($step_idx < 0) {
+		$step_idx = 0;
+	} elsif ($step_idx > 88) {
+		$step_idx = 88;
+	}
+	return $pred_val;
+}
+
+my $au_path = "$dump_dir/sound.au";
+open(my $au_fh, '>', $au_path) || die "can't open $au_path: $!";
+print $au_fh pack 'a4N5', (
+	# magic
+	'.snd',
+	# data offset
+	24,
+	# data size
+	-1,
+	# encoding - 16-bit linear PCM
+	3,
+	# sample rate
 	22050,
-	# avg. bytes/sec (for esimation)
-	11567,
-	# block align (size of block)
-	0x800,
-	# bits per sample (mono data)
-	4,
-	# cbSize (ADPCM with 7 soefficient pairs)
-	2,
-	# nSamplesPerBlock
-	# (((nBlockAlign - (7 * nChannels)) * 8) / (wBitsPerSample * nChannels)) + 2
-	0x0ff9,
+	#channels
+	1,
 );
 
-print $audio_fh pack 'a4VVa4V', (
-	# time length of the data in samples
-	'fact',4,
-	220500,
-	#
-	'data',-1,
-);
+sub audio_frame {
+	my $data = shift || die "no data?";
+
+	my ( $origin, $index, $bytes ) = unpack 'ssL', substr($data,0,8);
 
-my $riff_header_len = tell($audio_fh);
+	$pred_val = $origin;
+	$step_idx = $index;
+
+	my $size = 0;
+
+	foreach my $b ( map { ord($_) } split(//, substr($data,8)) ) {
+		print $au_fh pack 'n', adpcm_decode_sample( $b >> 4 );		
+		print $au_fh pack 'n', adpcm_decode_sample( $b & 15 );		
+		$size += 2;
+	}
+
+	warn "length isn't corrent $bytes != $size" if $debug && $bytes != $size;
+}
+
+#
+# read AMV file
+#
+
+my ( $riff, $amv ) = x(12, 'Z4x4Z4');
+die "$path not RIFF but $riff" if $riff ne 'RIFF';
+die "$path not AMV but $amv" if $amv ne 'AMV ';
+
+my $fps = 16;
+my $duration;
 
 while ( ! defined($d->{eof}) ) {
 	my ( $list, $name ) = x(12,'A4x4A4');
@@ -446,12 +463,15 @@
 			$h->{$n} = $v;
 		} x($len, 'Vx28VVVx8CCv');
 
-		printf "## %s %d*%d %s fps (%d ms/frame) %02d:%02d:%02d\n",
+		$duration = sprintf('%02d:%02d:%02d', $h->{hh}, $h->{mm}, $h->{ss} );
+
+		printf "## %s %d*%d %s fps (%d ms/frame) %s\n",
 			$path,
 			$h->{width}, $h->{height}, $h->{fps}, $h->{ms_per_frame},
-			$h->{hh}, $h->{mm}, $h->{ss};
+			$duration;
 
 		$d->{amvh} = $h;
+		$fps = $h->{fps};
 
 	} elsif ( $name eq 'strl' ) {
 
@@ -460,36 +480,55 @@
 
 	} elsif ( $name eq 'movi' ) {
 
-		while (1) {
+		my $have_parts = 1;
+
+		while ( $have_parts ) {
 			my $frame = $d->{movi}++;
-		
-			my $len = next_part( '00dc' );
-			last unless $len;
-			printf "<< %s 00dc - part %d jpeg %d 0x%x bytes\n", $name, $frame, $len, $len if $verbose;
-			mkjpg( x($len) );
-
-			$len = next_part( '01wb' );
-			printf "<< %s 01wb - part %d audio %d 0x%x bytes\n", $name, $frame, $len, $len if $verbose;
-
-			my $audio_frame = x( $len );
-
-			if ( $dump_audio ) {
-				printf "#### dumping audio frame %d 0x%x bytes\n", length($audio_frame), length($audio_frame);
-				hex_dump( $audio_frame );
-			}
 
-			# remove 8 bytes of something
-			$audio_frame = substr( $audio_frame, 8 );
+			my $parts = 0;
 
-			if ( length($audio_frame) % 2 == 0 ) {
-				print "#### even sized frame!";
-#				$audio_frame = substr( $audio_frame, 0, -1 );
-			}
+			while ( $parts < 2 ) {
+
+				my ( $len, $part ) = next_part();
 
-#			print $audio_fh mp3_frame;
-			print $audio_fh $audio_frame || die "can't write audio frame in $apath: $!";
+				if ( ! $len ) {
+					$have_parts = 0;
+					last;
+				}
+
+				if ( $part eq '00dc' ) {
+
+					printf "<< %s 00dc - part %d jpeg %d 0x%x bytes\n", $name, $frame, $len, $len if $verbose;
+					mkjpg( x($len) );
+					$parts++;
+
+				} elsif ( $part eq '01wb' ) {
+					printf "<< %s 01wb - part %d audio %d 0x%x bytes\n", $name, $frame, $len, $len if $verbose;
+
+					my $audio_frame = x( $len );
+
+					if ( $dump_audio ) {
+						printf "#### dumping audio frame %d 0x%x bytes\n", length($audio_frame), length($audio_frame);
+						hex_dump( $audio_frame );
+					}
+
+		#			print $audio_fh mp3_frame;
+					audio_frame( $audio_frame );
+
+					$parts++;
+				} else {
+					warn "unknown next part $part with $len bytes, skipping!";
+				}
+
+				warn "## #$frame_nr $name $part has $parts parts\n" if $debug;
+			}
 
 			$frame_nr++;
+
+			if ( $frame_nr % $fps == 0 ) {
+				print "\n" if ( ( $frame_nr / $fps ) % 60 == 0 );
+				print ".";
+			}
 		};
 
 	} else {
@@ -497,17 +536,13 @@
 	}
 }
 
-my $cmd = "ffmpeg -i $dump_dir/%04d.jpg -r 16 -y $dump_avi";
-system($cmd) == 0 || die "can't convert frames to avi using $cmd: $!";
-
-my $size = tell($audio_fh);
-warn "## wav file size: $size\n";
-
-seek( $audio_fh, 4, 0 );
-print $audio_fh pack("V", $size - 8);
-seek( $audio_fh, $riff_header_len - 4, 0 );
-print $audio_fh pack("V", $size - $riff_header_len);
+if ( $fps == 12 ) {
+	warn "fixup $au_path for $fps fps -- 16000 Hz\n";
+	seek($au_fh, 16, 0);	# sample rate offset
+	print $au_fh pack 'N', 16000;
+}
 
-close($audio_fh) || die "can't close audio file $apath: $!";
+my $cmd = "ffmpeg -r $fps -i $dump_dir/%04d.jpg -i $au_path -y $dump_avi";
+system($cmd) == 0 || die "can't convert frames to avi using $cmd: $!";
 
-print ">>>> created $frame_nr frames $dump_avi ", -s $dump_avi, " and $apath ", -s $apath, "\n";
+print ">>>> created $frame_nr frames $dump_avi ", -s $dump_avi, "\n";