| m2vmp2cut-0.67-dev/ANNOUNCE | | m2vmp2cut-0.68/ANNOUNCE |
| 1 | Last committed: $Id: ANNOUNCE 2169 2008-07-25 12:53:35Z too $ | 1 | Last committed: $Id: ANNOUNCE 2174 2008-07-27 10:20:18Z too $ |
| 2 | | 2 | |
| 3 | ANNOUNCE for m2vmp2cut 0.67 (Success Is Not An Option): | 3 | ANNOUNCE for m2vmp2cut 0.68 (Not even far!): |
| 4 | | 4 | |
| 5 | This is development release of m2vmp2cut -- frame accurate (currently PAL) | 5 | This is development release of m2vmp2cut -- frame accurate (currently PAL) |
| 6 | mpeg2 video (m2v file) with accompanied mp2 audio (mp2 file) cutter. | 6 | mpeg2 video (m2v file) with accompanied mp2 audio (mp2 file) cutter. |
| 13 | | 13 | |
| 14 | This software is available currently at http://www.iki.fi/too/sw/m2vmp2cut/ | 14 | This software is available currently at http://www.iki.fi/too/sw/m2vmp2cut/ |
| 15 | and is licensed under GNU Public License (GPL). | 15 | and is licensed under GNU Public License (GPL). |
| | 16 | |
| | 17 | Changes since 0.67 (r2169, Success is not an option): |
| | 18 | Binaries wavgraph and warpxpointer are installed. |
| | 19 | Audio sync fixed in cutpoint test functionality. |
| | 20 | ProjectX is linked for use during 'make install'. |
| 16 | | 21 | |
| 17 | Changes since 0.65 (r2101, Faux pas): | 22 | Changes since 0.65 (r2101, Faux pas): |
| 18 | Audio visualizer around current position in m2vcut-gui, to find | 23 | Audio visualizer around current position in m2vcut-gui, to find |
| m2vmp2cut-0.67-dev/HISTORY | | m2vmp2cut-0.68/HISTORY |
| 1 | # Created using svn -v log | sed -n -e '${x;p;x;p;q};/^--*$/{x;/./p;d};x;p' | 1 | # Created using svn -v log | sed -n -e '${x;p;x;p;q};/^--*$/{x;/./p;d};x;p' |
| 2 | # This file is not version controlled | 2 | # This file is not version controlled |
| 3 | | 3 | |
| | 4 | ------------------------------------------------------------------------ |
| | 5 | r2174 | too | 2008-07-27 13:20:18 +0300 (Sun, 27 Jul 2008) | 1 line |
| | 6 | Changed paths: |
| | 7 | M /main/projects/m2vmp2cut/ANNOUNCE |
| | 8 | M /main/projects/m2vmp2cut/INSTALL |
| | 9 | M /main/projects/m2vmp2cut/Makefile |
| | 10 | M /main/projects/m2vmp2cut/README |
| | 11 | M /main/projects/m2vmp2cut/VERSION |
| | 12 | |
| | 13 | Version 0.68 |
| | 14 | ------------------------------------------------------------------------ |
| | 15 | r2173 | too | 2008-07-27 11:08:18 +0300 (Sun, 27 Jul 2008) | 1 line |
| | 16 | Changed paths: |
| | 17 | M /main/projects/m2vmp2cut/Makefile |
| | 18 | |
| | 19 | ProjectX.jar path to be given in installation. Installation directory pre-cleanup. |
| | 20 | ------------------------------------------------------------------------ |
| | 21 | r2172 | too | 2008-07-27 00:35:56 +0300 (Sun, 27 Jul 2008) | 1 line |
| | 22 | Changed paths: |
| | 23 | M /main/projects/m2vmp2cut/bin/m2vmp2cut.pl |
| | 24 | |
| | 25 | audio sync fix with --test= option. |
| | 26 | ------------------------------------------------------------------------ |
| | 27 | r2171 | too | 2008-07-26 17:49:00 +0300 (Sat, 26 Jul 2008) | 2 lines |
| | 28 | Changed paths: |
| | 29 | M /main/projects/m2vmp2cut/Makefile |
| | 30 | M /main/projects/m2vmp2cut/bin/wrapper.sh |
| | 31 | |
| | 32 | so flustrated of these after-release bugs.... |
| | 33 | ... graph tool was not installed. |
| 4 | ------------------------------------------------------------------------ | 34 | ------------------------------------------------------------------------ |
| 5 | r2169 | too | 2008-07-25 15:53:35 +0300 (Fri, 25 Jul 2008) | 1 line | 35 | r2169 | too | 2008-07-25 15:53:35 +0300 (Fri, 25 Jul 2008) | 1 line |
| 6 | Changed paths: | 36 | Changed paths: |
| m2vmp2cut-0.67-dev/INSTALL | | m2vmp2cut-0.68/INSTALL |
| 4 | This program can be run without installing, just | 4 | This program can be run without installing, just |
| 5 | enter `./m2vmp2cut <options>' | 5 | enter `./m2vmp2cut <options>' |
| 6 | | 6 | |
| 7 | so, use `make install PREFIX=/usr/local' (or similar) | 7 | Or use something like |
| 8 | to install this program. | 8 | 'make install PREFIX=/usr/local PJXJAR=/path/to/ProjectX.jar' |
| | 9 | to install this software. |
| 9 | | 10 | |
| 10 | After this find the location of 'projectx.jar' and symlink | 11 | (ProjectX is available at project-x.sourceforge.net) |
| 11 | it to m2vmp2cut installation, like: | | |
| 12 | | 12 | |
| 13 | ln -s path/to/projectx.jar PREFIX/lib/m2vmp2cut-0.67/bin/projectx.jar | 13 | Mjpegtools (mplex and mpeg2enc) is needed in some parts of the usage; |
| 14 | | 14 | install it separately unless already there. |
| m2vmp2cut-0.67-dev/Makefile | | m2vmp2cut-0.68/Makefile |
| 4 | .PHONY: ALWAYS | 4 | .PHONY: ALWAYS |
| 5 | | 5 | |
| 6 | install chkprefix: VER=`sed -n 's/ver=//p' m2vmp2cut` | 6 | install chkprefix: VER=`sed -n 's/ver=//p' m2vmp2cut` |
| 7 | release: VER=`sed -n '1s/ .*/-dev/p' VERSION` | 7 | #release: VER=`sed -n '1s/ .*/-dev/p' VERSION` |
| 8 | #release: VER=`sed -n '1s/ .*//p' VERSION` | 8 | release: VER=`sed -n '1s/ .*//p' VERSION` |
| 9 | snapshot: VER=`sed -n '1s/ .*//p' VERSION`+r`svnversion . | tr : =` | 9 | snapshot: VER=`sed -n '1s/ .*//p' VERSION`+r`svnversion . | tr : =` |
| 10 | | 10 | |
| 11 | all: ALWAYS | 11 | all: ALWAYS |
| 17 | '') sed -n 's/^#msg1: \?//p;' Makefile; exit 1;; \ | 17 | '') sed -n 's/^#msg1: \?//p;' Makefile; exit 1;; \ |
| 18 | *' '*) echo "Prefix '$(PREFIX)' has spaces!"; exit 1;; \ | 18 | *' '*) echo "Prefix '$(PREFIX)' has spaces!"; exit 1;; \ |
| 19 | esac | 19 | esac |
| 20 | @chkdir() { [ -d "$$1" ] || mkdir -m 755 -p "$$1"; }; \ | 20 | |
| 21 | chkdir $(PREFIX)/lib/m2vmp2cut-$(VER); chkdir $(PREFIX)/bin; \ | 21 | chkpjxjar: ALWAYS |
| 22 | chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/bin; \ | 22 | @case "$(PJXJAR)" in \ |
| 23 | chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/doc | 23 | '') sed -n 's/^#msg2: \?//p;' Makefile; exit 1 ;; /*) ;; \ |
| | 24 | *) echo "'$(PJXJAR)' does not start with '/'"; exit 1 ;; \ |
| | 25 | esac |
| | 26 | @test -f "$(PJXJAR)" || { echo "'$(PJXJAR)': no such file"; exit 1; } |
| | 27 | |
| 24 | | 28 | |
| 25 | TRG_BINS = m2vcut-gui m2vfilter m2vscan m2vtoyuv mp2cutpoints \ | 29 | TRG_BINS = m2vcut-gui m2vfilter m2vscan m2vtoyuv mp2cutpoints \ |
| 26 | fileparts filerotate \ | 30 | fileparts filerotate wavgraph warpxpointer \ |
| 27 | m2vmp2cut.pl m2vmp2cut.sh m2v_catfiltered.py m2v_somehdrinfo.py \ | 31 | m2vmp2cut.pl m2vmp2cut.sh m2v_catfiltered.py m2v_somehdrinfo.py \ |
| 28 | wrapper.sh lvev6frames.pl | 32 | wrapper.sh lvev6frames.pl |
| 29 | | 33 | |
| 30 | TRG_DOCS = Examples m2vcut_help-default m2vcut_help-fi_FI Options Usage | 34 | #TRG_DOCS = Examples m2vcut_help-default m2vcut_help-fi_FI Options Usage |
| | 35 | TRG_DOCS = m2vcut_help-default m2vcut_help-fi_FI Options Usage |
| 31 | | 36 | |
| 32 | chkfiles: | 37 | chkfiles: |
| 33 | @for i in $(TRG_BINS:%=bin/%) $(TRG_DOCS:%=doc/%); \ | 38 | @for i in $(TRG_BINS:%=bin/%) $(TRG_DOCS:%=doc/%); \ |
| 34 | do test -f "$$i" || { echo "'$$i' missing"; exit 1; }; done | 39 | do test -f "$$i" || { echo "'$$i' missing"; exit 1; }; done |
| 35 | @test -f m2vmp2cut | 40 | @test -f m2vmp2cut |
| 36 | | 41 | |
| 37 | install: chkfiles chkprefix | 42 | install: chkfiles chkprefix chkpjxjar |
| | 43 | @rm -rf $(PREFIX)/lib/m2vmp2cut-$(VER) |
| | 44 | @chkdir() { [ -d "$$1" ] || mkdir -m 755 -p "$$1"; }; \ |
| | 45 | chkdir $(PREFIX)/lib/m2vmp2cut-$(VER); chkdir $(PREFIX)/bin; \ |
| | 46 | chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/bin; \ |
| | 47 | chkdir $(PREFIX)/lib/m2vmp2cut-$(VER)/doc |
| 38 | cp $(TRG_BINS:%=bin/%) $(PREFIX)/lib/m2vmp2cut-$(VER)/bin | 48 | cp $(TRG_BINS:%=bin/%) $(PREFIX)/lib/m2vmp2cut-$(VER)/bin |
| 39 | cp $(TRG_DOCS:%=doc/%) $(PREFIX)/lib/m2vmp2cut-$(VER)/doc | 49 | cp $(TRG_DOCS:%=doc/%) $(PREFIX)/lib/m2vmp2cut-$(VER)/doc |
| 40 | cp m2vmp2cut $(PREFIX)/bin/m2vmp2cut | 50 | cp m2vmp2cut $(PREFIX)/bin/m2vmp2cut |
| | 51 | ln -s $(PJXJAR) $(PREFIX)/lib/m2vmp2cut-$(VER)/bin/ProjectX.jar |
| 41 | # v=$(VER); sed "s/=devel/=$$v/" m2vmp2cut > $(PREFIX)/bin/m2vmp2cut | 52 | # v=$(VER); sed "s/=devel/=$$v/" m2vmp2cut > $(PREFIX)/bin/m2vmp2cut |
| 42 | # chmod 755 $(PREFIX)/bin/m2vmp2cut | 53 | # chmod 755 $(PREFIX)/bin/m2vmp2cut |
| 43 | | 54 | |
| 101 | #msg1: | 112 | #msg1: |
| 102 | #msg1: Can not install: PREFIX missing. | 113 | #msg1: Can not install: PREFIX missing. |
| 103 | #msg1: | 114 | #msg1: |
| 104 | #msg1: try for example: `make install PREFIX=/usr/local' | 115 | #msg1: Try something like `make install PREFIX=/usr/local PJXJAR=...' |
| 105 | #msg1: | 116 | #msg1: |
| | 117 | |
| | 118 | #msg2: |
| | 119 | #msg2: Can not install: PJXJAR missing. |
| | 120 | #msg2: |
| | 121 | #msg2: Try `make install PREFIX=... PJXJAR=/path/to/ProjectX.jar' |
| | 122 | #msg2: |
| | 123 | |
| | 124 | |
| 106 | | 125 | |
| 107 | # Dist files: | 126 | # Dist files: |
| 108 | | 127 | |
| m2vmp2cut-0.67-dev/bin/m2vmp2cut.pl | | m2vmp2cut-0.68/bin/m2vmp2cut.pl |
| 6 | # All rights reserved | 6 | # All rights reserved |
| 7 | # | 7 | # |
| 8 | # Created: Sun Sep 05 11:12:24 EEST 2004 too | 8 | # Created: Sun Sep 05 11:12:24 EEST 2004 too |
| 9 | # Last modified: Tue Jun 03 22:53:29 EEST 2008 too | 9 | # Last modified: Sun Jul 27 00:33:40 EEST 2008 too |
| 10 | # | 10 | # |
| 11 | # This program is licensed under the GPL v2. See file COPYING for details. | 11 | # This program is licensed under the GPL v2. See file COPYING for details. |
| 12 | | 12 | |
| 473 | endcut($e); | 473 | endcut($e); |
| 474 | } | 474 | } |
| 475 | | 475 | |
| 476 | if ($test >= 0 && ($test & 1)) { | 476 | if ($test >= 0) { |
| 477 | $te = $currgopff; | 477 | $s = $ts if $test & 1; |
| 478 | } else { ($ts, $te) = ($s, $e); } | 478 | $e = $currgopff unless $test & 1; |
| | 479 | } |
| 479 | | 480 | |
| 480 | ($ts, $te) = (palframe2timecode($ts,$sync), palframe2timecode($te,$sync)); | 481 | ($ts, $te) = (palframe2timecode($s,$sync), palframe2timecode($e,$sync)); |
| 481 | | 482 | |
| 482 | push @timecodes, "$ts-$te"; | 483 | push @timecodes, "$ts-$te"; |
| 483 | } | 484 | } |
| 484 | | 485 | |
| 485 | print SH "# ++++++++ $prevgopff $currgopff ($e) $nextgopff ", | 486 | print SH "# ++++++++ $prevgopff $currgopff ($e) $nextgopff ", |
| 486 | "-- $prevgoppos $currgoppos $nextgoppos\n"; | 487 | "-- $prevgoppos $currgoppos $nextgoppos\n"; |
| 487 | if ($test >= 0 && ($test++ & 1)) { | 488 | |
| | 489 | if ($test == 2) { # --test=0 |
| 488 | $frames -= $encframes; | 490 | $frames -= $encframes; |
| 489 | } | 491 | } |
| 490 | else { | 492 | else { |
| m2vmp2cut-0.67-dev/bin/wrapper.sh | | m2vmp2cut-0.68/bin/wrapper.sh |
| 7 | # All rights reserved | 7 | # All rights reserved |
| 8 | # | 8 | # |
| 9 | # Created: Tue Apr 22 19:10:35 EEST 2008 too | 9 | # Created: Tue Apr 22 19:10:35 EEST 2008 too |
| 10 | # Last modified: Fri Jul 25 15:26:08 EEST 2008 too | 10 | # Last modified: Sat Jul 26 17:35:56 EEST 2008 too |
| 11 | | 11 | |
| 12 | eae () { echo; echo Press ENTER to close this window '' | tr -d \\012 | 12 | eae () { echo; echo Press ENTER to close this window '' | tr -d \\012 |
| 13 | read _; exit $1; } | 13 | read _; exit $1; } |
| 153 | "$cwd"/fileparts $byterange "$vd"/audio.mp2 > "$dd"/audio.mp2 | 153 | "$cwd"/fileparts $byterange "$vd"/audio.mp2 > "$dd"/audio.mp2 |
| 154 | mplayer -vo null -vc null -ao pcm:file="$dd"/audio.wav "$dd"/audio.mp2 | 154 | mplayer -vo null -vc null -ao pcm:file="$dd"/audio.wav "$dd"/audio.mp2 |
| 155 | "$cwd"/wavgraph "$dd"/audio.wav "$dd"/audio.xpm $w $h $m 25 1 | 155 | "$cwd"/wavgraph "$dd"/audio.wav "$dd"/audio.xpm $w $h $m 25 1 |
| | 156 | test -f "$dd"/audio.xpm \ |
| | 157 | || { set +x; die Creating graph failed. See above.; } |
| 156 | case `env which feh 2>/dev/null` in /*) | 158 | case `env which feh 2>/dev/null` in /*) |
| 157 | :; : Press 'q' to close graph window ;: | 159 | :; : Press 'q' to close graph window ;: |
| 158 | "$cwd"/warpxpointer -trysecs 4 -name feh c c & | 160 | "$cwd"/warpxpointer -trysecs 4 -name feh c c & |