Juan RP wrote:
> However it wasn't enough because it was still using ffmpeg in the
> preview stage, so using your patch and this one:
>
> --- lib/Video/DVDRip/Title.pm.orig 2007-04-19 00:46:47.000000000 +0200
> +++ lib/Video/DVDRip/Title.pm 2007-04-19 00:46:56.000000000 +0200
> @@ -3058,7 +3058,7 @@
> my $self = shift;
>
> return $self->get_take_snapshot_command_transcode
> - if not $self->exists("ffmpeg");
> + if not $self->installed_ok("ffmpeg");
>
> my $nr = $self->nr;
> my $frame = $self->preview_frame_nr;
>
> seems to execute transcode as before, now the problem is that the
> "Job and plan progress details" windows still shows errors, and
> the command finished without any error. I ran the full command
> in a terminal and worked fine too.
Ok, I see, some more changes are needed. Please try the attached patch
against vanilla 0.98.6.
Regards,
Jörn
--
Joern Reder
supporting: http://www.zyn.de/
unbelievable: http://www.exit1.org/
CPAN: http://search.cpan.org/~jred/
Index: lib/Video/DVDRip/Depend.pm
===================================================================
RCS file: /home/cvsroot/dvdrip/lib/Video/DVDRip/Depend.pm,v
retrieving revision 1.22.2.7
diff -u -r1.22.2.7 Depend.pm
--- lib/Video/DVDRip/Depend.pm 14 Apr 2007 14:38:42 -0000 1.22.2.7
+++ lib/Video/DVDRip/Depend.pm 19 Apr 2007 09:34:07 -0000
@@ -107,14 +107,14 @@
command => "ffmpeg",
comment => __ "FFmpeg video converter command line program",
optional => 1,
- version_cmd => "ffmpeg --version",
+ version_cmd => "ffmpeg -version",
get_version => sub {
my ($cmd) = @_;
qx[$cmd 2>&1] =~ /version ([^\s]+)/i;
return $1;
},
convert => 'default',
- min => "0",
+ min => "0.4.10",
},
xvid4conf => {
order => ++$ORDER,
@@ -293,7 +293,7 @@
sub convert_default {
my ($ver) = @_;
- return 990000 if $ver eq 'cvs';
+ return 990000 if $ver =~ /cvs|svn/i;
$ver =~ m/(\d+)(\.(\d+))?(\.(\d+))?(\.\d+)?/;
$ver = $1 * 10000 + $3 * 100 + $5;
$ver = $ver - 1 + $6 if $6;
Index: lib/Video/DVDRip/JobPlanner.pm
===================================================================
RCS file: /home/cvsroot/dvdrip/lib/Video/DVDRip/JobPlanner.pm,v
retrieving revision 1.14.2.3
diff -u -r1.14.2.3 JobPlanner.pm
--- lib/Video/DVDRip/JobPlanner.pm 13 Apr 2007 11:28:55 -0000 1.14.2.3
+++ lib/Video/DVDRip/JobPlanner.pm 19 Apr 2007 09:34:07 -0000
@@ -460,7 +460,7 @@
if ( ( $title->project->rip_mode ne 'rip' ||
!$title->has_vob_nav_file ||
$title->tc_force_slow_grabbing )
- and not $self->exists("ffmpeg") ) {
+ and not $self->has("ffmpeg") ) {
$progress_ips = __"fps";
$progress_max = $title->preview_frame_nr;
$slow_mode = 1;
@@ -498,7 +498,7 @@
);
}
}
- if ( $self->exists("ffmpeg") and $buffer =~ /frame=\s*1.*?q\s*=/ )
{
+ if ( $self->has("ffmpeg") and $buffer =~ /frame=\s*1.*?q\s*=/ ) {
$got_frame_with_ffmpeg = 1;
}
},
@@ -513,7 +513,7 @@
},
post_callbacks => sub {
my ($job) = @_;
- if ( $self->exists("ffmpeg") and not $got_frame_with_ffmpeg ) {
+ if ( $self->has("ffmpeg") and not $got_frame_with_ffmpeg ) {
$job->set_error_message (
__ ("transcode can't find this frame. ").
__ ("Try a lower frame number. ").
Index: lib/Video/DVDRip/Title.pm
===================================================================
RCS file: /home/cvsroot/dvdrip/lib/Video/DVDRip/Title.pm,v
retrieving revision 1.180.2.4
diff -u -r1.180.2.4 Title.pm
--- lib/Video/DVDRip/Title.pm 13 Apr 2007 11:29:09 -0000 1.180.2.4
+++ lib/Video/DVDRip/Title.pm 19 Apr 2007 09:34:07 -0000
@@ -3058,7 +3058,7 @@
my $self = shift;
return $self->get_take_snapshot_command_transcode
- if not $self->exists("ffmpeg");
+ if not $self->has("ffmpeg");
my $nr = $self->nr;
my $frame = $self->preview_frame_nr;
pgp0cuk4YeyTU.pgp
Description: PGP signature
|
DOCUMENTATION
TABLE OF CONTENTS