SOURCES: faad2-inttypes_h.patch, faad2-make.patch, faad2-mpeg4ip.p...
qboosh
qboosh at pld-linux.org
Thu Aug 24 18:31:33 CEST 2006
Author: qboosh Date: Thu Aug 24 16:31:33 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 2.5
---- Files affected:
SOURCES:
faad2-inttypes_h.patch (1.1 -> 1.2) , faad2-make.patch (1.1 -> 1.2) , faad2-mpeg4ip.patch (1.2 -> 1.3) , faad2-no-extension.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/faad2-inttypes_h.patch
diff -u SOURCES/faad2-inttypes_h.patch:1.1 SOURCES/faad2-inttypes_h.patch:1.2
--- SOURCES/faad2-inttypes_h.patch:1.1 Thu Sep 8 02:42:54 2005
+++ SOURCES/faad2-inttypes_h.patch Thu Aug 24 18:31:28 2006
@@ -1,16 +1,14 @@
-remove need for inclusion of mp4ff_int_types.h in -devel package
-
---- ./common/mp4ff/mp4ff.h~ 2004-01-11 17:52:18.000000000 +0200
-+++ ./common/mp4ff/mp4ff.h 2005-09-08 03:29:23.000000000 +0300
-@@ -32,7 +32,11 @@
- extern "C" {
- #endif /* __cplusplus */
-
-+#ifdef _WIN32
- #include "mp4ff_int_types.h"
-+#else
-+#include <stdint.h>
-+#endif
-
- /* file callback structure */
- typedef struct
+--- faad2/common/mp4ff/mp4ff.h.orig 2006-05-17 20:49:20.000000000 +0200
++++ faad2/common/mp4ff/mp4ff.h 2006-08-23 23:56:48.339167500 +0200
+@@ -37,7 +37,11 @@
+ extern "C" {
+ #endif /* __cplusplus */
+
++#ifdef _WIN32
+ #include "mp4ff_int_types.h"
++#else
++#include <stdint.h>
++#endif
+
+ /* file callback structure */
+ typedef struct
================================================================
Index: SOURCES/faad2-make.patch
diff -u SOURCES/faad2-make.patch:1.1 SOURCES/faad2-make.patch:1.2
--- SOURCES/faad2-make.patch:1.1 Mon Feb 9 22:58:16 2004
+++ SOURCES/faad2-make.patch Thu Aug 24 18:31:28 2006
@@ -1,22 +1,54 @@
---- faad2/Makefile.am.orig 2004-02-06 17:04:39.000000000 +0100
-+++ faad2/Makefile.am 2004-02-09 22:11:52.533566432 +0100
-@@ -3,6 +3,6 @@
- EXTRA_DIST = faad2.spec
-
- rpm: Makefile
-- make dist
-- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
-- rm $(PACKAGE)-$(VERSION).tar.gz
-+ make dist
-+ $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
-+ rm $(PACKAGE)-$(VERSION).tar.gz
---- faad2/libfaad/Makefile.am.orig 2004-02-06 14:12:28.000000000 +0100
-+++ faad2/libfaad/Makefile.am 2004-02-09 22:43:21.944332336 +0100
-@@ -19,6 +19,7 @@
- codebook/hcb_1.h codebook/hcb_2.h codebook/hcb_3.h codebook/hcb_4.h \
- codebook/hcb_5.h codebook/hcb_6.h codebook/hcb_7.h codebook/hcb_8.h \
- codebook/hcb_9.h codebook/hcb_10.h codebook/hcb_11.h codebook/hcb_sf.h
-+libfaad_la_LIBADD = -lm
-
- LIBTOOL_DEPS =
- LIBS =
+--- faad2/libfaad/Makefile.am.orig 2004-11-08 09:06:09.000000000 +0100
++++ faad2/libfaad/Makefile.am 2006-08-23 23:39:14.753322500 +0200
+@@ -3,7 +3,7 @@
+ include_HEADERS = $(top_srcdir)/include/faad.h \
+ $(top_srcdir)/include/neaacdec.h
+
+-libfaad_la_LDFLAGS = -lm
++libfaad_la_LIBADD = -lm
+
+ libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \
+ drm_dec.c error.c filtbank.c \
+--- faad2/plugins/Makefile.am.orig 2006-08-07 20:47:45.000000000 +0200
++++ faad2/plugins/Makefile.am 2006-08-24 00:00:04.739441750 +0200
+@@ -8,10 +8,6 @@
+ if HAVE_XMMS
+ SUBDIRS = xmms
+ else
+-if HAVE_BMP
+-SUBDIRS = bmp
+-else
+ SUBDIRS =
+-endif #HAVE_BMP
+ endif #HAVE_XMMS
+ endif #HAVE_MPEG4IP_PLUG
+--- faad2/plugins/xmms/src/Makefile.am.orig 2006-08-07 20:47:45.000000000 +0200
++++ faad2/plugins/xmms/src/Makefile.am 2006-08-24 00:01:12.775693750 +0200
+@@ -1,13 +1,13 @@
+ if HAVE_BMP
+-libdir=$(shell pkg-config --variable=input-plugin-dir bmp)
++plugindir=$(shell pkg-config --variable=input-plugin-dir bmp)
+ local_CFLAGS=$(shell pkg-config --cflags bmp)
+ local_LDFLAGS=$(shell pkg-config --libs bmp)
+ else
+ local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall
+ local_LDFLAGS=`$(XMMS_CONFIG) --libs`
+-libdir = `$(XMMS_CONFIG) --input-plugin-dir`
++plugindir = `$(XMMS_CONFIG) --input-plugin-dir`
+ endif #HAVE_BMP
+-lib_LTLIBRARIES = libmp4.la
++plugin_LTLIBRARIES = libmp4.la
+
+ libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \
+ -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff
+--- faad2/configure.in.orig 2006-08-13 16:13:31.000000000 +0200
++++ faad2/configure.in 2006-08-24 00:04:16.259160750 +0200
+@@ -118,6 +118,8 @@
+ AC_DEFINE([HAVE_BMP], 1, [User wants beep media player plugin built])
+ AM_CONDITIONAL([HAVE_XMMS], true)
+ AM_CONDITIONAL([HAVE_BMP], true)
++else
++ AM_CONDITIONAL([HAVE_BMP], false)
+ fi
+
+ if test x$WITHDRM = xyes; then
================================================================
Index: SOURCES/faad2-mpeg4ip.patch
diff -u SOURCES/faad2-mpeg4ip.patch:1.2 SOURCES/faad2-mpeg4ip.patch:1.3
--- SOURCES/faad2-mpeg4ip.patch:1.2 Wed Jan 25 22:58:53 2006
+++ SOURCES/faad2-mpeg4ip.patch Thu Aug 24 18:31:28 2006
@@ -1,103 +1,112 @@
---- faad2/plugins/mpeg4ip/aa_file.cpp.orig 2006-01-25 21:44:44.000000000 +0100
-+++ faad2/plugins/mpeg4ip/aa_file.cpp 2006-01-25 22:29:06.103470750 +0100
+--- 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 @@
+ /*
+ * 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 +148,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 +163,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;
+ }
+
+@@ -239,7 +239,7 @@
+ aac->m_chans,
+ (audio_format_t)AUDIO_S16SYS,
+ 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, (ts->msec_timestamp * aac->m_freq) / 1000, ts->msec_timestamp);
+ aac->m_audio_inited = 1;
+ }
+ /*
+@@ -281,6 +281,7 @@
+ };
+
+ static int aac_codec_check (lib_message_func_t message,
++ const char *stream_type,
+ const char *compressor,
+ int type,
+ int profile,
+@@ -322,7 +323,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, 1 /* ??? */);
+ message(LOG_DEBUG, "aac", "audio type is %d", audio_config.audio_object_type);
+ if (fmtp != NULL) free_fmtp_parse(fmtp);
+
+--- 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 @@
-
- int aac_file_next_frame (codec_data_t *your,
- uint8_t **buffer,
-- uint64_t *ts)
-+ frame_timestamp_t *ts)
- {
- aac_codec_t *aac = (aac_codec_t *)your;
-
-@@ -98,7 +98,7 @@
- uint64_t calc;
- calc = aac->m_framecount * 1024 * M_LLU;
- calc /= aac->m_freq;
-- *ts = calc;
-+ ts->msec_timestamp = calc;
- *buffer = aac->m_buffer;
- aac->m_framecount++;
- return (aac->m_buffer_size);
+
+ int aac_file_next_frame (codec_data_t *your,
+ uint8_t **buffer,
+- uint64_t *ts)
++ frame_timestamp_t *ts)
+ {
+ aac_codec_t *aac = (aac_codec_t *)your;
+
+@@ -98,7 +98,10 @@
+ uint64_t calc;
+ calc = aac->m_framecount * 1024 * M_LLU;
+ calc /= aac->m_freq;
+- *ts = calc;
++ ts->msec_timestamp = calc;
++ ts->audio_freq_timestamp = calc; /* XXX */
++ ts->audio_freq = 1; /* XXX */
++ ts->timestamp_is_pts = false;
+ *buffer = aac->m_buffer;
+ aac->m_framecount++;
+ return (aac->m_buffer_size);
--- faad2/plugins/mpeg4ip/faad2.h.orig 2004-01-05 15:05:12.000000000 +0100
-+++ faad2/plugins/mpeg4ip/faad2.h 2006-01-25 22:17:53.373427750 +0100
++++ faad2/plugins/mpeg4ip/faad2.h 2006-08-24 08:29:23.233228250 +0200
@@ -81,7 +81,7 @@
-
- int aac_file_next_frame(codec_data_t *ifptr,
- uint8_t **buffer,
-- uint64_t *ts);
-+ frame_timestamp_t *ts);
- int aac_file_eof(codec_data_t *ifptr);
-
- void aac_file_used_for_frame(codec_data_t *ifptr,
---- faad2/plugins/mpeg4ip/faad2.cpp.orig 2006-01-25 22:43:27.605311250 +0100
-+++ faad2/plugins/mpeg4ip/faad2.cpp 2006-01-25 22:27:24.273106750 +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);
-
+
+ int aac_file_next_frame(codec_data_t *ifptr,
+ uint8_t **buffer,
+- uint64_t *ts);
++ frame_timestamp_t *ts);
+ int aac_file_eof(codec_data_t *ifptr);
+
+ void aac_file_used_for_frame(codec_data_t *ifptr,
+--- 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
+ AM_CONDITIONAL(HAVE_MPEG4IP_PLUG, true)
+ AC_MSG_NOTICE("Building MPEG4IP plugin")
++ MPEG4IP_PLAYER_PLUGIN_DIR="`mpeg4ip-config --player-plugin-dir`"
++ AC_SUBST(MPEG4IP_PLAYER_PLUGIN_DIR)
+ else
+ AC_MSG_NOTICE("MPEG4IP libmp4v2 is required for MPEG4IP plugin")
+ fi
================================================================
Index: SOURCES/faad2-no-extension.patch
diff -u SOURCES/faad2-no-extension.patch:1.1 SOURCES/faad2-no-extension.patch:1.2
--- SOURCES/faad2-no-extension.patch:1.1 Sat Jun 12 14:48:38 2004
+++ SOURCES/faad2-no-extension.patch Thu Aug 24 18:31:28 2006
@@ -1,20 +1,11 @@
---- faad2.warn/plugins/xmms/src/libmp4.c 2003-12-03 19:37:56.000000000 +0100
-+++ faad2/plugins/xmms/src/libmp4.c 2004-06-12 13:53:42.364218112 +0200
-@@ -112,14 +112,15 @@
- gchar* extention;
-
- extention = strrchr(filename, '.');
-- if (extention &&
-- !strcasecmp(extention, ".mp4") || // official extention
-+ if (extention && *extention) {
-+ if(!strcasecmp(extention, ".mp4") || // official extention
- !strcasecmp(extention, ".m4a") || // Apple mp4 extention
- !strcasecmp(extention, ".aac") // old MPEG2/4-AAC extention
- ){
- return (1);
- }
- }
-+ }
- return(0);
- }
-
+--- faad2/plugins/xmms/src/libmp4.c.orig 2006-08-07 20:47:45.000000000 +0200
++++ faad2/plugins/xmms/src/libmp4.c 2006-08-23 23:50:29.267477000 +0200
+@@ -127,7 +127,7 @@
+ gchar* extention;
+
+ extention = strrchr(filename, '.');
+- if(extention &&
++ if(extention && *extention &&
+ (!strncasecmp(extention, ".mp4", 4) || // official extention
+ !strncasecmp(extention, ".m4a", 4) || // Apple mp4 extention
+ !strncasecmp(extention, ".aac", 4) // old MPEG2/4-AAC extention
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/faad2-inttypes_h.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/faad2-make.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/faad2-mpeg4ip.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/SOURCES/faad2-no-extension.patch?r1=1.1&r2=1.2&f=u
More information about the pld-cvs-commit
mailing list