diff --git a/stepmania/avcodec.dll b/stepmania/avcodec.dll index e72d12177f..72be82cefa 100644 Binary files a/stepmania/avcodec.dll and b/stepmania/avcodec.dll differ diff --git a/stepmania/avformat.dll b/stepmania/avformat.dll index 58d116269f..63ead52e40 100644 Binary files a/stepmania/avformat.dll and b/stepmania/avformat.dll differ diff --git a/stepmania/src/ffmpeg/include/ffmpeg/avcodec.h b/stepmania/src/ffmpeg/include/ffmpeg/avcodec.h index 61fc553a94..bb81d00021 100644 --- a/stepmania/src/ffmpeg/include/ffmpeg/avcodec.h +++ b/stepmania/src/ffmpeg/include/ffmpeg/avcodec.h @@ -13,21 +13,26 @@ extern "C" { #include "common.h" -#define LIBAVCODEC_VERSION_INT 0x000406 -#define LIBAVCODEC_VERSION "0.4.6" -#define LIBAVCODEC_BUILD 4675 -#define LIBAVCODEC_BUILD_STR "4675" +#define FFMPEG_VERSION_INT 0x000408 +#define FFMPEG_VERSION "0.4.8" +#define LIBAVCODEC_BUILD 4680 -#define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR +#define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT +#define LIBAVCODEC_VERSION FFMPEG_VERSION + +#define AV_STRINGIFY(s) AV_TOSTRING(s) +#define AV_TOSTRING(s) #s +#define LIBAVCODEC_IDENT "FFmpeg" LIBAVCODEC_VERSION "b" AV_STRINGIFY(LIBAVCODEC_BUILD) enum CodecID { CODEC_ID_NONE, CODEC_ID_MPEG1VIDEO, + CODEC_ID_MPEG2VIDEO, /* prefered ID for MPEG Video 1 or 2 decoding */ CODEC_ID_MPEG2VIDEO_XVMC, CODEC_ID_H263, CODEC_ID_RV10, CODEC_ID_MP2, - CODEC_ID_MP3LAME, + CODEC_ID_MP3, /* prefered ID for MPEG Audio layer 1, 2 or3 decoding */ CODEC_ID_VORBIS, CODEC_ID_AC3, CODEC_ID_MJPEG, @@ -59,11 +64,16 @@ enum CodecID { CODEC_ID_AAC, CODEC_ID_MPEG4AAC, CODEC_ID_ASV1, + CODEC_ID_ASV2, CODEC_ID_FFV1, CODEC_ID_4XM, CODEC_ID_VCR1, CODEC_ID_CLJR, CODEC_ID_MDEC, + CODEC_ID_ROQ, + CODEC_ID_INTERPLAY_VIDEO, + CODEC_ID_XAN_WC3, + CODEC_ID_XAN_WC4, /* various pcm "codecs" */ CODEC_ID_PCM_S16LE, @@ -78,6 +88,8 @@ enum CodecID { /* various adpcm codecs */ CODEC_ID_ADPCM_IMA_QT, CODEC_ID_ADPCM_IMA_WAV, + CODEC_ID_ADPCM_IMA_DK3, + CODEC_ID_ADPCM_IMA_DK4, CODEC_ID_ADPCM_MS, CODEC_ID_ADPCM_4XM, @@ -86,8 +98,16 @@ enum CodecID { /* RealAudio codecs*/ CODEC_ID_RA_144, CODEC_ID_RA_288, + + /* various DPCM codecs */ + CODEC_ID_ROQ_DPCM, + CODEC_ID_INTERPLAY_DPCM, + CODEC_ID_XAN_DPCM, }; +/* CODEC_ID_MP3LAME is absolete */ +#define CODEC_ID_MP3LAME CODEC_ID_MP3 + enum CodecType { CODEC_TYPE_UNKNOWN = -1, CODEC_TYPE_VIDEO, @@ -95,7 +115,19 @@ enum CodecType { }; /** - * Pixel format. + * Pixel format. Notes: + * + * PIX_FMT_RGBA32 is handled in an endian-specific manner. A RGBA + * color is put together as: + * (A << 24) | (R << 16) | (G << 8) | B + * This is stored as BGRA on little endian CPU architectures and ARGB on + * big endian CPUs. + * + * When the pixel format is palettized RGB (PIX_FMT_PAL8), the palettized + * image data is stored in AVFrame.data[0]. The palette is transported in + * AVFrame.data[1] and, is 1024 bytes long (256 4-byte entries) and is + * formatted the same as in PIX_FMT_RGBA32 described above (i.e., it is + * also endian-specific). */ enum PixelFormat { PIX_FMT_YUV420P, ///< Planar YUV 4:2:0 (1 Cr & Cb sample per 2x2 Y samples) @@ -104,7 +136,7 @@ enum PixelFormat { PIX_FMT_BGR24, ///< Packed pixel, 3 bytes per pixel, BGRBGR... PIX_FMT_YUV422P, ///< Planar YUV 4:2:2 (1 Cr & Cb sample per 2x1 Y samples) PIX_FMT_YUV444P, ///< Planar YUV 4:4:4 (1 Cr & Cb sample per 1x1 Y samples) - PIX_FMT_RGBA32, ///< Packed pixel, 4 bytes per pixel, BGRABGRA... + PIX_FMT_RGBA32, ///< Packed pixel, 4 bytes per pixel, BGRABGRA..., stored in cpu endianness PIX_FMT_YUV410P, ///< Planar YUV 4:1:0 (1 Cr & Cb sample per 4x4 Y samples) PIX_FMT_YUV411P, ///< Planar YUV 4:1:1 (1 Cr & Cb sample per 4x1 Y samples) PIX_FMT_RGB565, ///< always stored in cpu endianness @@ -352,8 +384,9 @@ static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG, #define FF_QSCALE_TYPE_MPEG2 1 #define FF_BUFFER_TYPE_INTERNAL 1 -#define FF_BUFFER_TYPE_USER 2 ///< Direct rendering buffers -#define FF_BUFFER_TYPE_SHARED 4 ///< buffer from somewher else, dont dealloc +#define FF_BUFFER_TYPE_USER 2 ///< Direct rendering buffers (image is (de)allocated by user) +#define FF_BUFFER_TYPE_SHARED 4 ///< buffer from somewher else, dont dealloc image (data/base) +#define FF_BUFFER_TYPE_COPY 8 ///< just a (modified) copy of some other buffer, dont dealloc anything #define FF_I_TYPE 1 // Intra @@ -962,6 +995,7 @@ typedef struct AVCodecContext { #define FF_DEBUG_PTS 0x00000200 #define FF_DEBUG_ER 0x00000400 #define FF_DEBUG_MMCO 0x00000800 +#define FF_DEBUG_BUGS 0x00001000 /** * error. @@ -1201,6 +1235,21 @@ typedef struct AVCodecContext { */ uint16_t *inter_matrix; + /** + * fourcc from the AVI stream header (LSB first, so "ABCD" -> ('D'<<24) + ('C'<<16) + ('B'<<8) + 'A'). + * this is used to workaround some encoder bugs + * - encoding: unused + * - decoding: set by user, will be converted to upper case by lavc during init + */ + unsigned int stream_codec_tag; + + /** + * scene change detection threshold. + * 0 is default, larger means fewer detected scene changes + * - encoding: set by user. + * - decoding: unused + */ + int scenechange_threshold; } AVCodecContext; @@ -1276,11 +1325,31 @@ typedef struct AVPicture { int linesize[4]; ///< number of bytes per line } AVPicture; +/** + * AVPaletteControl + * This structure defines a method for communicating palette changes + * between and demuxer and a decoder. + */ +typedef struct AVPaletteControl { + + /* demuxer sets this to 1 to indicate the palette has changed; + * decoder resets to 0 */ + int palette_changed; + + /* 256 3-byte RGB palette entries; the components should be + * formatted in the buffer as "RGBRGB..." and should be scaled to + * 8 bits if they originally represented 6-bit VGA palette + * components */ + unsigned char palette[256 * 3]; + +} AVPaletteControl; + extern AVCodec ac3_encoder; extern AVCodec mp2_encoder; extern AVCodec mp3lame_encoder; extern AVCodec oggvorbis_encoder; extern AVCodec mpeg1video_encoder; +extern AVCodec mpeg2video_encoder; extern AVCodec h263_encoder; extern AVCodec h263p_encoder; extern AVCodec flv_encoder; @@ -1296,6 +1365,7 @@ extern AVCodec wmv2_encoder; extern AVCodec huffyuv_encoder; extern AVCodec h264_encoder; extern AVCodec asv1_encoder; +extern AVCodec asv2_encoder; extern AVCodec vcr1_encoder; extern AVCodec ffv1_encoder; extern AVCodec mdec_encoder; @@ -1307,7 +1377,8 @@ extern AVCodec msmpeg4v2_decoder; extern AVCodec msmpeg4v3_decoder; extern AVCodec wmv1_decoder; extern AVCodec wmv2_decoder; -extern AVCodec mpeg_decoder; +extern AVCodec mpeg1video_decoder; +extern AVCodec mpeg2video_decoder; extern AVCodec mpeg_xvmc_decoder; extern AVCodec h263i_decoder; extern AVCodec flv_decoder; @@ -1335,13 +1406,20 @@ extern AVCodec amr_nb_encoder; extern AVCodec aac_decoder; extern AVCodec mpeg4aac_decoder; extern AVCodec asv1_decoder; +extern AVCodec asv2_decoder; extern AVCodec vcr1_decoder; extern AVCodec cljr_decoder; extern AVCodec ffv1_decoder; extern AVCodec fourxm_decoder; extern AVCodec mdec_decoder; +extern AVCodec roq_decoder; +extern AVCodec interplay_video_decoder; +extern AVCodec xan_wc3_decoder; extern AVCodec ra_144_decoder; extern AVCodec ra_288_decoder; +extern AVCodec roq_dpcm_decoder; +extern AVCodec interplay_dpcm_decoder; +extern AVCodec xan_dpcm_decoder; /* pcm codecs */ #define PCM_CODEC(id, name) \ @@ -1361,6 +1439,8 @@ PCM_CODEC(CODEC_ID_PCM_MULAW, pcm_mulaw); PCM_CODEC(CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt); PCM_CODEC(CODEC_ID_ADPCM_IMA_WAV, adpcm_ima_wav); +PCM_CODEC(CODEC_ID_ADPCM_IMA_DK3, adpcm_ima_dk3); +PCM_CODEC(CODEC_ID_ADPCM_IMA_DK4, adpcm_ima_dk4); PCM_CODEC(CODEC_ID_ADPCM_MS, adpcm_ms); PCM_CODEC(CODEC_ID_ADPCM_4XM, adpcm_4xm); diff --git a/stepmania/src/ffmpeg/include/ffmpeg/avformat.h b/stepmania/src/ffmpeg/include/ffmpeg/avformat.h index ef70029217..f10c212d33 100644 --- a/stepmania/src/ffmpeg/include/ffmpeg/avformat.h +++ b/stepmania/src/ffmpeg/include/ffmpeg/avformat.h @@ -5,9 +5,13 @@ extern "C" { #endif -#define LIBAVFORMAT_VERSION_INT 0x000406 -#define LIBAVFORMAT_VERSION "0.4.6" -#define LIBAVFORMAT_BUILD 4606 +#define LIBAVFORMAT_BUILD 4608 + +#define LIBAVFORMAT_VERSION_INT FFMPEG_VERSION_INT +#define LIBAVFORMAT_VERSION FFMPEG_VERSION +#define LIBAVFORMAT_IDENT "FFmpeg" FFMPEG_VERSION "b" AV_STRINGIFY(LIBAVFORMAT_BUILD) + +#include #include "avcodec.h" @@ -119,10 +123,9 @@ typedef struct AVOutputFormat { enum CodecID audio_codec; /* default audio codec */ enum CodecID video_codec; /* default video codec */ int (*write_header)(struct AVFormatContext *); - /* XXX: change prototype for 64 bit pts */ int (*write_packet)(struct AVFormatContext *, int stream_index, - unsigned char *buf, int size, int force_pts); + const uint8_t *buf, int size, int64_t pts); int (*write_trailer)(struct AVFormatContext *); /* can use flags: AVFMT_NOFILE, AVFMT_NEEDNUMBER */ int flags; @@ -210,6 +213,11 @@ typedef struct AVFormatContext { char author[512]; char copyright[512]; char comment[512]; + char album[512]; + int year; /* ID3 year, 0 if none */ + int track; /* track number, 0 if none */ + char genre[32]; /* ID3 genre */ + int flags; /* format specific flags */ /* private data for pts handling (do not modify directly) */ int pts_wrap_bits; /* number of bits in pts (used for wrapping control) */ @@ -334,6 +342,9 @@ int swf_init(void); /* mov.c */ int mov_init(void); +/* movenc.c */ +int movenc_init(void); + /* flvenc.c */ int flvenc_init(void); @@ -358,6 +369,9 @@ int wav_init(void); /* raw.c */ int raw_init(void); +/* mp3.c */ +int mp3_init(void); + /* yuv4mpeg.c */ int yuv4mpeg_init(void); @@ -377,6 +391,21 @@ int redir_open(AVFormatContext **ic_ptr, ByteIOContext *f); /* 4xm.c */ int fourxm_init(void); +/* psxstr.c */ +int str_init(void); + +/* idroq.c */ +int roq_init(void); + +/* ipmovie.c */ +int ipmovie_init(void); + +/* nut.c */ +int nut_init(void); + +/* wc3movie.c */ +int wc3_init(void); + #include "rtp.h" #include "rtsp.h" @@ -466,6 +495,9 @@ int audio_init(void); int dv1394_init(void); #ifdef HAVE_AV_CONFIG_H + +#include "os_support.h" + int strstart(const char *str, const char *val, const char **ptr); int stristart(const char *str, const char *val, const char **ptr); void pstrcpy(char *buf, int buf_size, const char *str); @@ -473,6 +505,7 @@ char *pstrcat(char *buf, int buf_size, const char *s); void __dynarray_add(unsigned long **tab_ptr, int *nb_ptr, unsigned long elem); +#ifdef __GNUC__ #define dynarray_add(tab, nb_ptr, elem)\ do {\ typeof(tab) _tab = (tab);\ @@ -480,6 +513,16 @@ do {\ (void)sizeof(**_tab == _elem); /* check that types are compatible */\ __dynarray_add((unsigned long **)_tab, nb_ptr, (unsigned long)_elem);\ } while(0) +#else +#define dynarray_add(tab, nb_ptr, elem)\ +do {\ + __dynarray_add((unsigned long **)(tab), nb_ptr, (unsigned long)(elem));\ +} while(0) +#endif + +time_t mktimegm(struct tm *tm); +const char *small_strptime(const char *p, const char *fmt, + struct tm *dt); struct in_addr; int resolve_host(struct in_addr *sin_addr, const char *hostname); diff --git a/stepmania/src/ffmpeg/include/ffmpeg/common.h b/stepmania/src/ffmpeg/include/ffmpeg/common.h index c16990d208..c1b1d47485 100644 --- a/stepmania/src/ffmpeg/include/ffmpeg/common.h +++ b/stepmania/src/ffmpeg/include/ffmpeg/common.h @@ -25,6 +25,7 @@ # include # include # include +# include # ifndef __BEOS__ # include # else @@ -106,9 +107,7 @@ typedef signed __int64 int64_t; # endif /* __MINGW32__ */ # ifdef _DEBUG -# ifndef DEBUG -# define DEBUG -# endif +# define DEBUG # endif # define snprintf _snprintf diff --git a/stepmania/src/ffmpeg/lib/avcodec.lib b/stepmania/src/ffmpeg/lib/avcodec.lib index c00fbc0a87..31d5740294 100644 Binary files a/stepmania/src/ffmpeg/lib/avcodec.lib and b/stepmania/src/ffmpeg/lib/avcodec.lib differ diff --git a/stepmania/src/ffmpeg/lib/avformat.lib b/stepmania/src/ffmpeg/lib/avformat.lib index 0351e7a608..b683e11c29 100644 Binary files a/stepmania/src/ffmpeg/lib/avformat.lib and b/stepmania/src/ffmpeg/lib/avformat.lib differ