Date: Sun, 27 Apr 2014 18:20:50 +0000 (UTC) From: Juergen Lock <nox@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352445 - in head/multimedia/vlc: . files Message-ID: <201404271820.s3RIKooc072919@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nox Date: Sun Apr 27 18:20:50 2014 New Revision: 352445 URL: http://svnweb.freebsd.org/changeset/ports/352445 QAT: https://qat.redports.org/buildarchive/r352445/ Log: - Backport upstream fix for .mkv playback stutter using oss audio. - Bump PORTREVISION. PR: ports/186093 Submitted by: "Marko Cupać" <marko.cupac@mimar.rs> (PR) Obtained from: http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1622c2c6e0e15a38fef723086ca8bf75a75b46b Added: head/multimedia/vlc/files/patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.4 (contents, props changed) Modified: head/multimedia/vlc/Makefile Modified: head/multimedia/vlc/Makefile ============================================================================== --- head/multimedia/vlc/Makefile Sun Apr 27 18:17:37 2014 (r352444) +++ head/multimedia/vlc/Makefile Sun Apr 27 18:20:50 2014 (r352445) @@ -3,6 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.1.4 +PORTREVISION= 1 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ Added: head/multimedia/vlc/files/patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.4 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/vlc/files/patch-c1622c2c6e0e15a38fef723086ca8bf75a75b46b-2.1.4 Sun Apr 27 18:20:50 2014 (r352445) @@ -0,0 +1,37 @@ +Backported from: + + http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c1622c2c6e0e15a38fef723086ca8bf75a75b46b + +--- modules/audio_output/oss.c.orig ++++ modules/audio_output/oss.c +@@ -37,6 +37,7 @@ + #else + # include <sys/soundcard.h> + #endif ++#include <errno.h> + + #ifndef SNDCTL_DSP_HALT + # define SNDCTL_DSP_HALT SNDCTL_DSP_RESET +@@ -210,6 +211,22 @@ static int Start (audio_output_t *aout, + } + aout_FormatPrepare (fmt); + ++ /* Select timing */ ++ unsigned bytes; ++ char buf[1024]; ++ ++ if (spdif) ++ bytes = AOUT_SPDIF_SIZE; ++ else ++ bytes = fmt->i_rate / (CLOCK_FREQ / AOUT_MIN_PREPARE_TIME) ++ * fmt->i_bytes_per_frame; ++ ++ int frag = (AOUT_MAX_ADVANCE_TIME / AOUT_MIN_PREPARE_TIME) << 16 ++ | (32 - clz32(bytes - 1)); ++ if (ioctl (fd, SNDCTL_DSP_SETFRAGMENT, &frag) < 0) ++ msg_Err (aout, "cannot set 0x%08x fragment: %s", frag, ++ strerror_r(errno, buf, sizeof(buf) - 1)); ++ + VolumeSync (aout); + sys->starting = true; + sys->format = *fmt;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404271820.s3RIKooc072919>