head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.22
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.20
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.18
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.16
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.14
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.12
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.10
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.8
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.6
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.4
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.2
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.1.0.12
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.10
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.8
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.6
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.4
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.2
	pkgsrc-2006Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2007.12.09.10.55.36;	author drochner;	state dead;
branches;
next	1.1;

1.1
date	2006.05.30.20.28.34;	author tron;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to 2.6.1
This adds SBR/PS support and bugfixes.
The licensing problems which appeared in 2.5 were resolved in 2.6.1.
pkgsrc notes:
-no dependency on libmp4v2 anymore
-added a patch to the "faad" standalone player to restore previous
 behaviour: The -w option writes .wav format (with riff header)
 to stdout.

Thanks to Raymond Meyer for help and testing.
@
text
@$NetBSD: patch-aq,v 1.1 2006/05/30 20:28:34 tron Exp $

--- plugins/mpeg4ip/faad2.cpp.orig	2004-01-05 14:05:12.000000000 +0000
+++ plugins/mpeg4ip/faad2.cpp	2006-05-30 16:04:22.000000000 +0100
@@@@ -35,7 +35,9 @@@@
 /*
  * Create CAACodec class
  */
-static codec_data_t *aac_codec_create (const char *compressor,
+static codec_data_t *aac_codec_create (
+                       const char* /*stream_type*/,
+                       const char* /*compressor*/,
                        int type,
                        int profile,
                        format_list_t *media_fmt,
@@@@ -148,7 +150,7 @@@@
  * Decode task call for FAAC
  */
 static int aac_decode (codec_data_t *ptr,
-               uint64_t ts,
+               frame_timestamp_t* ts,
                int from_rtp,
                int *sync_frame,
                uint8_t *buffer,
@@@@ -163,15 +165,15 @@@@
   if (aac->m_record_sync_time) {
     aac->m_current_frame = 0;
     aac->m_record_sync_time = 0;
-    aac->m_current_time = ts;
-    aac->m_last_rtp_ts = ts;
+    aac->m_current_time = ts->msec_timestamp;
+    aac->m_last_rtp_ts = ts->msec_timestamp;
   } else {
-    if (aac->m_last_rtp_ts == ts) {
+    if (aac->m_last_rtp_ts == ts->msec_timestamp) {
       aac->m_current_time += aac->m_msec_per_frame;
       aac->m_current_frame++;
     } else {
-      aac->m_last_rtp_ts = ts;
-      aac->m_current_time = ts;
+      aac->m_last_rtp_ts = ts->msec_timestamp;
+      aac->m_current_time = ts->msec_timestamp;
       aac->m_current_frame = 0;
     }
 
@@@@ -237,9 +239,9 @@@@
       aac->m_vft->audio_configure(aac->m_ifptr,
                   aac->m_freq,
                   aac->m_chans,
-                  AUDIO_S16SYS,
+                  AUDIO_FMT_S16,
                   aac->m_output_frame_size);
-      uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr);
+      uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr, aac->m_freq, aac->m_current_time);
       aac->m_audio_inited = 1;
     }
     /*
@@@@ -281,6 +283,7 @@@@
 };
 
 static int aac_codec_check (lib_message_func_t message,
+                const char *stream_type,
                 const char *compressor,
                 int type,
                 int profile,
@@@@ -322,7 +325,7 @@@@
   }
   if (userdata != NULL) {
     mpeg4_audio_config_t audio_config;
-    decode_mpeg4_audio_config(userdata, userdata_size, &audio_config);
+    decode_mpeg4_audio_config(userdata, userdata_size, &audio_config, false);
     message(LOG_DEBUG, "aac", "audio type is %d", audio_config.audio_object_type);
     if (fmtp != NULL) free_fmtp_parse(fmtp);
 
@


1.1
log
@Disable bundled and outdated "mp4v2" library. Depend on newer version
from "mpeg4ip" package instead which resolves the conflict between
the two packages. Patch taken from PLD linux.
Bump package revision because of thix fix.
@
text
@d1 1
a1 1
$NetBSD$
@