From e2a5fd2049a444f5bbfdca28d7c05ebb8a41de8b Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 2 Feb 2006 13:07:30 +0000 Subject: [PATCH] os2 thread, network and freetype2 support by (Paul Smedley | paulat a t smedleydot d o t info) Originally committed as revision 4922 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 6 +- libavcodec/Makefile | 5 ++ libavcodec/os2thread.c | 148 +++++++++++++++++++++++++++++++++++++++++ libavformat/tcp.c | 2 +- 4 files changed, 158 insertions(+), 3 deletions(-) create mode 100644 libavcodec/os2thread.c diff --git a/configure b/configure index d5f3b2cc7b..8159b0435b 100755 --- a/configure +++ b/configure @@ -411,7 +411,6 @@ v4l="no" v4l2="no" audio_oss="no" dv1394="no" -network="no" ffserver="no" vhook="no" os2="yes" @@ -1183,7 +1182,7 @@ int main( void ) { return (int) FT_Init_FreeType(0); } EOF freetype2=no -if test "x$targetos" != "xBeOS" && test "$os2" != "yes"; then +if test "x$targetos" != "xBeOS"; then if (freetype-config --version) >/dev/null 2>&1 ; then if $cc -o $TMPE $TMPC `freetype-config --cflags` `freetype-config --libs` > /dev/null 2>&1 ; then freetype2=yes @@ -1759,6 +1758,9 @@ fi if test "$os2" = "yes" ; then echo "#define CONFIG_OS2 1" >> $TMPH echo "CONFIG_OS2=yes" >> config.mak + echo "HAVE_OS2THREADS=yes" >> config.mak + echo "#define HAVE_OS2THREADS 1" >> $TMPH + echo "#define HAVE_THREADS 1" >> $TMPH fi if test "$TARGET_OS" = "SunOS" ; then diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 794d3c826a..18bdda1ac6 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -238,6 +238,11 @@ ifeq ($(HAVE_W32THREADS),yes) OBJS+= w32thread.o endif +ifeq ($(HAVE_OS2THREADS),yes) +OBJS+= os2thread.o +endif + + ifeq ($(HAVE_BEOSTHREADS),yes) OBJS+= beosthread.o endif diff --git a/libavcodec/os2thread.c b/libavcodec/os2thread.c new file mode 100644 index 0000000000..c39ac91002 --- /dev/null +++ b/libavcodec/os2thread.c @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2004 Michael Niedermayer + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ +//#define DEBUG + +// Ported by Vlad Stelmahovsky + +#include "avcodec.h" +#include "common.h" + +#ifdef HAVE_THREADS + +#define INCL_DOS +#define INCL_DOSERRORS +#define INCL_DOSDEVIOCTL +#include + +typedef struct ThreadContext{ + AVCodecContext *avctx; + int thread; + HEV work_sem; + HEV done_sem; + int (*func)(AVCodecContext *c, void *arg); + void *arg; + int ret; +}ThreadContext; + + +void thread_func(void *v){ + ThreadContext *c= v; + + for(;;){ + //printf("thread_func %X enter wait\n", (int)v); fflush(stdout); + DosWaitEventSem(c->work_sem, SEM_INDEFINITE_WAIT); +// WaitForSingleObject(c->work_sem, INFINITE); +//printf("thread_func %X after wait (func=%X)\n", (int)v, (int)c->func); fflush(stdout); + if(c->func) + c->ret= c->func(c->avctx, c->arg); + else + return; + //printf("thread_func %X signal complete\n", (int)v); fflush(stdout); + DosPostEventSem(c->done_sem); +// ReleaseSemaphore(c->done_sem, 1, 0); + } + + return; +} + +/** + * free what has been allocated by avcodec_thread_init(). + * must be called after decoding has finished, especially dont call while avcodec_thread_execute() is running + */ +void avcodec_thread_free(AVCodecContext *s){ + ThreadContext *c= s->thread_opaque; + int i; + + for(i=0; ithread_count; i++){ + + c[i].func= NULL; + DosPostEventSem(c[i].work_sem); + // ReleaseSemaphore(c[i].work_sem, 1, 0); + DosWaitThread((PTID)&c[i].thread,DCWW_WAIT); +// WaitForSingleObject(c[i].thread, INFINITE); + if(c[i].work_sem) DosCloseEventSem(c[i].work_sem);//CloseHandle(c[i].work_sem); + if(c[i].done_sem) DosCloseEventSem(c[i].done_sem);//CloseHandle(c[i].done_sem); + } + + av_freep(&s->thread_opaque); +} + +int avcodec_thread_execute(AVCodecContext *s, int (*func)(AVCodecContext *c2, void *arg2),void **arg, int *ret, int count){ + ThreadContext *c= s->thread_opaque; + int i; + + assert(s == c->avctx); + assert(count <= s->thread_count); + + /* note, we can be certain that this is not called with the same AVCodecContext by different threads at the same time */ + + for(i=0; ithread_count= thread_count; + + assert(!s->thread_opaque); + c= av_mallocz(sizeof(ThreadContext)*thread_count); + s->thread_opaque= c; + + for(i=0; iexecute= avcodec_thread_execute; + + return 0; +fail: + avcodec_thread_free(s); + return -1; +} +#endif diff --git a/libavformat/tcp.c b/libavformat/tcp.c index 619de273bf..4fd3d607a2 100644 --- a/libavformat/tcp.c +++ b/libavformat/tcp.c @@ -21,7 +21,7 @@ #include #include #include -#if defined(__BEOS__) +#if defined(__BEOS__) || defined(__INNOTEK_LIBC__) typedef int socklen_t; #endif #ifndef __BEOS__