November 2006 - MPlayer-cvslog - lists.mplayerhq.hu

r20951 - trunk/libmpdemux/demux_lavf.c
by diego 16 Nov '06

16 Nov '06

Author: diego Date: Thu Nov 16 01:59:01 2006 New Revision: 20951 Modified: trunk/libmpdemux/demux_lavf.c Log: cosmetics: alphabetical order and prettyprinting for the CodecTag table Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c (original) +++ trunk/libmpdemux/demux_lavf.c Thu Nov 16 01:59:01 2006 @@ -72,20 +72,20 @@ int64_t ff_gcd(int64_t a, int64_t b); const CodecTag mp_wav_tags[] = { - { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, + { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, - { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')}, - { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')}, - { CODEC_ID_WAVPACK, MKTAG('W', 'V', 'P', 'K')}, - { CODEC_ID_TTA, MKTAG('T', 'T', 'A', '1')}, - { CODEC_ID_SHORTEN, MKTAG('s', 'h', 'r', 'n')}, + { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')}, + { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')}, + { CODEC_ID_SHORTEN, MKTAG('s', 'h', 'r', 'n')}, + { CODEC_ID_TTA, MKTAG('T', 'T', 'A', '1')}, + { CODEC_ID_WAVPACK, MKTAG('W', 'V', 'P', 'K')}, { 0, 0 }, }; const CodecTag mp_bmp_tags[] = { - { CODEC_ID_XAN_WC3, MKTAG('W', 'C', '3', 'V')}, { CODEC_ID_TIERTEXSEQVIDEO, MKTAG('T', 'S', 'E', 'Q')}, - { CODEC_ID_VMDVIDEO, MKTAG('V', 'M', 'D', 'V')}, + { CODEC_ID_VMDVIDEO, MKTAG('V', 'M', 'D', 'V')}, + { CODEC_ID_XAN_WC3, MKTAG('W', 'C', '3', 'V')}, { 0, 0 }, };

1 0

r20950 - in trunk: etc/codecs.conf libmpdemux/demux_lavf.c
by diego 16 Nov '06

16 Nov '06

Author: diego Date: Thu Nov 16 01:56:35 2006 New Revision: 20950 Modified: trunk/etc/codecs.conf trunk/libmpdemux/demux_lavf.c Log: support for Sierra VMD video Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Thu Nov 16 01:56:35 2006 @@ -1930,6 +1930,14 @@ dll "tiertexseqvideo" out BGR8 +videocodec ffvmd + info "FFmpeg Sierra VMD video" + status working + fourcc VMDV + driver ffmpeg + dll "vmdvideo" + out BGR8 + ; raw formats: (now RGB formats are autodetected) Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c (original) +++ trunk/libmpdemux/demux_lavf.c Thu Nov 16 01:56:35 2006 @@ -85,6 +85,7 @@ const CodecTag mp_bmp_tags[] = { { CODEC_ID_XAN_WC3, MKTAG('W', 'C', '3', 'V')}, { CODEC_ID_TIERTEXSEQVIDEO, MKTAG('T', 'S', 'E', 'Q')}, + { CODEC_ID_VMDVIDEO, MKTAG('V', 'M', 'D', 'V')}, { 0, 0 }, };

1 0

r20949 - in trunk: etc/codecs.conf libmpdemux/demux_lavf.c
by diego 16 Nov '06

16 Nov '06

Author: diego Date: Thu Nov 16 01:20:55 2006 New Revision: 20949 Modified: trunk/etc/codecs.conf trunk/libmpdemux/demux_lavf.c Log: Add support for Tiertex SEQ video. Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Thu Nov 16 01:20:55 2006 @@ -1922,6 +1922,14 @@ dll "fraps" out BGR24,I420 +videocodec fftiertexseq + info "FFmpeg Tiertex SEQ" + status working + fourcc TSEQ + driver ffmpeg + dll "tiertexseqvideo" + out BGR8 + ; raw formats: (now RGB formats are autodetected) Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c (original) +++ trunk/libmpdemux/demux_lavf.c Thu Nov 16 01:20:55 2006 @@ -84,6 +84,7 @@ const CodecTag mp_bmp_tags[] = { { CODEC_ID_XAN_WC3, MKTAG('W', 'C', '3', 'V')}, + { CODEC_ID_TIERTEXSEQVIDEO, MKTAG('T', 'S', 'E', 'Q')}, { 0, 0 }, };

1 0

r20947 - in trunk: etc/codecs.conf libmpdemux/demux_lavf.c
by diego 15 Nov '06

15 Nov '06

Author: diego Date: Thu Nov 16 00:42:47 2006 New Revision: 20947 Modified: trunk/etc/codecs.conf trunk/libmpdemux/demux_lavf.c Log: Add support for Westwood IMA ADPCM audio. Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Thu Nov 16 00:42:47 2006 @@ -2433,6 +2433,13 @@ driver ffmpeg dll adpcm_4xm +audiocodec ffadpcmimaws + info "FFmpeg Westwood IMA ADPCM audio" + status working + fourcc AIWS + driver ffmpeg + dll adpcm_ima_ws + audiocodec libdv info "raw DV audio decoder (libdv)" status working Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c (original) +++ trunk/libmpdemux/demux_lavf.c Thu Nov 16 00:42:47 2006 @@ -73,6 +73,7 @@ const CodecTag mp_wav_tags[] = { { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, + { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4')}, { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's')}, { CODEC_ID_WAVPACK, MKTAG('W', 'V', 'P', 'K')},

1 0

r20946 - trunk/libmpcodecs/vf_screenshot.c
by gpoirier 15 Nov '06

15 Nov '06

Author: gpoirier Date: Wed Nov 15 22:52:34 2006 New Revision: 20946 Modified: trunk/libmpcodecs/vf_screenshot.c Log: Fix segfault with videos with unusual resolution, patch by Stanislav Maslovski % stanislav P maslovski A gmail P com % Original thread: date: Nov 15, 2006 10:38 PM subject: [MPlayer-dev-eng] [PATCH] vf_screenshot.c: segfault (buffer overflow) Modified: trunk/libmpcodecs/vf_screenshot.c ============================================================================== --- trunk/libmpcodecs/vf_screenshot.c (original) +++ trunk/libmpcodecs/vf_screenshot.c Wed Nov 15 22:52:34 2006 @@ -139,7 +139,7 @@ dst[0] = priv->buffer; dst[1] = dst[2] = 0; - sws_scale_ordered(priv->ctx, mpi->planes, mpi->stride, 0, mpi->height, dst, dst_stride); + sws_scale_ordered(priv->ctx, mpi->planes, mpi->stride, 0, priv->dh, dst, dst_stride); } static void start_slice(struct vf_instance_s* vf, mp_image_t *mpi){

1 0

r20945 - trunk/configure
by iive 15 Nov '06

15 Nov '06

Author: iive Date: Wed Nov 15 21:51:27 2006 New Revision: 20945 Modified: trunk/configure Log: When testing lame preset presence, use actuall lame_set_preset() function to test its availablility in the library. Now it only tests include definitions. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Wed Nov 15 21:51:27 2006 @@ -6555,12 +6555,12 @@ _ld_mp3lame="-lmp3lame $_ld_vorbis" cat > $TMPC << EOF #include <lame/lame.h> -int main(void) { int p = STANDARD_FAST; return 0; } +int main(void) { lame_set_preset(NULL, STANDARD_FAST); return 0; } EOF cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset="#define HAVE_MP3LAME_PRESET" cat > $TMPC << EOF #include <lame/lame.h> -int main(void) { int p = MEDIUM_FAST; return 0; } +int main(void) { lame_set_preset(NULL, MEDIUM_FAST); return 0; } EOF cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM" echo $_libavencoders | grep -q mp3lame && _lavc_mp3lame=yes || _lavc_mp3lame=no

1 0

r20942 - trunk/libmpdemux/demux_nut.c
by ods15 15 Nov '06

15 Nov '06

Author: ods15 Date: Wed Nov 15 12:36:22 2006 New Revision: 20942 Modified: trunk/libmpdemux/demux_nut.c Log: update to libnut, no nut_skip_packet() Modified: trunk/libmpdemux/demux_nut.c ============================================================================== --- trunk/libmpdemux/demux_nut.c (original) +++ trunk/libmpdemux/demux_nut.c Wed Nov 15 12:36:22 2006 @@ -202,7 +202,8 @@ ds = demuxer->video; } else { - ret = nut_skip_packet(nut, &pd.len); + uint8_t buf[pd.len]; + ret = nut_read_frame(nut, &pd.len, buf); if (ret < 0) { mp_msg(MSGT_HEADER, MSGL_ERR, "NUT error: %s\n", nut_error(-ret));

1 0

r20941 - trunk/libmpdemux/demux_nut.c
by ods15 15 Nov '06

15 Nov '06

Author: ods15 Date: Wed Nov 15 12:26:05 2006 New Revision: 20941 Modified: trunk/libmpdemux/demux_nut.c Log: update to libnut API, don't free the streams Modified: trunk/libmpdemux/demux_nut.c ============================================================================== --- trunk/libmpdemux/demux_nut.c (original) +++ trunk/libmpdemux/demux_nut.c Wed Nov 15 12:26:05 2006 @@ -275,9 +275,8 @@ } static void demux_close_nut(demuxer_t *demuxer) { - nut_context_t * nut = ((nut_priv_t*)demuxer->priv)->nut; - nut_demuxer_uninit(nut); - free(((nut_priv_t*)demuxer->priv)->s); + nut_priv_t * priv = demuxer->priv; + nut_demuxer_uninit(priv->nut); free(demuxer->priv); demuxer->priv = NULL; }

1 0

[propchange]: r20936 - svn:log
by rtogni 14 Nov '06

14 Nov '06

Author: rtogni Revision: 20936 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -4,3 +4,4 @@ Sync mkv demuxer to the changes above (cmsg24 extradata was totally broken before) Detect cmsg24 size from extradata (was fixed) +Based on a patch by elupus >> elupus >a< ecce se <<

1 0

r20937 - trunk/libmpdemux/demux_mkv.c
by rtogni 14 Nov '06

14 Nov '06

Author: rtogni Date: Tue Nov 14 23:48:53 2006 New Revision: 20937 Modified: trunk/libmpdemux/demux_mkv.c Log: Don't spam the console with timestamps (non-error messages printed every frame should be lower than V level) Modified: trunk/libmpdemux/demux_mkv.c ============================================================================== --- trunk/libmpdemux/demux_mkv.c (original) +++ trunk/libmpdemux/demux_mkv.c Tue Nov 14 23:48:53 2006 @@ -3077,7 +3077,7 @@ if (pict_type <= 1) { // I frame, sync timestamps: track->rv_kf_base = timestamp - kf; - mp_msg(MSGT_DEMUX, MSGL_V, "\nTS: base=%08X\n", track->rv_kf_base); + mp_msg(MSGT_DEMUX, MSGL_DBG2, "\nTS: base=%08X\n", track->rv_kf_base); kf = timestamp; } else { // P/B frame, merge timestamps: @@ -3094,7 +3094,7 @@ kf = track->rv_kf_pts; track->rv_kf_pts = tmp; } - mp_msg(MSGT_DEMUX, MSGL_V, "\nTS: %08X -> %08X (%04X) %d %02X %02X %02X " + mp_msg(MSGT_DEMUX, MSGL_DBG2, "\nTS: %08X -> %08X (%04X) %d %02X %02X %02X " "%02X %5d\n", timestamp, kf, orig_kf, pict_type, s[0], s[1], s[2], s[3], kf - (int)(1000.0 * track->rv_pts)); }

1 0