Hi again
Patch 3 returned this error:
[EMAIL PROTECTED] ~/src/cinelerra-4 $ patch -p1 < aa_file.cpp.patch
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- aa_file.cpp 2008-05-31 11:25:31.000000000 +0200
|+++
/static/cinelerra/cin4/quicktime/thirdparty/faad2-2.0/plugins/mpeg4ip/aa_file.cpp
2008-08-12 15:33:10.000000000 +0200
--------------------------
File to patch:
/home/daniel/src/cinelerra-4/quicktime/thirdparty/faad2-2.0/plugins/mpeg4ip/aa_file.cpp
patching file
/home/daniel/src/cinelerra-4/quicktime/thirdparty/faad2-2.0/plugins/mpeg4ip/aa_file.cpp
[EMAIL PROTECTED] ~/src/cinelerra-4 $ patch -p1 < faad2.cpp.2.patch
missing header for unified diff at line 3 of patch
can't find file to patch at input line 3
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|--- faad2.cpp 2008-05-31 11:25:31.000000000 +0200
|+++
/static/cinelerra/cin4/quicktime/thirdparty/faad2-2.0/plugins/mpeg4ip/faad2.cpp
2008-08-12 16:59:50.000000000 +0200
--------------------------
File to patch:
/home/daniel/src/cinelerra-4/quicktime/thirdparty/faad2-2.0/plugins/mpeg4ip/faad2.cpp
patching file
/home/daniel/src/cinelerra-4/quicktime/thirdparty/faad2-2.0/plugins/mpeg4ip/faad2.cpp
patch: **** malformed patch at line 95:
++++++++++++++Error on make is as follows:
g++ -DHAVE_CONFIG_H -I. -I. -I../.. -I../../include -D_REENTRANT
-DNOCONTROLS -fexceptions -g -O2 -MT faad2.lo -MD -MP -MF .deps/faad2.Tpo -c
faad2.cpp -fPIC -DPIC -o .libs/faad2.o
In file included from faad2.cpp:21:
faad2.h:28:26: error: codec_plugin.h: No such file or directory
faad2.cpp:22:32: error: mpeg4_audio_config.h: No such file or directory
faad2.cpp:23:23: error: mpeg4_sdp.h: No such file or directory
In file included from faad2.cpp:21:
faad2.h:36: error: 'codec_data_t' does not name a type
faad2.h:37: error: ISO C++ forbids declaration of 'audio_vft_t' with no type
faad2.h:37: error: expected ';' before '*' token
faad2.h:55: error: ISO C++ forbids declaration of 'FILE' with no type
faad2.h:55: error: expected ';' before '*' token
faad2.h:70: error: variable or field 'aac_close' declared void
faad2.h:70: error: 'codec_data_t' was not declared in this scope
faad2.h:70: error: 'ptr' was not declared in this scope
faad2.h:73: error: expected constructor, destructor, or type conversion
before '*' token
faad2.h:82: error: 'codec_data_t' was not declared in this scope
faad2.h:82: error: 'ifptr' was not declared in this scope
faad2.h:83: error: expected primary-expression before '*' token
faad2.h:83: error: 'buffer' was not declared in this scope
faad2.h:84: error: expected primary-expression before '*' token
faad2.h:84: error: 'ts' was not declared in this scope
faad2.h:84: error: initializer expression list treated as compound
expression
faad2.h:85: error: 'codec_data_t' was not declared in this scope
faad2.h:85: error: 'ifptr' was not declared in this scope
faad2.h:87: error: variable or field 'aac_file_used_for_frame' declared void
faad2.h:87: error: 'codec_data_t' was not declared in this scope
faad2.h:87: error: 'ifptr' was not declared in this scope
faad2.h:88: error: expected primary-expression before 'bytes'
faad2.h:90: error: 'codec_data_t' was not declared in this scope
faad2.h:90: error: 'ifptr' was not declared in this scope
faad2.h:91: error: expected primary-expression before 'ts'
faad2.h:91: error: initializer expression list treated as compound
expression
faad2.cpp:38: error: expected initializer before '*' token
make[6]: *** [faad2.lo] Error 1
make[6]: Leaving directory
`/home/daniel/src/cinelerra-4/quicktime/thirdparty/faad2-2.0/plugins/mpeg4ip'
make[5]: *** [all-recursive] Error 1
make[5]: Leaving directory
`/home/daniel/src/cinelerra-4/quicktime/thirdparty/faad2-2.0/plugins'
make[4]: *** [all-recursive] Error 1
make[4]: Leaving directory
`/home/daniel/src/cinelerra-4/quicktime/thirdparty/faad2-2.0'
make[3]: *** [all] Error 2
make[3]: Leaving directory
`/home/daniel/src/cinelerra-4/quicktime/thirdparty/faad2-2.0'
make[2]: *** [x86_64/faad] Error 2
make[2]: Leaving directory `/home/daniel/src/cinelerra-4/quicktime'
make[1]: *** [all] Error 2
make[1]: Leaving directory `/home/daniel/src/cinelerra-4'
make: *** [all] Error 2
localhost cinelerra-4 #
Tried modifying top level configure as per Richards AMD issues to no avail
System MSI k92a2-cf mobo AMD Quad 64
4 G ram
Gentoo (Sabayon3.5)
Any suggestions? Thanks in Advance
Daniel
On Thu, Aug 14, 2008 at 4:20 PM, Richard Pitt <[EMAIL PROTECTED]> wrote:
> I've just done the same thing on Fedora Core 8 on AMD Quad Core Phenom
> (9950 Black Edition - 2.5GHz). I ran across only 2 places where I had to
> deal with the AMD specific items:
>
> top-level configure:
> Added: --with-extra-cflags="-mtune=amdfam10 -mcpu=amdfam10"
> to all lines calling subsidiary configure programs
>
> /thirdparty/mjpegtools-1.9.0rc3/cpuinfo.sh
> Comment out the "fall through" error on the "if test..." chain where the
> error message reads "Your $_cc does not even support \"i386\" for
> '-march' and $_opt_mcpu."
> and replace it with a simple
> echo ""
>
> sorry - have not done diffs as the changes are pretty trivial
>
> The first one was required at least on the configure for mjpegtools in
> order to get the software to compile without errors, but adding it to
> ALL the configure lines seems to have vastly improved the reliability of
> the resulting code as I was getting freezes and general stability
> issues seemingly randomly.
>
> Compile with Make -j5 was under 2 minutes
>
> Note that you MUST do a "Make install" even as a normal user (docs say
> as root) or the software dies with an X error looking for theme. This
> places all necessary run-time files in the ./bin directory in the build
> area. I simply created a shell to put me there rather than adding the
> path to PATH.
>
>
> Performance on this CPU is excellent - about 50% of runtime for basic
> rendering to Quicktime with no effects, and about runtime with a sharpen
> and a single Text overlay (I'm digitizing about 900 1 hour TV shows for
> a client, chopping out commercials and doing basic corrections) compared
> to almost 3x runtime for my Dual Core Intel 2.4GHz for identical
> rendering with same sharpen and text overlay.
>
> richard
>
> On Tue, 2008-08-12 at 19:01 +0200, Simeon Völkel wrote:
> > Hello,
> >
> > I've just compiled Cinelerra Version 4 on my Gentoo Linux.
> >
> > I'd like to share my changes I had to make to make cin4
> > compile for me in the hope someone else finds the following
> > information useful.
> >
> >
> > I didn't succeed in compiling cin4 without corrupting
> >
> > quicktime/thirdparty/faad2-2.0/plugins/mpeg4ip/faad2.cpp
> >
> > That's why I split up the second diff: The first version
> > seems to be crucial to compile cin4 on a 32bit (Gentoo?)
> > Linux, the second file contains the first one plus a work-
> > around to make cin4 actually compile for me.
> >
> > Both files are outputs of diff -u.
> >
> >
> > === Annotations for compiling ===
> >
> > Obviously, with version 4, a new dependency was introduced:
> > mpeg4ip. Without having the (devel-!) package installed,
> > you are likely to run into errors like
> >
> > faad2.h:28:26: error: codec_plugin.h: No such file or directory
> >
> > On Gentoo you'll just have to emerge mpeg4ip of course.
> >
> >
> > Secondly: Errors like
> >
> > faad2.cpp:86: error: invalid conversion from 'long unsigned int*' to
> 'uint32_t*'
> >
> > should be solved by applying my patches. Just as e.g.
> >
> > faad2.cpp:242: error: too few arguments to function
> >
> > and others.
> >
> > Unfortunately I wasn't able to fix the errors in line 370 of faad2.cpp
> > Example:
> >
> > faad2.cpp:370: error: cannot convert 'codec_data_t* (*)(const char*, int,
> int, format_list_t*, audio_info_t*, const uint8_t*, uint32_t, audio_vft_t*,
> > void*)' to 'const char*' in initialization
> >
> > Maybe Someone(TM) can solve that. I worked around by commenting
> > the call to makro out. (see faad2.cpp.2.patch)
> >
> >
> > === Annotations for running cinelerra-4 ===
> >
> > Paradoxically sudo make install didn't install (here) cinelerra in
> > /usr/local/bin but inside the local directory. Start cin4 by typing
> > ./bin/cinelerra in cinelerra-4 (where you just typed make).
> >
> > Monitoring audio when playing video in the record-dialog and Video-in
> > does not work for me 'out of the box', even if the checkbox is marked.
> > The audio-settings work for normal playback. If I find out how to get
> > this working here, I'll tell you. ;-)
> >
> > Finally I'd like to say "Thank you for Cinelerra-4" to Adam Williams.
> >
> > SimAV
> > plain text document attachment (aa_file.cpp.patch)
> > --- aa_file.cpp 2008-05-31 11:25:31.000000000 +0200
> > +++
> /static/cinelerra/cin4/quicktime/thirdparty/faad2-2.0/plugins/mpeg4ip/aa_file.cpp
> 2008-08-12 15:33:10.000000000 +0200
> > @@ -56,7 +56,7 @@
> > aac->m_buffer_size_max,
> > aac->m_ifile);
> >
> > - unsigned long freq;
> > + uint32_t freq;
> > unsigned char chans;
> >
> > faacDecInit(aac->m_info, (unsigned char *)aac->m_buffer,
> > plain text document attachment (faad2.cpp.1.patch)
> > --- faad2.cpp 2008-05-31 11:25:31.000000000 +0200
> > +++
> /static/cinelerra/cin4/quicktime/thirdparty/faad2-2.0/plugins/mpeg4ip/faad2.cpp
> 2008-08-12 16:59:50.000000000 +0200
> > @@ -76,7 +76,7 @@
> > }
> >
> > aac->m_info = faacDecOpen();
> > - unsigned long srate;
> > + uint32_t srate;
> > unsigned char chan;
> > if ((userdata == NULL && fmtp == NULL) ||
> > (faacDecInit2(aac->m_info,
> > @@ -97,7 +97,7 @@
> > aac->m_output_frame_size = 960;
> > }
> > }
> > - aac->m_freq = srate;
> > + aac->m_freq = srate;
> > aac->m_chans = chan;
> > aac->m_faad_inited = 1;
> > aac->m_msec_per_frame = aac->m_output_frame_size;
> > @@ -188,7 +188,7 @@
> > * If not initialized, do so.
> > */
> > abort();
> > - unsigned long freq;
> > + uint32_t freq;
> > unsigned char chans;
> >
> > faacDecInit(aac->m_info,
> > @@ -237,9 +237,9 @@
> > aac->m_vft->audio_configure(aac->m_ifptr,
> > aac->m_freq,
> > aac->m_chans,
> > - AUDIO_S16SYS,
> > + (audio_format_t) AUDIO_S16SYS,
> > aac->m_output_frame_size);
> > - uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr);
> > + uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr,
> aac->m_freq, aac->m_current_time);
> > aac->m_audio_inited = 1;
> > }
> > /*
> > @@ -322,7 +322,7 @@
> > }
> > if (userdata != NULL) {
> > mpeg4_audio_config_t audio_config;
> > - decode_mpeg4_audio_config(userdata, userdata_size, &audio_config);
> > + decode_mpeg4_audio_config(userdata, userdata_size, &audio_config,
> false);
> > message(LOG_DEBUG, "aac", "audio type is %d",
> audio_config.audio_object_type);
> > if (fmtp != NULL) free_fmtp_parse(fmtp);
> >
> >
> > plain text document attachment (faad2.cpp.2.patch)
> > --- faad2.cpp 2008-05-31 11:25:31.000000000 +0200
> > +++
> /static/cinelerra/cin4/quicktime/thirdparty/faad2-2.0/plugins/mpeg4ip/faad2.cpp
> 2008-08-12 16:59:50.000000000 +0200
> > @@ -76,7 +76,7 @@
> > }
> >
> > aac->m_info = faacDecOpen();
> > - unsigned long srate;
> > + uint32_t srate;
> > unsigned char chan;
> > if ((userdata == NULL && fmtp == NULL) ||
> > (faacDecInit2(aac->m_info,
> > @@ -97,7 +97,7 @@
> > aac->m_output_frame_size = 960;
> > }
> > }
> > - aac->m_freq = srate;
> > + aac->m_freq = srate;
> > aac->m_chans = chan;
> > aac->m_faad_inited = 1;
> > aac->m_msec_per_frame = aac->m_output_frame_size;
> > @@ -188,7 +188,7 @@
> > * If not initialized, do so.
> > */
> > abort();
> > - unsigned long freq;
> > + uint32_t freq;
> > unsigned char chans;
> >
> > faacDecInit(aac->m_info,
> > @@ -237,9 +237,9 @@
> > aac->m_vft->audio_configure(aac->m_ifptr,
> > aac->m_freq,
> > aac->m_chans,
> > - AUDIO_S16SYS,
> > + (audio_format_t) AUDIO_S16SYS,
> > aac->m_output_frame_size);
> > - uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr);
> > + uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr,
> aac->m_freq, aac->m_current_time);
> > aac->m_audio_inited = 1;
> > }
> > /*
> > @@ -322,7 +322,7 @@
> > }
> > if (userdata != NULL) {
> > mpeg4_audio_config_t audio_config;
> > - decode_mpeg4_audio_config(userdata, userdata_size, &audio_config);
> > + decode_mpeg4_audio_config(userdata, userdata_size, &audio_config,
> false);
> > message(LOG_DEBUG, "aac", "audio type is %d",
> audio_config.audio_object_type);
> > if (fmtp != NULL) free_fmtp_parse(fmtp);
> >
> > @@ -367,6 +367,8 @@
> > aac_file_eof
> > );
> > #else
> > +//commented this Makro out in order to make cinelerra4 compileable
> > +/*
> > AUDIO_CODEC_WITH_RAW_FILE_PLUGIN("faad2",
> > aac_codec_create,
> > aac_do_pause,
> > @@ -382,7 +384,34 @@
> > NULL,
> > 0
> > );
> > +*/
> > +//expanded the makro for error-hunting :)
> > +//this causes gcc to print out a different error.....
> > +/*extern "C" {
> > +codec_plugin_t mpeg4ip_codec_plugin
> > +=
> > +{ "faad2",
> > +"audio",
> > +"1.0",
> > +aac_codec_create,
> > +__null,
> > +aac_do_pause,
> > +aac_decode,
> > +aac_close,
> > +aac_codec_check,
> > +aac_file_check,
> > +aac_file_next_frame,
> > +aac_file_used_for_frame,
> > +aac_raw_file_seek_to,
> > +__null,
> > +aac_file_eof,
> > +__null,
> > +__null,
> > +__null,
> > +0,
> > +__null,
> > +};
> > +};
> > +*/
> > #endif
> > /* end file aa.cpp */
> >
> --
> Richard C. Pitt Pacific Data Capture
> [EMAIL PROTECTED] 604-644-9265
> http://blog.pacdat.net www.pacdat.net
> PGP Fingerprint: FCEF 167D 151B 64C4 3333 57F0 4F18 AF98 9F59 DD73
>
>
> _______________________________________________
> Cinelerra mailing list
> Cinelerra@skolelinux.no
> https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
>
