svn commit: r453605 - in head/multimedia/mpeg4ip: . files

[Thomas Zander]

Author: riggs
Date: Mon Nov  6 09:28:57 2017
New Revision: 453605
URL: https://svnweb.freebsd.org/changeset/ports/453605

Log:
  Retain API compatibility with faac 1.29.9 and later
  
  Details:
  - See PR 223416

Added:
  head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__faac.cpp   (contents, props changed)
Modified:
  head/multimedia/mpeg4ip/Makefile

Modified: head/multimedia/mpeg4ip/Makefile
==============================================================================
--- head/multimedia/mpeg4ip/Makefile	Mon Nov  6 09:18:13 2017	(r453604)
+++ head/multimedia/mpeg4ip/Makefile	Mon Nov  6 09:28:57 2017	(r453605)
@@ -3,7 +3,7 @@
 
 PORTNAME=	mpeg4ip
 PORTVERSION=	1.6.1
-PORTREVISION=	36
+PORTREVISION=	37
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	LOCAL/ahze
 # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136

Added: head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__faac.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__faac.cpp	Mon Nov  6 09:28:57 2017	(r453605)
@@ -0,0 +1,22 @@
+--- server/mp4live/audio_faac.cpp.orig	2007-01-22 17:31:28 UTC
++++ server/mp4live/audio_faac.cpp
+@@ -296,7 +296,7 @@ bool CFaacAudioEncoder::Init(void)
+ 
+   debug_message("version = %d", m_faacConfig->version);
+   debug_message("name = %s", m_faacConfig->name);
+-  debug_message("allowMidside = %d", m_faacConfig->allowMidside);
++  //debug_message("allowMidside = %d", m_faacConfig->allowMidside);
+   debug_message("useLfe = %d", m_faacConfig->useLfe);
+   debug_message("useTns = %d", m_faacConfig->useTns);
+   debug_message("bitRate = %lu", m_faacConfig->bitRate);
+@@ -308,7 +308,9 @@ bool CFaacAudioEncoder::Init(void)
+ 
+   m_faacConfig->mpegVersion = MPEG4;
+   m_faacConfig->aacObjectType = LOW;
+-  m_faacConfig->allowMidside = false;
++  //Do not set allowMidside for API compatibility with faac,
++  //see https://github.com/knik0/faac/issues/8 for details
++  //m_faacConfig->allowMidside = false;
+   m_faacConfig->useLfe = false;
+   m_faacConfig->useTns = false;
+   m_faacConfig->inputFormat = FAAC_INPUT_16BIT;