Changeset 78c94529d1006fb64dfbf1629575f1146e1574f6

Timestamp:

02/11/08 02:06:37 (5 months ago)

Author:

Benjamin Pracht <bigben@videolan.org>

git-committer:

Benjamin Pracht <bigben@videolan.org> 1202691997 +0000

git-parent:

[e6e14e4e3e52ca9a28ff86ea3131cc20b2f5f5dd]

git-author:

Benjamin Pracht <bigben@videolan.org> 1202691997 +0000

Message:

* fix pthread support for x264 on win32

• Not sure at all the configure.ac part is right, anyone more knowledgable, please check.
  

Files:

• configure.ac (modified) (2 diffs)
• extras/contrib/src/Patches/x264-svn-win32.patch (modified) (5 diffs)
• modules/codec/x264.c (modified) (3 diffs)

configure.ac

@@ -3742 +3742 @@
-      VLC_ADD_CPPFLAGS([x264],[-I${real_x264_tree}])
-      VLC_ADD_LIBS([x264],[-L${real_x264_tree}])
-LDFLAGS="${LDFLAGS_save} ${LIBS_x264} ${THREAD_LIB}"
-AC_CHECK_LIB(x264, x264_encoder_open, [
-BUILTINS([x264
-LIBS([x264],[-lx264
+PKG_CHECK_MODULES(X264,x264, [
+  VLC_ADD_PLUGINS([x264])
+LDFLAGS([x264],[${X264_LIBS}
+CFLAGS([x264],[${X264_CFLAGS}
-      ],[
-        AC_MSG_ERROR([the specified tree hasn't been compiled])
@@ -3755 +3755 @@
-    fi
-  else
-    LDFLAGS="${LDFLAGS_save} ${LIBS_x264} ${THREAD_LIB}"
-    AC_CHECK_HEADERS(x264.h, [
-AC_CHECK_LIB(x264, x264_encoder_open
+PKG_CHECK_MODULES(X264,x264
-        VLC_ADD_PLUGINS([x264])
-
+
+
-      ],[
-        if test "${enable_x264}" = "yes"; then

extras/contrib/src/Patches/x264-svn-win32.patch

@@ -1 +1 @@
-Index: configure
-===================================================================
-672
+736
-+++ configure   (working copy)
-
+
+
+
+
+
+
+
+
+
-             pthread="yes"
-             ;;
@@ -20 +28 @@
-                 libpthread="-lpthreadGC2 -lwsock32"
-                 CFLAGS="$CFLAGS -DPTW32_STATIC_LIB"
-
+
+
+
+
+
+
- ASFLAGS=$ASFLAGS
- GTK=$gtk
@@ -31 +44 @@
- HAVE_GETOPT_LONG=$HAVE_GETOPT_LONG
- DEVNULL=$DEVNULL
+@@ -480,7 +487,7 @@
+ Description: H.264 (MPEG4 AVC) encoder library
+ Version: $(grep POINTVER < config.h | sed -e 's/.* "//; s/".*//')
+ Libs: $pclibs
+-Cflags: -I$includedir
++Cflags: -I$includedir $extradef
+ EOF
+ 
+ 
-Index: Makefile
-===================================================================
-672
+736
-+++ Makefile    (working copy)
-3,8 +73
+4,8 +74
- default: $(DEP) x264$(EXE)
- 
@@ -46 +68 @@
- $(SONAME): .depend $(OBJS) $(OBJASM)
-    $(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
-3,7 +93
+4,7 +94
- %.o: %.asm
-    $(AS) $(ASFLAGS) -o $@ $<
@@ -55 +77 @@
- .depend: config.mak
-    rm -f .depend
-6,14 +146
+9,14 +149
-    rm -rf test/
-    $(MAKE) -C gtk distclean

modules/codec/x264.c

@@ -34 +34 @@
-#include <vlc_codec.h>
-
+#ifdef PTW32_STATIC_LIB
+#include <pthread.h>
+#endif
-#include <x264.h>
-
@@ -1183 +1186 @@
-    }
-
+    /* We need to initialize pthreadw32 before we open the encoder, but only oncce for the whole application. Since pthreadw32 doesn't keep a refcount, do it ouurselves */
+#ifdef PTW32_STATIC_LIB
+    vlc_value_t lock, count;
+
+    var_Create( p_enc->p_libvlc, "pthread_win32_mutex", VLC_VAR_MUTEX );
+    var_Get( p_enc->p_libvlc, "pthread_win32_mutex", &lock );
+    vlc_mutex_lock( lock.p_address );
+
+    var_Create( p_enc->p_libvlc, "pthread_win32_count", VLC_VAR_INTEGER );
+    var_Get( p_enc->p_libvlc, "pthread_win32_count", &count );
+
+    if( count.i_int == 0 )
+    {   
+        msg_Dbg( p_enc, "initializing pthread-win32" );
+        if( !pthread_win32_process_attach_np() || !pthread_win32_thread_attach_np() )   
+        {   
+            msg_Warn( p_enc, "pthread Win32 Initialization failed" );
+            vlc_mutex_unlock( lock.p_address );
+            return VLC_EGENERIC;
+        }
+    }
+
+    count.i_int++;
+    var_Set( p_enc->p_libvlc, "pthread_win32_count", count );
+    vlc_mutex_unlock( lock.p_address );
+
+#endif
+
-    /* Open the encoder */
-    p_sys->h = x264_encoder_open( &p_sys->param );
@@ -1311 +1342 @@
-
-    x264_encoder_close( p_sys->h );
+
+#ifdef PTW32_STATIC_LIB
+    vlc_value_t lock, count;
+
+    var_Create( p_enc->p_libvlc, "pthread_win32_mutex", VLC_VAR_MUTEX );
+    var_Get( p_enc->p_libvlc, "pthread_win32_mutex", &lock );
+    vlc_mutex_lock( lock.p_address );
+
+    var_Create( p_enc->p_libvlc, "pthread_win32_count", VLC_VAR_INTEGER );
+    var_Get( p_enc->p_libvlc, "pthread_win32_count", &count );
+    count.i_int--;
+    var_Set( p_enc->p_libvlc, "pthread_win32_count", count );
+
+    if( count.i_int == 0 )
+    {   
+        pthread_win32_thread_detach_np();
+        pthread_win32_process_detach_np();
+        msg_Dbg( p_enc, "pthread-win32 deinitialized" );
+    }
+    vlc_mutex_unlock( lock.p_address );
+#endif
+
-    free( p_sys->p_buffer );
-    free( p_sys );