From owner-freebsd-multimedia@FreeBSD.ORG  Fri Dec 17 17:02:23 2010
Return-Path: <owner-freebsd-multimedia@FreeBSD.ORG>
Delivered-To: freebsd-multimedia@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7BD79106564A;
	Fri, 17 Dec 2010 17:02:23 +0000 (UTC) (envelope-from avg@freebsd.org)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
	by mx1.freebsd.org (Postfix) with ESMTP id 630BF8FC18;
	Fri, 17 Dec 2010 17:02:22 +0000 (UTC)
Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua
	[212.40.38.101])
	by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id TAA03258;
	Fri, 17 Dec 2010 19:02:21 +0200 (EET) (envelope-from avg@freebsd.org)
Message-ID: <4D0B979C.2080806@freebsd.org>
Date: Fri, 17 Dec 2010 19:02:20 +0200
From: Andriy Gapon <avg@freebsd.org>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US;
	rv:1.9.2.12) Gecko/20101029 Lightning/1.0b2 Thunderbird/3.1.6
MIME-Version: 1.0
To: Martin Matuska <mm@freebsd.org>, freebsd-multimedia@freebsd.org
References: <4D05332C.7010208@freebsd.org> <4D0B9752.6020308@freebsd.org>
In-Reply-To: <4D0B9752.6020308@freebsd.org>
X-Enigmail-Version: 1.1.2
Content-Type: text/plain; charset=x-viet-vps
Content-Transfer-Encoding: 7bit
Cc: Konstantin Belousov <kib@freebsd.org>
Subject: Re: ffmpeg and mmap
X-BeenThere: freebsd-multimedia@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Multimedia discussions <freebsd-multimedia.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-multimedia>, 
	<mailto:freebsd-multimedia-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-multimedia>
List-Post: <mailto:freebsd-multimedia@freebsd.org>
List-Help: <mailto:freebsd-multimedia-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-multimedia>, 
	<mailto:freebsd-multimedia-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 17 Dec 2010 17:02:23 -0000

on 17/12/2010 19:01 Andriy Gapon said the following:
> 
> Martin,
> 
> apologies - my report was incomplete.  I really meant to include the following new
> information at that time, but somehow I forgot about it and the
> _BSD_VISIBLE/POSIX_C_SOURCE discussion that followed distracted me.

And a more formal patch:
--- libswscale/utils.c.orig	2010-12-17 18:58:26.307218801 +0200
+++ libswscale/utils.c	2010-12-17 19:00:13.409221287 +0200
@@ -955,8 +955,8 @@
             c->chrMmx2FilterCodeSize = initMMX2HScaler(c->chrDstW, c->chrXInc,
NULL, NULL, NULL, 4);

 #ifdef MAP_ANONYMOUS
-            c->lumMmx2FilterCode = mmap(NULL, c->lumMmx2FilterCodeSize, PROT_READ
| PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
-            c->chrMmx2FilterCode = mmap(NULL, c->chrMmx2FilterCodeSize, PROT_READ
| PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
+            c->lumMmx2FilterCode = mmap(NULL, c->lumMmx2FilterCodeSize, PROT_READ
| PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+            c->chrMmx2FilterCode = mmap(NULL, c->chrMmx2FilterCodeSize, PROT_READ
| PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 #elif HAVE_VIRTUALALLOC
             c->lumMmx2FilterCode = VirtualAlloc(NULL, c->lumMmx2FilterCodeSize,
MEM_COMMIT, PAGE_EXECUTE_READWRITE);
             c->chrMmx2FilterCode = VirtualAlloc(NULL, c->chrMmx2FilterCodeSize,
MEM_COMMIT, PAGE_EXECUTE_READWRITE);
@@ -965,7 +965,11 @@
             c->chrMmx2FilterCode = av_malloc(c->chrMmx2FilterCodeSize);
 #endif

+#ifdef MAP_ANONYMOUS
+            if (c->lumMmx2FilterCode == MAP_FAILED || c->chrMmx2FilterCode ==
MAP_FAILED)
+#else
             if (!c->lumMmx2FilterCode || !c->chrMmx2FilterCode)
+#endif
                 goto fail;
             FF_ALLOCZ_OR_GOTO(c, c->hLumFilter   , (dstW
/8+8)*sizeof(int16_t), fail);
             FF_ALLOCZ_OR_GOTO(c, c->hChrFilter   , (c->chrDstW
/4+8)*sizeof(int16_t), fail);


-- 
Andriy Gapon