From: Jakub Bogusz Date: Sun, 4 Nov 2007 12:08:17 +0000 (+0000) Subject: - updated for 2.6.1 X-Git-Tag: auto/th/faad2-2_6_1-1~2 X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffaad2.git;a=commitdiff_plain;h=f20ae396eaf2be1549935427a16525b0b481b891 - updated for 2.6.1 Changed files: faad2-make.patch -> 1.3 faad2-mpeg4ip.patch -> 1.4 faad2-soname.patch -> 1.2 --- diff --git a/faad2-make.patch b/faad2-make.patch index cc5a748..fbd3cb3 100644 --- a/faad2-make.patch +++ b/faad2-make.patch @@ -1,54 +1,23 @@ --- 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 ++++ faad2/libfaad/Makefile.am 2007-11-04 11:44:26.132686561 +0100 +@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libfaad.la + 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/xmms/src/Makefile.am.orig 2006-09-25 21:52:53.000000000 +0200 ++++ faad2/plugins/xmms/src/Makefile.am 2007-11-04 11:45:59.870028348 +0100 +@@ -1,7 +1,7 @@ + local_CFLAGS=`$(XMMS_CONFIG) --cflags` -Wall + local_LDFLAGS=`$(XMMS_CONFIG) --libs` +-libdir = `$(XMMS_CONFIG) --input-plugin-dir` +-lib_LTLIBRARIES = libmp4.la ++plugindir = `$(XMMS_CONFIG) --input-plugin-dir` ++plugin_LTLIBRARIES = libmp4.la + + libmp4_la_CFLAGS = $(local_CFLAGS) -Wall \ + -I$(top_srcdir)/include -I$(top_srcdir)/common/mp4ff diff --git a/faad2-mpeg4ip.patch b/faad2-mpeg4ip.patch index cd97ce4..507588c 100644 --- a/faad2-mpeg4ip.patch +++ b/faad2-mpeg4ip.patch @@ -1,112 +1,112 @@ --- 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, + /* + * 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, + * 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; - } - + 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; - } - /* + 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, + }; + + 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); - + } + 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; - + + 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); + 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-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/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 + + 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-09-25 21:52:53.000000000 +0200 ++++ faad2/configure.in 2007-11-04 11:51:50.486008814 +0100 +@@ -123,6 +123,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 diff --git a/faad2-soname.patch b/faad2-soname.patch index 5127ffc..63d0094 100644 --- a/faad2-soname.patch +++ b/faad2-soname.patch @@ -1,10 +1,10 @@ --- faad2/libfaad/Makefile.am.orig 2007-01-16 17:52:58.000000000 +0000 +++ faad2/libfaad/Makefile.am 2007-01-16 17:53:29.000000000 +0000 @@ -3,6 +3,7 @@ - $(top_srcdir)/include/neaacdec.h - - libfaad_la_LIBADD = -lm -+libfaad_la_LDFLAGS = -version-info 1:0:0 - - libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \ - drm_dec.c error.c filtbank.c \ + $(top_srcdir)/include/neaacdec.h + + libfaad_la_LIBADD = -lm ++libfaad_la_LDFLAGS = -version-info 1:0:0 + + libfaad_la_SOURCES = bits.c cfft.c decoder.c drc.c \ + drm_dec.c error.c filtbank.c \