Mercurial > mplayer.hg
view osdep/shmem.c @ 29770:db80b9d20406
demuxer.c: Add initialization missing from previous commit
Reimar's previous commit ("Unbreak the demuxer-specific code in
video.c with e.g.") added the new field "non_interleaved" in
demux_stream structs, but this field was not initialized anywhere.
Under suitable circumstances this could cause a "Too many
video/audio packets in the buffer" error and failing playback. Fix
the problem by cleaning up the code that creates new instances of the
struct. Now fields will be initialized to 0 by default.
author | uau |
---|---|
date | Mon, 02 Nov 2009 01:40:09 +0000 |
parents | 5cfef41a1771 |
children | 321e9ea69b9f |
line wrap: on
line source
/* * shared memory allocation * * based on mpg123's xfermem.c by * Oliver Fromme <oliver.fromme@heim3.tu-clausthal.de> * * This file is part of MPlayer. * * MPlayer is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * MPlayer 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 General Public License for more details. * * You should have received a copy of the GNU General Public License along * with MPlayer; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> #include <errno.h> #include <sys/types.h> #include <sys/time.h> #include <sys/uio.h> #ifdef HAVE_SYS_MMAN_H #include <sys/mman.h> #elif defined(__BEOS__) #include <mman.h> #endif #include <sys/socket.h> #include <fcntl.h> #include "mp_msg.h" #ifdef AIX #include <sys/select.h> #endif #ifdef HAVE_SHM #include <sys/ipc.h> #include <sys/shm.h> #endif #if defined(MAP_ANONYMOUS) && !defined(MAP_ANON) #define MAP_ANON MAP_ANONYMOUS #endif static int shmem_type=0; void* shmem_alloc(int size){ void* p; static int devzero = -1; while(1){ switch(shmem_type){ case 0: // ========= MAP_ANON|MAP_SHARED ========== #ifdef MAP_ANON p=mmap(0,size,PROT_READ|PROT_WRITE,MAP_ANON|MAP_SHARED,-1,0); if(p==MAP_FAILED) break; // failed mp_dbg(MSGT_OSDEP, MSGL_DBG2, "shmem: %d bytes allocated using mmap anon (%p)\n",size,p); return p; #else // system does not support MAP_ANON at all (e.g. solaris 2.5.1/2.6), just fail mp_dbg(MSGT_OSDEP, MSGL_DBG3, "shmem: using mmap anon failed\n"); #endif break; case 1: // ========= MAP_SHARED + /dev/zero ========== if (devzero == -1 && (devzero = open("/dev/zero", O_RDWR, 0)) == -1) break; p=mmap(0,size,PROT_READ|PROT_WRITE,MAP_SHARED,devzero,0); if(p==MAP_FAILED) break; // failed mp_dbg(MSGT_OSDEP, MSGL_DBG2, "shmem: %d bytes allocated using mmap /dev/zero (%p)\n",size,p); return p; case 2: { // ========= shmget() ========== #ifdef HAVE_SHM struct shmid_ds shmemds; int shmemid; if ((shmemid = shmget(IPC_PRIVATE, size, IPC_CREAT | 0600)) == -1) break; if ((p = shmat(shmemid, 0, 0)) == (void *)-1){ mp_msg(MSGT_OSDEP, MSGL_ERR, "shmem: shmat() failed: %s\n", strerror(errno)); shmctl (shmemid, IPC_RMID, &shmemds); break; } if (shmctl(shmemid, IPC_RMID, &shmemds) == -1) { mp_msg(MSGT_OSDEP, MSGL_ERR, "shmem: shmctl() failed: %s\n", strerror(errno)); if (shmdt(p) == -1) perror ("shmdt()"); break; } mp_dbg(MSGT_OSDEP, MSGL_DBG2, "shmem: %d bytes allocated using SHM (%p)\n",size,p); return p; #else mp_msg(MSGT_OSDEP, MSGL_FATAL, "shmem: no SHM support was compiled in!\n"); return NULL; #endif } default: mp_msg(MSGT_OSDEP, MSGL_FATAL, "FATAL: Cannot allocate %d bytes of shared memory :(\n",size); return NULL; } ++shmem_type; } } void shmem_free(void* p,int size){ switch(shmem_type){ case 0: case 1: if(munmap(p,size)) { mp_msg(MSGT_OSDEP, MSGL_ERR, "munmap failed on %p %d bytes: %s\n", p,size,strerror(errno)); } break; case 2: #ifdef HAVE_SHM if (shmdt(p) == -1) mp_msg(MSGT_OSDEP, MSGL_ERR, "shmfree: shmdt() failed: %s\n", strerror(errno)); #else mp_msg(MSGT_OSDEP, MSGL_ERR, "shmfree: no SHM support was compiled in!\n"); #endif break; } }