- probably needs mpeg4ip >= 1.5 (1.4.1 has missing constants)

[packages/faad2.git] / faad2-mpeg4ip.patch

--- faad2/plugins/mpeg4ip/faad2.cpp.orig	2004-08-20 10:30:53.000000000 +0200
+++ faad2/plugins/mpeg4ip/faad2.cpp	2006-08-24 08:27:51.399489000 +0200
@@ -35,7 +35,7 @@
 /*\r
  * Create CAACodec class\r
  */\r
-static codec_data_t *aac_codec_create (const char *compressor,\r
+static codec_data_t *aac_codec_create (const char *stream_type, const char *compressor,\r
                        int type,\r
                        int profile,\r
                        format_list_t *media_fmt,\r
@@ -148,7 +148,7 @@
  * Decode task call for FAAC\r
  */\r
 static int aac_decode (codec_data_t *ptr,\r
-               uint64_t ts,\r
+               frame_timestamp_t *ts,\r
                int from_rtp,\r
                int *sync_frame,\r
                uint8_t *buffer,\r
@@ -163,15 +163,15 @@
   if (aac->m_record_sync_time) {\r
     aac->m_current_frame = 0;\r
     aac->m_record_sync_time = 0;\r
-    aac->m_current_time = ts;\r
-    aac->m_last_rtp_ts = ts;\r
+    aac->m_current_time = ts->msec_timestamp;\r
+    aac->m_last_rtp_ts = ts->msec_timestamp;\r
   } else {\r
-    if (aac->m_last_rtp_ts == ts) {\r
+    if (aac->m_last_rtp_ts == ts->msec_timestamp) {\r
       aac->m_current_time += aac->m_msec_per_frame;\r
       aac->m_current_frame++;\r
     } else {\r
-      aac->m_last_rtp_ts = ts;\r
-      aac->m_current_time = ts;\r
+      aac->m_last_rtp_ts = ts->msec_timestamp;\r
+      aac->m_current_time = ts->msec_timestamp;\r
       aac->m_current_frame = 0;\r
     }\r
 \r
@@ -239,7 +239,7 @@
                   aac->m_chans,\r
                   (audio_format_t)AUDIO_S16SYS,\r
                   aac->m_output_frame_size);\r
-      uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr);\r
+      uint8_t *now = aac->m_vft->audio_get_buffer(aac->m_ifptr, (ts->msec_timestamp * aac->m_freq) / 1000, ts->msec_timestamp);\r
       aac->m_audio_inited = 1;\r
     }\r
     /*\r
@@ -281,6 +281,7 @@
 };\r
 \r
 static int aac_codec_check (lib_message_func_t message,\r
+		const char *stream_type,\r
                 const char *compressor,\r
                 int type,\r
                 int profile,\r
@@ -322,7 +323,7 @@
   }\r
   if (userdata != NULL) {\r
     mpeg4_audio_config_t audio_config;\r
-    decode_mpeg4_audio_config(userdata, userdata_size, &audio_config);\r
+    decode_mpeg4_audio_config(userdata, userdata_size, &audio_config, 1 /* ??? */);\r
     message(LOG_DEBUG, "aac", "audio type is %d", audio_config.audio_object_type);\r
     if (fmtp != NULL) free_fmtp_parse(fmtp);\r
 \r
--- faad2/plugins/mpeg4ip/aa_file.cpp.orig	2004-01-05 15:05:12.000000000 +0100
+++ faad2/plugins/mpeg4ip/aa_file.cpp	2006-08-24 08:33:42.189412000 +0200
@@ -77,7 +77,7 @@
 \r
 int aac_file_next_frame (codec_data_t *your,\r
              uint8_t **buffer,\r
-             uint64_t *ts)\r
+             frame_timestamp_t *ts)\r
 {\r
   aac_codec_t *aac = (aac_codec_t *)your;\r
 \r
@@ -98,7 +98,10 @@
   uint64_t calc;\r
   calc = aac->m_framecount * 1024 * M_LLU;\r
   calc /= aac->m_freq;\r
-  *ts = calc;\r
+  ts->msec_timestamp = calc;\r
+  ts->audio_freq_timestamp = calc; /* XXX */\r
+  ts->audio_freq = 1; /* XXX */\r
+  ts->timestamp_is_pts = false;\r
   *buffer = aac->m_buffer;\r
   aac->m_framecount++;\r
   return (aac->m_buffer_size);\r
--- faad2/plugins/mpeg4ip/faad2.h.orig	2004-01-05 15:05:12.000000000 +0100
+++ faad2/plugins/mpeg4ip/faad2.h	2006-08-24 08:29:23.233228250 +0200
@@ -81,7 +81,7 @@
 \r
 int aac_file_next_frame(codec_data_t *ifptr,\r
             uint8_t **buffer,\r
-            uint64_t *ts);\r
+            frame_timestamp_t *ts);\r
 int aac_file_eof(codec_data_t *ifptr);\r
 \r
 void aac_file_used_for_frame(codec_data_t *ifptr,\r
--- faad2/configure.in.orig	2006-08-24 00:22:15.814628000 +0200
+++ faad2/configure.in	2006-08-24 18:02:34.414542750 +0200
@@ -89,6 +89,8 @@
    if test x$external_mp4v2 = xyes; then\r
       AM_CONDITIONAL(HAVE_MPEG4IP_PLUG, true)\r
       AC_MSG_NOTICE("Building MPEG4IP plugin")\r
+      MPEG4IP_PLAYER_PLUGIN_DIR="`mpeg4ip-config --player-plugin-dir`"\r
+      AC_SUBST(MPEG4IP_PLAYER_PLUGIN_DIR)\r
    else\r
 	AC_MSG_NOTICE("MPEG4IP libmp4v2 is required for MPEG4IP plugin")\r
    fi\r