mozilla
/
mozilla-history
зеркало из https://github.com/mozilla/mozilla-history.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[OS/2] Bug 448918: add media support on OS/2 (liboggplay part), p=dragtext@e-vertise, r=chris.double

This commit is contained in:
Peter Weilbacher 2009-07-23 10:37:01 +03:00
Родитель 8eefc39c4c
Коммит 2c2088d586
9 изменённых файлов: 554 добавлений и 0 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
media/liboggplay/README_MOZILLA
Просмотреть файл

@ -39,5 +39,9 @@ bug495129a.patch: Fix from liboggplay commit 6c8e11.
bug495129b.patch: Fix from liboggplay commit 3602bf.
bug487519.patch: Fix for bug 487519.
oggplay_os2.patch: Bug 448918 - add OS/2 support (this patch should be
removed when OS/2 support is added upstream)
bug498815.patch: Fix for bug 498815.
bug498824.patch: Fix for bug 498824.

304
media/liboggplay/oggplay_os2.patch Normal file
Просмотреть файл

@ -0,0 +1,304 @@
diff --git a/media/liboggplay/src/liboggplay/oggplay_private.h b/media/liboggplay/src/liboggplay/oggplay_private.h
--- a/media/liboggplay/src/liboggplay/oggplay_private.h
+++ b/media/liboggplay/src/liboggplay/oggplay_private.h
@@ -62,16 +62,22 @@
#ifdef WIN32
#ifdef HAVE_WINSOCK2
#include <winsock2.h>
#else
#include <winsock.h>
#endif
+#endif
+
+#ifdef OS2
+#define INCL_DOSSEMAPHORES
+#define INCL_DOSPROCESS
+#include <os2.h>
#endif
// for Win32 <windows.h> has to be included last
#include "std_semaphore.h"
/**
*
* has_been_presented: 0 until the data has been added as a "required" element,
diff --git a/media/liboggplay/src/liboggplay/oggplay_tools.c b/media/liboggplay/src/liboggplay/oggplay_tools.c
--- a/media/liboggplay/src/liboggplay/oggplay_tools.c
+++ b/media/liboggplay/src/liboggplay/oggplay_tools.c
@@ -53,15 +53,17 @@ oggplay_sys_time_in_ms(void) {
return (ogg_int64_t)tv.tv_sec * 1000 + (ogg_int64_t)tv.tv_usec / 1000;
#endif
}
void
oggplay_millisleep(long ms) {
#ifdef WIN32
Sleep(ms);
+#elif defined(OS2)
+ DosSleep(ms);
#else
struct timespec ts = {0, (ogg_int64_t)ms * 1000000LL};
nanosleep(&ts, NULL);
#endif
}
diff --git a/media/liboggplay/src/liboggplay/os2_semaphore.c b/media/liboggplay/src/liboggplay/os2_semaphore.c
new file mode 100644
--- /dev/null
+++ b/media/liboggplay/src/liboggplay/os2_semaphore.c
@@ -0,0 +1,163 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Mozilla browser.
+ *
+ * The Initial Developer of the Original Code is
+ * Richard Walsh
+ * Portions created by the Initial Developer are Copyright (c) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** *
+ */
+/*****************************************************************************/
+/*
+ * This is a conservative implementation of a posix counting semaphore.
+ * It relies on the state of the underlying OS/2 event semaphore to
+ * control whether sem_wait() blocks or returns immediately, and only
+ * uses its count to change the sem's state from posted to reset.
+ * (A more "activist" approach would use the count to decide whether
+ * to return immediately or to call DosWaitEventSem().)
+ *
+ */
+/*****************************************************************************/
+
+#include <stdlib.h>
+#define INCL_DOS
+#include <os2.h>
+#include "os2_semaphore.h"
+
+#ifndef ERROR_SEM_BUSY
+#define ERROR_SEM_BUSY 301
+#endif
+
+#define SEM_WAIT 20000
+
+/*****************************************************************************/
+
+int sem_init(sem_t *sem, int pshared, unsigned value)
+{
+ OS2SEM * psem;
+
+ if (!sem)
+ return -1;
+ *sem = 0;
+
+ psem = (OS2SEM*)malloc(sizeof(OS2SEM));
+ if (!psem)
+ return -1;
+
+ if (DosCreateMutexSem(0, &psem->hmtx, 0, 0)) {
+ free(psem);
+ return -1;
+ }
+
+ if (DosCreateEventSem(0, &psem->hev, 0, (value ? 1 : 0))) {
+ DosCloseMutexSem(psem->hmtx);
+ free(psem);
+ return -1;
+ }
+
+ psem->cnt = value;
+ *sem = psem;
+ return 0;
+}
+
+/*****************************************************************************/
+
+int sem_wait(sem_t *sem)
+{
+ OS2SEM * psem;
+ ULONG cnt;
+
+ if (!sem || !*sem)
+ return -1;
+ psem = *sem;
+
+ if (DosWaitEventSem(psem->hev, -1))
+ return -1;
+
+ if (DosRequestMutexSem(psem->hmtx, SEM_WAIT))
+ return -1;
+
+ if (psem->cnt)
+ psem->cnt--;
+ if (!psem->cnt)
+ DosResetEventSem(psem->hev, &cnt);
+ DosReleaseMutexSem(psem->hmtx);
+
+ return 0;
+}
+
+/*****************************************************************************/
+
+int sem_post(sem_t *sem)
+{
+ OS2SEM * psem;
+
+ if (!sem || !*sem)
+ return -1;
+ psem = *sem;
+
+ if (!DosRequestMutexSem(psem->hmtx, SEM_WAIT)) {
+ psem->cnt++;
+ DosPostEventSem(psem->hev);
+ DosReleaseMutexSem(psem->hmtx);
+ return 0;
+ }
+
+ return -1;
+}
+
+/*****************************************************************************/
+
+int sem_destroy(sem_t *sem)
+{
+ OS2SEM * psem;
+
+ if (!sem || !*sem)
+ return -1;
+ psem = *sem;
+
+ if (DosCloseMutexSem(psem->hmtx) == ERROR_SEM_BUSY) {
+ DosRequestMutexSem(psem->hmtx, SEM_WAIT);
+ DosReleaseMutexSem(psem->hmtx);
+ DosCloseMutexSem(psem->hmtx);
+ }
+
+ if (DosCloseEventSem(psem->hev) == ERROR_SEM_BUSY) {
+ DosPostEventSem(psem->hev);
+ DosSleep(1);
+ DosCloseEventSem(psem->hev);
+ }
+
+ free(psem);
+ return 0;
+}
+
+/*****************************************************************************/
+
diff --git a/media/liboggplay/src/liboggplay/os2_semaphore.h b/media/liboggplay/src/liboggplay/os2_semaphore.h
new file mode 100644
--- /dev/null
+++ b/media/liboggplay/src/liboggplay/os2_semaphore.h
@@ -0,0 +1,57 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Mozilla browser.
+ *
+ * The Initial Developer of the Original Code is
+ * Richard Walsh
+ * Portions created by the Initial Developer are Copyright (c) 2008
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** *
+ */
+/*****************************************************************************/
+
+#ifndef _os2_semaphore_
+#define _os2_semaphore_
+
+typedef struct _OS2SEM {
+ HMTX hmtx;
+ HEV hev;
+ ULONG cnt;
+} OS2SEM;
+
+typedef OS2SEM * sem_t;
+
+int sem_init(sem_t *sem, int pshared, unsigned value);
+int sem_wait(sem_t *sem);
+int sem_post(sem_t *sem);
+int sem_destroy(sem_t *sem);
+
+#endif
+/*****************************************************************************/
+
diff --git a/media/liboggplay/src/liboggplay/std_semaphore.h b/media/liboggplay/src/liboggplay/std_semaphore.h
--- a/media/liboggplay/src/liboggplay/std_semaphore.h
+++ b/media/liboggplay/src/liboggplay/std_semaphore.h
@@ -83,16 +83,23 @@ typedef sem_t semaphore;
typedef sem_t semaphore;
#elif defined(WIN32)
#include <windows.h>
#define SEM_CREATE(p,s) (!(p = CreateSemaphore(NULL, (long)(s), (long)(s), NULL)))
#define SEM_SIGNAL(p) (!ReleaseSemaphore(p, 1, NULL))
#define SEM_WAIT(p) WaitForSingleObject(p, INFINITE)
#define SEM_CLOSE(p) (!CloseHandle(p))
typedef HANDLE semaphore;
+#elif defined(OS2)
+#include "os2_semaphore.h"
+#define SEM_CREATE(p,s) sem_init(&(p), 1, s)
+#define SEM_SIGNAL(p) sem_post(&(p))
+#define SEM_WAIT(p) sem_wait(&(p))
+#define SEM_CLOSE(p) sem_destroy(&(p))
+typedef sem_t semaphore;
#elif defined(__APPLE__)
#include <Carbon/Carbon.h>
#define SEM_CREATE(p,s) MPCreateSemaphore(s, s, &(p))
#define SEM_SIGNAL(p) MPSignalSemaphore(p)
#define SEM_WAIT(p) MPWaitOnSemaphore(p, kDurationForever)
#define SEM_CLOSE(p) MPDeleteSemaphore(p)
typedef MPSemaphoreID semaphore;
#endif

10
media/liboggplay/src/liboggplay/Makefile.in
Просмотреть файл

@ -66,6 +66,16 @@ CSRCS = \
oggplay_tools.c \
$(NULL)
ifeq ($(OS_ARCH),OS2)
EXPORTS += \
os2_semaphore.h \
$(NULL)
CSRCS += \
os2_semaphore.c \
$(NULL)
endif
include $(topsrcdir)/config/rules.mk
LOCAL_INCLUDES += -I$(srcdir)/../../include/oggplay

6
media/liboggplay/src/liboggplay/oggplay_private.h
Просмотреть файл

@ -69,6 +69,12 @@
#endif
#endif
#ifdef OS2
#define INCL_DOSSEMAPHORES
#define INCL_DOSPROCESS
#include <os2.h>
#endif
// for Win32 <windows.h> has to be included last
#include "std_semaphore.h"

2
media/liboggplay/src/liboggplay/oggplay_tools.c
Просмотреть файл

@ -58,6 +58,8 @@ void
oggplay_millisleep(long ms) {
#ifdef WIN32
Sleep(ms);
#elif defined(OS2)
DosSleep(ms);
#else
struct timespec ts = {0, (ogg_int64_t)ms * 1000000LL};
nanosleep(&ts, NULL);

163
media/liboggplay/src/liboggplay/os2_semaphore.c Normal file
Просмотреть файл

@ -0,0 +1,163 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is the Mozilla browser.
*
* The Initial Developer of the Original Code is
* Richard Walsh
* Portions created by the Initial Developer are Copyright (c) 2008
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** *
*/
/*****************************************************************************/
/*
* This is a conservative implementation of a posix counting semaphore.
* It relies on the state of the underlying OS/2 event semaphore to
* control whether sem_wait() blocks or returns immediately, and only
* uses its count to change the sem's state from posted to reset.
* (A more "activist" approach would use the count to decide whether
* to return immediately or to call DosWaitEventSem().)
*
*/
/*****************************************************************************/
#include <stdlib.h>
#define INCL_DOS
#include <os2.h>
#include "os2_semaphore.h"
#ifndef ERROR_SEM_BUSY
#define ERROR_SEM_BUSY 301
#endif
#define SEM_WAIT 20000
/*****************************************************************************/
int sem_init(sem_t *sem, int pshared, unsigned value)
{
OS2SEM * psem;
if (!sem)
return -1;
*sem = 0;
psem = (OS2SEM*)malloc(sizeof(OS2SEM));
if (!psem)
return -1;
if (DosCreateMutexSem(0, &psem->hmtx, 0, 0)) {
free(psem);
return -1;
}
if (DosCreateEventSem(0, &psem->hev, 0, (value ? 1 : 0))) {
DosCloseMutexSem(psem->hmtx);
free(psem);
return -1;
}
psem->cnt = value;
*sem = psem;
return 0;
}
/*****************************************************************************/
int sem_wait(sem_t *sem)
{
OS2SEM * psem;
ULONG cnt;
if (!sem || !*sem)
return -1;
psem = *sem;
if (DosWaitEventSem(psem->hev, -1))
return -1;
if (DosRequestMutexSem(psem->hmtx, SEM_WAIT))
return -1;
if (psem->cnt)
psem->cnt--;
if (!psem->cnt)
DosResetEventSem(psem->hev, &cnt);
DosReleaseMutexSem(psem->hmtx);
return 0;
}
/*****************************************************************************/
int sem_post(sem_t *sem)
{
OS2SEM * psem;
if (!sem || !*sem)
return -1;
psem = *sem;
if (!DosRequestMutexSem(psem->hmtx, SEM_WAIT)) {
psem->cnt++;
DosPostEventSem(psem->hev);
DosReleaseMutexSem(psem->hmtx);
return 0;
}
return -1;
}
/*****************************************************************************/
int sem_destroy(sem_t *sem)
{
OS2SEM * psem;
if (!sem || !*sem)
return -1;
psem = *sem;
if (DosCloseMutexSem(psem->hmtx) == ERROR_SEM_BUSY) {
DosRequestMutexSem(psem->hmtx, SEM_WAIT);
DosReleaseMutexSem(psem->hmtx);
DosCloseMutexSem(psem->hmtx);
}
if (DosCloseEventSem(psem->hev) == ERROR_SEM_BUSY) {
DosPostEventSem(psem->hev);
DosSleep(1);
DosCloseEventSem(psem->hev);
}
free(psem);
return 0;
}
/*****************************************************************************/

57
media/liboggplay/src/liboggplay/os2_semaphore.h Normal file
Просмотреть файл

@ -0,0 +1,57 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is the Mozilla browser.
*
* The Initial Developer of the Original Code is
* Richard Walsh
* Portions created by the Initial Developer are Copyright (c) 2008
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** *
*/
/*****************************************************************************/
#ifndef _os2_semaphore_
#define _os2_semaphore_
typedef struct _OS2SEM {
HMTX hmtx;
HEV hev;
ULONG cnt;
} OS2SEM;
typedef OS2SEM * sem_t;
int sem_init(sem_t *sem, int pshared, unsigned value);
int sem_wait(sem_t *sem);
int sem_post(sem_t *sem);
int sem_destroy(sem_t *sem);
#endif
/*****************************************************************************/

7
media/liboggplay/src/liboggplay/std_semaphore.h
Просмотреть файл

@ -88,6 +88,13 @@ typedef sem_t semaphore;
#define SEM_WAIT(p) WaitForSingleObject(p, INFINITE)
#define SEM_CLOSE(p) (!CloseHandle(p))
typedef HANDLE semaphore;
#elif defined(OS2)
#include "os2_semaphore.h"
#define SEM_CREATE(p,s) sem_init(&(p), 1, s)
#define SEM_SIGNAL(p) sem_post(&(p))
#define SEM_WAIT(p) sem_wait(&(p))
#define SEM_CLOSE(p) sem_destroy(&(p))
typedef sem_t semaphore;
#elif defined(__APPLE__)
#include <Carbon/Carbon.h>
#define SEM_CREATE(p,s) MPCreateSemaphore(s, s, &(p))

1
media/liboggplay/update.sh
Просмотреть файл

@ -59,6 +59,7 @@ patch -p3 < bug488951_yuv_fix_2.patch
patch -p3 < bug495129a.patch
patch -p3 < bug495129b.patch
patch -p3 < bug487519.patch
patch -p3 < oggplay_os2.patch
patch -p3 < bug498815.patch
patch -p3 < bug498824.patch
patch -p3 < bug496529.patch