Re: [Ekiga-devel-list] [WIN32] compiling trunk version

[Thierry Simonnet <t simonnet esiee fr>]

On 04/01/2010 03:54 PM, Julien Puydt wrote:
> Hi,
>
> nice to have news :-)
>
> Thierry Simonnet a écrit :
> > opal/plugins/video/H.264/shared/h264frame.cxx needs also to be 
> > patched as written previously.
>
> Please push upstream.
Diff in attachment
> > Another trouble s:
> >
> >    * on ekiga/lib/engine/framework/boost-exceptions.cpp abort is not
> >      defined. How to correct it (defining abort or using exceptions).
> >      Commented out for now.
>
> Uh... I thought we had that one nailed already :-/
>
> >    * ekiga/src/gui/main_window.cpp: std::freopen((desk_path +
> >      "\\ekiga-stdout.txt").c_str (), "w", stdout);
> >      ./ekiga/src/gui/main_window.cpp: std::freopen((desk_path +
> >      "\\ekiga-stderr.txt").c_str (), "w", stderr);
> >      ./make.log:gui/main_window.cpp:4453: error: 'freopen' is not a
> >      member of 'std'
> >      ./make.log:gui/main_window.cpp:4454: error: 'freopen' is not a
> >      member of 'std'
> >      Commented out for now.
>
> Hmmm... missing #include <cstdio> ?
Testing. I recompile now. I will send a mail when it will be done.
> > The next trouble is GTK. I use gtk2-runtime-2.16.6-2010-02-24-ash.exe 
> > for packaging purposes. But ekiga needs now 2.18 version. No trouble 
> > for compiling, but gtk2-2.18-ash.exe is not packaged yet. It is then 
> > necessary to do a manual install on target.
>
> I checked before pushing the deps up, and the currently maintained 
> branch is 2.20 on win32 :
> http://www.gtk.org/download-windows.html
Done. But missing packaged gtk2-2.20-ash.exe for a full automated 
install under win32.
> Hope this helps,
>
> Snark


--

Thierry Simonnet

ESIEE-Paris

Par respect pour l’environnement, n’imprimez ce mail que si nécessaire


diff --git a/plugins/video/H.264/shared/h264frame.cxx b/plugins/video/H.264/shared/h264frame.cxx
--- a/plugins/video/H.264/shared/h264frame.cxx
+++ b/plugins/video/H.264/shared/h264frame.cxx
@@ -86,7 +86,6 @@ H264Frame::~H264Frame ()

 #ifndef LICENCE_MPL
 void H264Frame::SetFromFrame (x264_nal_t *NALs, int numberOfNALs) {
-  int vopBufferLen;
   int currentNAL = 0;

   uint8_t* currentPositionInFrame=(uint8_t*) _encodedFrame;
@@ -99,8 +98,9 @@ void H264Frame::SetFromFrame (x264_nal_t

   // read the nals out of the encoder and create meta data about their location and size in the frame
   for (currentNAL = 0; currentNAL<  numberOfNALs; currentNAL++) {
-    int currentNALLen;
-    currentNALLen = X264_NAL_ENCODE(currentPositionInFrame,&vopBufferLen, 1,&NALs[currentNAL]);
+    int currentNALLen = NALs[currentNAL].i_payload;
+    memcpy(currentPositionInFrame, NALs[currentNAL].p_payload, NALs[currentNAL].i_payload);
+
     if (currentNALLen>  0)
     {
       _NALs[_numberOfNALsInFrame].length = currentNALLen;