Re: [CinCV] SOWT Audio Patch
On Wed, Oct 27, 2010 at 1:05 PM, Johannes Sixt wrote: > On Mittwoch, 27. Oktober 2010, Einar Rünkaru wrote: >> Hi Johannes >> >> Can you add this patch from Mark to 2.1.5 official version. At least >> worked for me. > > Did it after some whitespace cleanup. > > I also removed the additions to outdated Makefile.* and moved the addition to > Makefile.am to the right place (good taste demands that extending a sorted > list keeps the list sorted, doesn't it ;) Thanks, I never claimed that it was a clean patch, just that it worked. I did not understand the Makefile stuff very well either. i just made it work for me. Mark ___ Cinelerra mailing list Cinelerra@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
Re: [CinCV] SOWT Audio Patch
On Mittwoch, 27. Oktober 2010, Einar Rünkaru wrote: > Hi Johannes > > Can you add this patch from Mark to 2.1.5 official version. At least > worked for me. Did it after some whitespace cleanup. I also removed the additions to outdated Makefile.* and moved the addition to Makefile.am to the right place (good taste demands that extending a sorted list keeps the list sorted, doesn't it ;) -- Hannes ___ Cinelerra mailing list Cinelerra@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
[CinCV] SOWT Audio Patch/Daf/Hermann
Many thanks for your help everybody. For other non-coders and programmers, here is what happened. />Hermann wrote:- > >it looks that you saved the whole mail message as-is, including all the mail >headers. / Correct. I saved what was visible on screen on the ARCHIVE pages - the only place I know to read. What I saw was a very very long string of letters with no spaces - yes - like email, but I don't know any better. Your clue suggested that I open the copied block (which I had wrongly saved as sowt.diff in cinelerra-cv) in Thunderbird. />The patch program needs only the bare text content. Actually, this >patch program looks for very specifically formatted text content. The relevant >part of the patch starts with the line > >diff -Nau my_cinelerra/quicktime/Makefile.2 my_cinelerra_sowt/quicktime/Makefile.2 > >i.e. the patch program looks for a line starting with the word "diff", followed >by two file names./ Thunderbird extracted my wrongly saved sowt.diff file. Hurray! - but three lines at the top and one at the bottom had to be commented out ( # ) so that 'diff -Nau...' was the opening line. The new found file now worked after a various re-installs. Is there a FORUM that I have missed, rather than the ARCHIVES ??? Thanks to all. Daf
Re: [CinCV] SOWT Audio Patch/Daf Hobson/Mark
On Tue, Jun 29, 2010 at 10:45 PM, d...@dafhobson.com wrote: > Daf Hobson Said: >>>Thanks for the SOWT patch! >>>I have 10.04LTX Lynx Ubuntu. >>>I complied Cinelerra from source as per Raffaella's 'How To' a month ago. >>>This eve I tried 'git pull' in cinelerra-cv.(terminal) It told me I have >>>the up to date version. >>> >>>Can anybody tell me what I do with the SOWT patch kindly posted.? >>>Thanks >>>Daf > >>Mark replied >>You basically go to the build directory where the top level Makefile is, >>something similar to my_cinelerra. Put sowt.diff there and type: >> >>patch -p1 < sowt.diff >> >>then compile. >> >>There may be some of the files, such as the Makefiles that won't patch >>correctly if they have been modified using autogen and configure. >>The patch was made right after checkout from git. >> >>There is a pretty good explanation of patch and diff here: >> >>http://www.linuxforums.org/articles/using-diff-and-patch_80.html >> >>Mark > > Am I correct..? > I put a file named 'sowt.diff' into the main cinelerra directory which, from > Raffaella's instructions, is 'cinelerra-cv' (in the 'home' directory) > The file contains a 'copy' of your post to include the beginning and end > '--0023545bd7586f7774048a186f54' > I put the expression 'patch -p1 downloading from git. > I .complie then try to 'make' > I then got the error in terminal 'Missing Separator 828 ***' > After a search I found that it needed a 'tab' before 'patch -p1 which I put into line 828 of the MAKEFILE file. > Now 'make' works. > > I 'make' successfully. > 'sudo make install' successfully. > then 'sudo ldconfig' > > Cinelerra works - but my .MOV files don't play sound and I still get the > terminal note 'cannot find sowt codec' . Nothing appears in the audio > tracks. > > Any ideas what I did wrong? > > Very sorry it's a long post. > Hi. I try to explain. No need to modify Makefile.am, configure command is needed. Save attachment from Marks's mail into your cinerella-cv directory (filename sowt.diff) All next commands you must type in terminal. cd cinerella-cv git checkout Makefile.am patch -p1 https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
[CinCV] SOWT Audio Patch/Daf Hobson/Mark
Daf Hobson Said: >>Thanks for the SOWT patch! >>I have 10.04LTX Lynx Ubuntu. >>I complied Cinelerra from source as per Raffaella's 'How To' a month ago. >>This eve I tried 'git pull' in cinelerra-cv.(terminal) It told me I have >>the up to date version. >> >>Can anybody tell me what I do with the SOWT patch kindly posted.? >>Thanks >>Daf >Mark replied >You basically go to the build directory where the top level Makefile is, >something similar to my_cinelerra. Put sowt.diff there and type: > >patch -p1 < sowt.diff > >then compile. > >There may be some of the files, such as the Makefiles that won't patch >correctly if they have been modified using autogen and configure. >The patch was made right after checkout from git. > >There is a pretty good explanation of patch and diff here: > >http://www.linuxforums.org/articles/using-diff-and-patch_80.html > >Mark Am I correct..? I put a file named 'sowt.diff' into the main cinelerra directory which, from Raffaella's instructions, is 'cinelerra-cv' (in the 'home' directory) The file contains a 'copy' of your post to include the beginning and end '--0023545bd7586f7774048a186f54' I put the expression 'patch -p1 downloading from git. I .complie then try to 'make' I then got the error in terminal 'Missing Separator 828 ***' After a search I found that it needed a 'tab' before 'patch -p1 Cinelerra works - but my .MOV files don't play sound and I still get the terminal note 'cannot find sowt codec' . Nothing appears in the audio tracks. Any ideas what I did wrong? Very sorry it's a long post. Daf ___ Cinelerra mailing list Cinelerra@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
[CinCV] SOWT Audio patch
Thanks for the SOWT patch! I have 10.04LTX Lynx Ubuntu. I complied Cinelerra from source as per Raffaella's 'How To' a month ago. This eve I tried 'git pull' in cinelerra-cv.(terminal) It told me I have the up to date version. Can anybody tell me what I do with the SOWT patch kindly posted.? Thanks Daf ___ Cinelerra mailing list Cinelerra@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
[CinCV] SOWT Audio Patch
Here is a quick and dirty patch to add SOWT audio. It applies to git
as of 27 Jun 2010.
It adds sowt.c and sowt.h, slightly modified from twos.c and twos.h,
changes a few
other files to include the new codec, and changes all Makefiles I could find to
hopefully include these changes no matter how it is built. It could be
more efficient,
and maybe some of the Makefiles are actually overwritten, but it works for me.
Mark
Common subdirectories: my_cinelerra/quicktime/docs and my_cinelerra_sowt/quicktime/docs
Common subdirectories: my_cinelerra/quicktime/encore50 and my_cinelerra_sowt/quicktime/encore50
Common subdirectories: my_cinelerra/quicktime/ffmpeg and my_cinelerra_sowt/quicktime/ffmpeg
diff -Nau my_cinelerra/quicktime/Makefile.2 my_cinelerra_sowt/quicktime/Makefile.2
--- my_cinelerra/quicktime/Makefile.2 2010-06-28 00:47:50.0 -0700
+++ my_cinelerra_sowt/quicktime/Makefile.2 2010-06-28 00:38:08.0 -0700
@@ -115,6 +115,7 @@
$(OBJDIR)/tkhd.o \
$(OBJDIR)/trak.o \
$(OBJDIR)/twos.o \
+ $(OBJDIR)/sowt.o \
$(OBJDIR)/udta.o \
$(OBJDIR)/ulaw.o \
$(OBJDIR)/util.o \
@@ -377,6 +378,7 @@
$(OBJDIR)/tkhd.o: tkhd.c
$(OBJDIR)/trak.o: trak.c
$(OBJDIR)/twos.o: twos.c
+$(OBJDIR)/sowt.o: sowt.c
$(OBJDIR)/udta.o: udta.c
$(OBJDIR)/ulaw.o: ulaw.c
$(OBJDIR)/util.o: util.c
diff -Nau my_cinelerra/quicktime/Makefile.50 my_cinelerra_sowt/quicktime/Makefile.50
--- my_cinelerra/quicktime/Makefile.50 2010-06-28 00:47:50.0 -0700
+++ my_cinelerra_sowt/quicktime/Makefile.50 2010-06-28 00:39:29.0 -0700
@@ -131,6 +131,7 @@
$(OBJDIR)/tkhd.o \
$(OBJDIR)/trak.o \
$(OBJDIR)/twos.o \
+ $(OBJDIR)/sowt.o \
$(OBJDIR)/udta.o \
$(OBJDIR)/ulaw.o \
$(OBJDIR)/util.o \
@@ -360,6 +361,7 @@
$(OBJDIR)/tkhd.o: tkhd.c
$(OBJDIR)/trak.o: trak.c
$(OBJDIR)/twos.o: twos.c
+$(OBJDIR)/sowt.o: sowt.c
$(OBJDIR)/udta.o: udta.c
$(OBJDIR)/ulaw.o: ulaw.c
$(OBJDIR)/util.o: util.c
diff -Nau my_cinelerra/quicktime/Makefile.am my_cinelerra_sowt/quicktime/Makefile.am
--- my_cinelerra/quicktime/Makefile.am 2010-06-28 00:47:50.0 -0700
+++ my_cinelerra_sowt/quicktime/Makefile.am 2010-06-28 00:40:42.0 -0700
@@ -66,7 +66,7 @@
rawaudio.c \
rle.c \
smhd.c stbl.c stco.c stsc.c stsd.c stsdtable.c stss.c stsz.c stts.c \
- tkhd.c trak.c twos.c udta.c ulaw.c util.c v308.c v408.c v410.c vmhd.c \
+ tkhd.c trak.c twos.c sowt.c udta.c ulaw.c util.c v308.c v408.c v410.c vmhd.c \
vbraudio.c \
vorbis.c workarounds.c yuv2.c yuv4.c yv12.c wmx2.c \
wma.c mpeg4.c
@@ -103,6 +103,7 @@
rtjpeg.h \
rtjpeg_core.h \
twos.h \
+ sowt.h \
ulaw.h \
v308.h \
v408.h \
diff -Nau my_cinelerra/quicktime/Makefile.encore2 my_cinelerra_sowt/quicktime/Makefile.encore2
--- my_cinelerra/quicktime/Makefile.encore2 2010-06-28 00:47:50.0 -0700
+++ my_cinelerra_sowt/quicktime/Makefile.encore2 2010-06-28 00:42:00.0 -0700
@@ -150,6 +150,7 @@
$(OBJDIR)/tkhd.o \
$(OBJDIR)/trak.o \
$(OBJDIR)/twos.o \
+ $(OBJDIR)/sowt.o \
$(OBJDIR)/udta.o \
$(OBJDIR)/ulaw.o \
$(OBJDIR)/util.o \
@@ -510,6 +511,7 @@
$(OBJDIR)/tkhd.o: tkhd.c
$(OBJDIR)/trak.o: trak.c
$(OBJDIR)/twos.o: twos.c
+$(OBJDIR)/sowt.o: sowt.c
$(OBJDIR)/udta.o: udta.c
$(OBJDIR)/ulaw.o: ulaw.c
$(OBJDIR)/util.o: util.c
diff -Nau my_cinelerra/quicktime/plugin.c my_cinelerra_sowt/quicktime/plugin.c
--- my_cinelerra/quicktime/plugin.c 2010-06-28 00:47:52.0 -0700
+++ my_cinelerra_sowt/quicktime/plugin.c 2010-06-28 00:43:24.0 -0700
@@ -41,6 +41,7 @@
#include "qtmp3.h"
#include "rawaudio.h"
#include "twos.h"
+#include "sowt.h"
#include "ulaw.h"
#include "wma.h"
#include "wmx2.h"
@@ -48,6 +49,7 @@
static void register_acodecs()
{
register_acodec(quicktime_init_codec_twos);
+ register_acodec(quicktime_init_codec_sowt);
register_acodec(quicktime_init_codec_rawaudio);
register_acodec(quicktime_init_codec_ima4);
register_acodec(quicktime_init_codec_mp4a);
diff -Nau my_cinelerra/quicktime/quicktime.h my_cinelerra_sowt/quicktime/quicktime.h
--- my_cinelerra/quicktime/quicktime.h 2010-06-28 00:47:52.0 -0700
+++ my_cinelerra_sowt/quicktime/quicktime.h 2010-06-28 00:44:40.0 -0700
@@ -115,6 +115,7 @@
/* Twos compliment 8, 16, 24 */
#define QUICKTIME_TWOS "twos"
+#define QUICKTIME_SOWT "sowt"
/* ulaw */
#define QUICKTIME_ULAW "ulaw"
diff -Nau my_cinelerra/quicktime/sowt.c my_cinelerra_sowt/quicktime/sowt.c
--- my_cinelerra/quicktime/sowt.c 1969-12-31 17:00:00.0 -0700
+++ my_cinelerra_sowt/quicktime/sowt.c 2010-06-28 00:35:39.0 -0700
@@ -0,0 +1,335 @@
+#include "funcprotos.h"
+#include "quicktime.h"
+#include "sowt.h"
+
+/* === private for sowt */
+
+
+typedef struct
+{
+ char *work_buffer;
+ long buffer_size;
+} quicktime_sowt_codec_t;
+
+static int byte_order(void)
+{/* 1 if little endian */
+ int1
