Re: [CinCVS] Patch for faad 2.5 compatibility
On Wed February 14 2007, Mikko Huhtala wrote: The FreshRPMS-packaged Cinelerra contains the following patch to make Cinelerra use the new function names in the faad 2.5 library (NeAACDec* instead of faacDec*). Stock faad 2.5 still contains the old names for compatibility, but they have been removed from the FreshRPMS faad2 package and as I understand the old function names are deprecated. I have successfully applied the patch against revision 998. Speaking of the Freshrpms package, I had read in the documentation of having to compile Cinelerra with a certain option or switch, I can't remember the exact terminology, to enable full use of the GL features of the video card. Excuse me if I'm putting this wrong, but I can't find that section right at the moment. If anyone knows what I'm referring to, can you tell me if the Freshrpms package is compiled for that feature? -- Claude Jones Brunswick, MD, USA ___ Cinelerra mailing list Cinelerra@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
Re: [CinCVS] Patch for faad 2.5 compatibility
Claude Jones writes: Speaking of the Freshrpms package, I had read in the documentation of having to compile Cinelerra with a certain option or switch, I can't remember the exact terminology, to enable full use of the GL features of the video card. Excuse me if I'm putting this wrong, but I can't find that section right at the moment. If anyone knows what I'm referring to, can you tell me if the Freshrpms package is compiled for that feature? rpm -qi --changelog cinelerra | less says Try to enable OpenGL, but it seems like only proprietary NVidia libraries would work, and the configure detection would need some changes too. So no. I'm assuming that should read 'tried' instead of 'try'. I think the option to configure to enable OpenGL is '--enable-opengl', but OpenGL 2.0 headers should be detected automatically if you have them. Mikko ___ Cinelerra mailing list Cinelerra@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
Re: [CinCVS] Patch for faad 2.5 compatibility
This is very good, but in order to include it into cinelerra main svn,
the difference between old/new one should be ifdefed, so it can be
switched depending on the build environment
b
ye
andaz
On Wed, 2007-02-14 at 11:01 +0200, Mikko Huhtala wrote:
The FreshRPMS-packaged Cinelerra contains the following patch to make
Cinelerra use the new function names in the faad 2.5 library
(NeAACDec* instead of faacDec*). Stock faad 2.5 still contains the old
names for compatibility, but they have been removed from the FreshRPMS
faad2 package and as I understand the old function names are
deprecated. I have successfully applied the patch against revision
998.
The patch was written by Matthias Saou matthias rpmforge net, the
maintainer of the Cinelerra rpm.
Mikko
---
diff -Naupr cinelerra-2.1.orig/quicktime/ffmpeg/libavcodec/faad.c
cinelerra-2.1/quicktime/ffmpeg/libavcodec/faad.c
--- cinelerra-2.1.orig/quicktime/ffmpeg/libavcodec/faad.c 2005-09-28
20:39:56.0 +0200
+++ cinelerra-2.1/quicktime/ffmpeg/libavcodec/faad.c 2007-01-09
14:46:42.0 +0100
@@ -54,42 +54,42 @@ typedef struct {
int flags;
/* faad calls */
-faacDecHandle FAADAPI (*faacDecOpen)(void);
-faacDecConfigurationPtr FAADAPI
(*faacDecGetCurrentConfiguration)(faacDecHandle hDecoder);
+NeAACDecHandle FAADAPI (*NeAACDecOpen)(void);
+NeAACDecConfigurationPtr FAADAPI
(*NeAACDecGetCurrentConfiguration)(NeAACDecHandle hDecoder);
#ifndef FAAD2_VERSION
- int FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder,
- faacDecConfigurationPtr config);
- int FAADAPI (*faacDecInit)(faacDecHandle hDecoder,
+ int FAADAPI (*NeAACDecSetConfiguration)(NeAACDecHandle hDecoder,
+ NeAACDecConfigurationPtr config);
+ int FAADAPI (*NeAACDecInit)(NeAACDecHandle hDecoder,
unsigned char *buffer,
unsigned long *samplerate,
unsigned long *channels);
- int FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, unsigned char
*pBuffer,
+ int FAADAPI (*NeAACDecInit2)(NeAACDecHandle hDecoder, unsigned char
*pBuffer,
unsigned long SizeOfDecoderSpecificInfo,
unsigned long *samplerate, unsigned long
*channels);
- int FAADAPI (*faacDecDecode)(faacDecHandle hDecoder,
+ int FAADAPI (*NeAACDecDecode)(NeAACDecHandle hDecoder,
unsigned char *buffer,
unsigned long *bytesconsumed,
short *sample_buffer,
unsigned long *samples);
#else
- unsigned char FAADAPI (*faacDecSetConfiguration)(faacDecHandle hDecoder,
- faacDecConfigurationPtr
config);
- long FAADAPI (*faacDecInit)(faacDecHandle hDecoder,
+ unsigned char FAADAPI (*NeAACDecSetConfiguration)(NeAACDecHandle
hDecoder,
+
NeAACDecConfigurationPtr config);
+ long FAADAPI (*NeAACDecInit)(NeAACDecHandle hDecoder,
unsigned char *buffer,
unsigned long buffer_size,
unsigned long *samplerate,
unsigned char *channels);
- char FAADAPI (*faacDecInit2)(faacDecHandle hDecoder, unsigned char
*pBuffer,
+ char FAADAPI (*NeAACDecInit2)(NeAACDecHandle hDecoder, unsigned char
*pBuffer,
unsigned long SizeOfDecoderSpecificInfo,
unsigned long *samplerate, unsigned char
*channels);
- void *FAADAPI (*faacDecDecode)(faacDecHandle hDecoder,
- faacDecFrameInfo *hInfo,
+ void *FAADAPI (*NeAACDecDecode)(NeAACDecHandle hDecoder,
+ NeAACDecFrameInfo *hInfo,
unsigned char *buffer,
unsigned long
buffer_size);
- char* FAADAPI (*faacDecGetErrorMessage)(unsigned char errcode);
+ char* FAADAPI (*NeAACDecGetErrorMessage)(unsigned char errcode);
#endif
-void FAADAPI (*faacDecClose)(faacDecHandle hDecoder);
+void FAADAPI (*NeAACDecClose)(NeAACDecHandle hDecoder);
} FAACContext;
@@ -112,13 +112,13 @@ static int faac_init_mp4(AVCodecContext
int r = 0;
if (avctx-extradata)
- r = s-faacDecInit2(s-faac_handle, (uint8_t*) avctx-extradata,
+ r = s-NeAACDecInit2(s-faac_handle, (uint8_t*) avctx-extradata,
avctx-extradata_size,
samplerate, channels);
-// else r = s-faacDecInit(s-faac_handle ... );
+// else r =
Re: [CinCVS] Patch for faad 2.5 compatibility
On Wednesday February 14 2007 4:40:19 am Mikko Huhtala wrote: I think the option to configure to enable OpenGL is '--enable-opengl', but OpenGL 2.0 headers should be detected automatically if you have them. I'm sorry. I don't know enough to completely understand the above. I'm running an NVidia 6200 with the NVidia drivers. Are you saying that OpenGL should 'just work' and that I shouldn't have to do anything with the Cinelerra rpm from freshrpms? -- Claude Jones Brunswick, MD, USA ___ Cinelerra mailing list Cinelerra@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
Re: [CinCVS] Patch for faad 2.5 compatibility
Andra$,1!(B Tori writes: This is very good, but in order to include it into cinelerra main svn, the difference between old/new one should be ifdefed, so it can be switched depending on the build environment b ye andaz I could try to fix this. There already a macro named FAAD2_VERSION, which is used to select between faad versions 1 and 2. Is it ok to drop support for faad 1 or should I just add version 2.5 to the pile? Mikko ___ Cinelerra mailing list Cinelerra@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
Re: [CinCVS] Patch for faad 2.5 compatibility
On Wed, 2007-02-14 at 13:10 +0200, Mikko Huhtala wrote: Andra$,1!(B Tori writes: This is very good, but in order to include it into cinelerra main svn, the difference between old/new one should be ifdefed, so it can be switched depending on the build environment b ye andaz I could try to fix this. There already a macro named FAAD2_VERSION, which is used to select between faad versions 1 and 2. Is it ok to drop support for faad 1 or should I just add version 2.5 to the pile? i'd just add another one bye andraz ___ Cinelerra mailing list Cinelerra@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
Re: [CinCVS] Patch for faad 2.5 compatibility
Claude, The OpenGL driver set would have to have been compiled in the FreshRPMs build of cinelerra in order for it to be listed as a chooseable option in Preferences - Playback - Video Driver. Go ahead and install the FreshRPMs rpm. If you start Cinelerra and it does not have the option listed above, you know it wasn't compiled with OpenGL. Your 6200 drivers should work fine. ATI drivers do not. scott On Wed, 2007-02-14 at 05:02 -0500, Claude Jones wrote: On Wednesday February 14 2007 4:40:19 am Mikko Huhtala wrote: I think the option to configure to enable OpenGL is '--enable-opengl', but OpenGL 2.0 headers should be detected automatically if you have them. I'm sorry. I don't know enough to completely understand the above. I'm running an NVidia 6200 with the NVidia drivers. Are you saying that OpenGL should 'just work' and that I shouldn't have to do anything with the Cinelerra rpm from freshrpms? ___ Cinelerra mailing list Cinelerra@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
Re: [CinCVS] Patch for faad 2.5 compatibility
On Wed February 14 2007, Scott C. Frase wrote: Claude, The OpenGL driver set would have to have been compiled in the FreshRPMs build of cinelerra in order for it to be listed as a chooseable option in Preferences - Playback - Video Driver. Go ahead and install the FreshRPMs rpm. If you start Cinelerra and it does not have the option listed above, you know it wasn't compiled with OpenGL. Your 6200 drivers should work fine. ATI drivers do not. scott Thank you, Scott. There is nothing in the Video driver settings list that includes GL in the name. I guess it means that if I want it, I'll have to switch over to svn, something I've been contemplating for a long time, just never took the time to learn -- Claude Jones Brunswick, MD, USA ___ Cinelerra mailing list Cinelerra@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
Re: [CinCVS] Patch for faad 2.5 compatibility
On 2007-02-14 16:10, Claude Jones wrote: On Wed February 14 2007, Scott C. Frase wrote: Claude, The OpenGL driver set would have to have been compiled in the FreshRPMs build of cinelerra in order for it to be listed as a chooseable option in Preferences - Playback - Video Driver. Â Go ahead and install the FreshRPMs rpm. Â If you start Cinelerra and it does not have the option listed above, you know it wasn't compiled with OpenGL. Your 6200 drivers should work fine. Â ATI drivers do not. scott Thank you, Scott. There is nothing in the Video driver settings list that includes GL in the name. I guess it means that if I want it, I'll have to switch over to svn, something I've been contemplating for a long time, just never took the time to learn It's possible that someone else packages it for openGL. For SUSE, I build both openGL and non-openGL versions of the openSUSE 10.2 RPMs. -- Kevin ___ Cinelerra mailing list Cinelerra@skolelinux.no https://init.linpro.no/mailman/skolelinux.no/listinfo/cinelerra
