Changeset 25037 for lang

Timestamp:

11/27/08 10:48:51 (5 years ago)

Author:

daisuke

Message:

Massive renaming

Location:

lang/perl/Video-LibAvformat/trunk

Files:

• LibAvformat.xs (moved) (moved from lang/perl/Video-LibAvformat/trunk/Avcodec.xs) (1 diff)
• Makefile.PL (modified) (8 diffs)
• lib/Video/Avcodec (deleted)
• lib/Video/LibAvcodec (added)
• lib/Video/LibAvformat (added)
• lib/Video/LibAvformat.pm (moved) (moved from lang/perl/Video-LibAvformat/trunk/lib/Video/Avcodec.pm) (4 diffs)
• perl-avformat.h (moved) (moved from lang/perl/Video-LibAvformat/trunk/perl_avcodec.h) (1 diff)
• t/00_compile.t (modified) (1 diff)
• t/01_basic.t (modified) (1 diff)

lang/perl/Video-LibAvformat/trunk/LibAvformat.xs

@@ -3 +3 @@
 #include "XSUB.h"
 
-#include "perl_avcodec.h"
+#include "perl-avformat.h"
 
-MODULE = Video::Avcodec          PACKAGE = Video::Avcodec       PREFIX = av_
+MODULE = Video::LibAvformat          PACKAGE = Video::LibAvformat       PREFIX = av_
 
 PROTOTYPES: DISABLED
 
-int
-av_get_bits_per_sample_format(enum SampleFormat sample_fmt);
+MODULE = Video::LibAvformat          PACKAGE = Video::LibAvformat::Const
 
+PROTOTYPES: ENABLED
 
-MODULE = Video::Avcodec          PACKAGE = Video::Avcodec::Const
+INCLUDE: avformat-const.inc
+
+MODULE = Video::LibAvformat          PACKAGE = Video::LibAvcodec::Const
 
 PROTOTYPES: ENABLED
 
 INCLUDE: avcodec-const.inc
+

lang/perl/Video-LibAvformat/trunk/Makefile.PL

@@ -2 +2 @@
 use ExtUtils::MakeMaker;
 
-my $INCDIR;
-my $HEADER;
-my $CONSTFILE = 'avcodec-const.inc';
-my $CONSTPM   = 'lib/Video/Avcodec/Const.pm';
-
+use File::Spec;
+
+my %CONFIG = (
+    avcodec => {
+        incdir    => undef,
+        header    => undef,
+        constfile => 'avcodec-const.inc',
+        constpm   => File::Spec->catfile(qw(lib Video LibAvcodec Const.pm)),
+    },
+    avformat => {
+        incdir    => undef,
+        header    => undef,
+        constfile => 'avformat-const.inc',
+        constpm   => File::Spec->catfile(qw(lib Video LibAvformat Const.pm)),
+    },
+);
 
 print <<EOM;
 
-This is the perl interface to libavcodec, which comes with ffmpeg.
+This is the perl interface to libavformat and libavcodec, which come with ffmpeg.
 
 EOM
@@ -36 +47 @@
 }
 
-{ # look for where avcodec.h is
-    print <<EOM;
-Looking for avcodec.h...
-
-EOM
-    my @dirs = qw(/usr/local/include /opt/local/include /usr/include);
-    unshift @dirs, $ENV{AVCODEC_INC} if $ENV{AVCODEC_INC};
-    foreach my $dir (@dirs) {
-        if ( -f File::Spec->catfile($dir, 'libavcodec', 'avcodec.h')) {
-            $INCDIR = $dir;
-            last;
-        }
-    }
-
-    if (! $INCDIR || ! -d $INCDIR || ! -f ($HEADER = File::Spec->catfile($INCDIR, 'libavcodec', 'avcodec.h'))) {
-        print STDERR <<EOM;
-Couldn't find avcodec.h. If you have installed it in an odd location, 
-please specify the directory in AVCODEC_INC dir
-EOM
-        exit 1;
-    }
-    print <<EOM;
-Found avcodec.h in $HEADER.
-
-EOM
-}
-
-{ # Check if we have const file
-    if (! -f $CONSTFILE) {
-        print <<EOM;
-No const file ($CONSTFILE) found. We will generate one from avcodec.h.
-
-EOM
-        gen_constfile();
-    }
-}
-
-{ # Finally create a Makefile
+
+{
+    foreach my $type (keys %CONFIG) {
+        prepare($type);
+    }
+
     print <<EOM;
 Generating Makefile...
@@ -80 +59 @@
 
     WriteMakefile(
-        INC          => "-I$INCDIR",
-        DISTNAME     => 'Video-Avcodec',
-        LIBS         => [ '-lavcodec' ],
-        NAME         => 'Video::Avcodec',
+        INC          => join(' ', map { "-I$CONFIG{$_}{incdir}" } keys %CONFIG),
+        DISTNAME     => 'Video-LibAvformat',
+        LIBS         => [ '-lavformat -lavcodec' ],
+        NAME         => 'Video::LibAvformat',
         OBJECT       => '$(O_FILES)',
-        VERSION_FROM => 'lib/Video/Avcodec.pm',
+        VERSION_FROM => 'lib/Video/LibAvformat.pm',
         clean        => {
-            FILES => "$CONSTFILE $CONSTPM"
+            FILES => join(' ', map { "$CONFIG{$_}{constfile} $CONFIG{$_}{constpm}" } keys %CONFIG )
         }
     );
@@ -94 +73 @@
 # Utilities
 sub gen_constfile {
-    open(my $header, '<', $HEADER) or
-        die "Could not open $HEADER: $!";
+    my $type = shift;
+
+    my $header = $CONFIG{$type}{header} or
+        die "Don't know where the header file is for $type";
+
+    open(my $header, '<', $header) or
+        die "Could not open $header: $!";
 
     my %constants;
@@ -112 +96 @@
 
     { # one big-ass constant file
-        open(my $fh, '>', $CONSTFILE) or
-            die "Could not open $CONSTFILE: $!";
+        my $constfile = $CONFIG{$type}{constfile};
+        open(my $fh, '>', $constfile) or
+            die "Could not open $constfile: $!";
         print $fh <<EOM;
 # DO NOT EDIT! GENERATED BY $0 ON @{ [ scalar localtime() ] }
@@ -134 +119 @@
 
     { # create perl wrapper
-        open(my $fh, '>', $CONSTPM) or
-            die "Could not open $CONSTPM: $!";
+        my $constpm = $CONFIG{$type}{constpm};
+        open(my $fh, '>', $constpm) or
+            die "Could not open $constpm: $!";
         print $fh <<EOM;
 # DO NOT EDIT! GENERATED BY $0 ON @{ [ scalar localtime() ] }
 
-package Video::Avcodec::Const;
+package Video::Lib@{[ ucfirst $type ]}::Const;
 use Exporter 'import';
 
@@ -168 +154 @@
 =head1 NAME
 
-Video::Avcodec::Const - Constants for Video::Avcodec
+Video::Lib@{[ ucfirst $type ]}::Const - Constants for Video::Lib@{[ucfirst $type]}
 
 =head1 SYNOPSIS
 
-    use Video::Avcodec::Const;
+    use Video::@{[ucfirst]}::Const;
 
 =cut
@@ -179 +165 @@
     }
 }
+
+sub prepare {
+    my $type = shift;
+    probe_header($type);
+    # Check if we have const file
+    my $constfile = $CONFIG{$type}{constfile};
+    if (! -f $constfile) {
+        print <<EOM;
+No const file ($constfile) found. We will generate one from $type.h.
+
+EOM
+        gen_constfile($type);
+    }
+}
+
+sub probe_header { # look for where avformat.h/avcodec.h is
+    my $type = shift;
+
+    print <<EOM;
+Looking for $type.h...
+
+EOM
+    my @dirs = qw(/usr/local/include /opt/local/include /usr/include);
+    unshift @dirs, $ENV{uc "${type}_INC"} if $ENV{uc "${type}_INC"};
+
+    my $incdir;
+
+    foreach my $dir (@dirs) {
+        if ( -f File::Spec->catfile($dir, "lib$type", "$type.h")) {
+            $incdir = $dir;
+            last;
+        }
+    }
+
+    my $header;
+    if (! $incdir || ! -d $incdir || ! -f ($header = File::Spec->catfile($incdir, "lib$type", "$type.h"))) {
+        print STDERR <<EOM;
+Couldn't find $type.h. If you have installed it in an odd location, 
+please specify the directory in @{[uc $type]}_INC dir
+EOM
+        exit 1;
+    }
+    print <<EOM;
+Found $type.h in $header.
+
+EOM
+
+    $CONFIG{$type}{incdir} = $incdir;
+    $CONFIG{$type}{header} = $header;
+}
+

lang/perl/Video-LibAvformat/trunk/lib/Video/LibAvformat.pm

@@ -1 @@
-package Video::Avcodec;
+package Video::LibAvformat;
 use strict;
 use warnings;
@@ -8 +8 @@
     XSLoader::load(__PACKAGE__, $VERSION);
 }
-use Video::Avcodec::Const;
+use Video::LibAvformat::Const;
 
 1;
@@ -16 +16 @@
 =head1 NAME
 
-Video::Avcodec - Interface To libavcodec
+Video::LibAvformat - Interface To libavcodec
 
 =head1 SYNOPSIS
 
-    use Video::Avcodec;
+    use Video::LibAvformat;
 
 =head1 SEE ALSO
@@ -26 +26 @@
 =over 4
 
-=item Video::Avcodec::Const
+=item Video::LibAvformat::Const
 
 Covers the constants defined in avcodec.h

lang/perl/Video-LibAvformat/trunk/perl-avformat.h

@@ -1 +1 @@
 /* Utility functions for Video::Avcodec */
 
+#include "libavformat/avformat.h"
 #include "libavcodec/avcodec.h"
 

lang/perl/Video-LibAvformat/trunk/t/00_compile.t

@@ -2 +2 @@
 use Test::More (tests => 1);
 
-use_ok("Video::Avcodec");
+use_ok("Video::LibAvformat");

lang/perl/Video-LibAvformat/trunk/t/01_basic.t

@@ -1 +1 @@
 use strict;
-use Test::More (tests => 1);
-
-use Video::Avcodec;
-
-{
-    my $bits = Video::Avcodec::get_bits_per_sample_format(
-        &Video::Avcodec::Const::SAMPLE_FMT_DBL
-    );
-
-    # I have no idea if this is the right value, but bits should be 64
-    note("SAMPLE_FMT_DBL -> bits = $bits");
-    ok($bits);
-}
+use Test::More (skip_all => "unimplemented");