July 2009 - MPlayer-cvslog - lists.mplayerhq.hu

r23524 - trunk/etc/codecs.conf
by compn 10 Jun '10

10 Jun '10

Author: compn Date: Sat Jun 9 00:59:04 2007 New Revision: 23524 Log: add mmes fourcc for mpeg2 in avi files Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Sat Jun 9 00:59:04 2007 @@ -58,6 +58,7 @@ videocodec mpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -85,6 +86,7 @@ videocodec ffmpeg2 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -104,6 +106,7 @@ videocodec ffmpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -122,6 +125,7 @@ videocodec ffmpeg12mc fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" out IDCT_MPEG2

4 5

r28039 - trunk/etc/codecs.conf
by diego 04 Sep '09

04 Sep '09

Author: diego Date: Wed Nov 26 14:04:10 2008 New Revision: 28039 Log: Update Tremor comment regarding fixed-point mode. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Wed Nov 26 14:04:10 2008 @@ -3494,7 +3494,7 @@ audiocodec vorbis audiocodec tremor info "OggVorbis audio decoder" status working - comment "OggVorbis fixed-point decoder useful for ARM based systems" + comment "fixed-point decoder useful systems without floating-point unit" fourcc vrbs format 0x566F driver tremor

4 3

r28743 - trunk/libvo/vo_vdpau.c
by cehoyos 17 Aug '09

17 Aug '09

Author: cehoyos Date: Fri Feb 27 22:52:59 2009 New Revision: 28743 Log: Add one-field-only output for -vo vdpau. Change syntax of -vo vdpau:deint for the last time. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Fri Feb 27 22:46:13 2009 (r28742) +++ trunk/libvo/vo_vdpau.c Fri Feb 27 22:52:59 2009 (r28743) @@ -208,7 +208,7 @@ static void video_to_output_surface(void // we would need to provide 2 past and 1 future frames to allow advanced // deinterlacing, which is not really possible currently. - for (i = 0; i <= !!deint; i++) { + for (i = 0; i <= !!(deint > 1); i++) { int field = VDP_VIDEO_MIXER_PICTURE_STRUCTURE_FRAME; VdpOutputSurface output_surface; if (i) @@ -394,9 +394,9 @@ static int create_vdp_mixer(VdpChromaTyp &vid_height, &vdp_chroma_type }; - if (deint == 2) - features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL; if (deint == 3) + features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL; + if (deint == 4) features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_DEINTERLACE_TEMPORAL_SPATIAL; if (pullup) features[feature_count++] = VDP_VIDEO_MIXER_FEATURE_INVERSE_TELECINE; @@ -946,9 +946,10 @@ static const char help_msg[] = "\nOptions:\n" " deint (all modes > 0 respect -field-dominance)\n" " 0: no deinterlacing\n" - " 1: bob deinterlacing (current fallback)\n" - " 2: temporal deinterlacing (not yet working)\n" - " 3: temporal-spatial deinterlacing (not yet working)\n" + " 1: only show first field\n" + " 2: bob deinterlacing (current fallback)\n" + " 3: temporal deinterlacing (not yet working)\n" + " 4: temporal-spatial deinterlacing (not yet working)\n" " pullup\n" " Try to apply inverse-telecine (needs deinterlacing, not working)\n" " denoise\n"

2 1

r29463 - trunk/configure
by ben 31 Jul '09

31 Jul '09

Author: ben Date: Fri Jul 31 22:13:02 2009 New Revision: 29463 Log: Add a variable in config.mak whether SHM support is enabled or not. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Jul 31 15:07:56 2009 (r29462) +++ trunk/configure Fri Jul 31 22:13:02 2009 (r29463) @@ -8414,6 +8414,7 @@ CONFIG_XVMC=$_xvmc CONFIG_ZLIB=$_zlib HAVE_PTHREADS = $_pthreads +HAVE_SHM = $_shm HAVE_W32THREADS = $_w32threads HAVE_YASM = $_have_yasm

1 0

r29458 - trunk/Changelog
by compn 31 Jul '09

31 Jul '09

Author: compn Date: Thu Jul 30 13:58:56 2009 New Revision: 29458 Log: start rc4 changelog, where did rc3 go? Modified: trunk/Changelog Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Thu Jul 30 10:37:10 2009 (r29457) +++ trunk/Changelog Thu Jul 30 13:58:56 2009 (r29458) @@ -1,5 +1,15 @@ MPlayer (1.0) + rc4: "Yes We Can" + Decoders: + * YUY2 Lossless Codec (YLC0) via binary DLL + * Truemotion RT codec (TR20) via binary DLL + * Nogantech Codec (NTN1 and NTN2) via binary DLL + * add new FourCCs (m1v1,HDMV), TwoCCs (0xA106,0x6c75), and formats (0x11005354) + to existing codecs. + * AMR now handled via opencore decoder + * support for TrueHD in BluRay streams + rc3: "BikeshedCounter" March 27, 2009 Decoders: * support for X8 frames (fixes "J-type picture is not supported" for WMV2)

2 1

r29460 - trunk/Changelog
by compn 30 Jul '09

30 Jul '09

Author: compn Date: Thu Jul 30 14:08:20 2009 New Revision: 29460 Log: move truehd to correct section Modified: trunk/Changelog Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Thu Jul 30 14:03:42 2009 (r29459) +++ trunk/Changelog Thu Jul 30 14:08:20 2009 (r29460) @@ -8,7 +8,9 @@ MPlayer (1.0) * add new FourCCs (m1v1,HDMV), TwoCCs (0xA106,0x6c75), and formats (0x11005354) to existing codecs. * AMR now handled via opencore decoder - * support for TrueHD in BluRay streams + + Demuxers: + * support for TrueHD in BluRay streams in libmpdemux rc3: "BikeshedCounter" March 27, 2009 Decoders:

1 0

r29459 - trunk/DOCS/tech/codecs.conf.txt
by compn 30 Jul '09

30 Jul '09

Author: compn Date: Thu Jul 30 14:03:42 2009 New Revision: 29459 Log: undocumented keyword Modified: trunk/DOCS/tech/codecs.conf.txt Modified: trunk/DOCS/tech/codecs.conf.txt ============================================================================== --- trunk/DOCS/tech/codecs.conf.txt Thu Jul 30 13:58:56 2009 (r29458) +++ trunk/DOCS/tech/codecs.conf.txt Thu Jul 30 14:03:42 2009 (r29459) @@ -133,6 +133,8 @@ static, query. The flags are defined as Used for some very old DLLs like Indeo 3 and for some XAnim codecs like cinepak. See dr-methods.txt for details on buffer types. +The "in" keyword -- UNDOCUMENTED + Audio Codecs ------------ Here is an example of a rather full-featured audio codec block:

1 0

r29456 - in trunk: etc/codecs.conf libmpdemux/mp_taglists.c
by nicodvb 30 Jul '09

30 Jul '09

Author: nicodvb Date: Thu Jul 30 10:36:17 2009 New Revision: 29456 Log: added inexistant TRHD fourcc to handle TRUEHD streams in forthcoming patch Modified: trunk/etc/codecs.conf trunk/libmpdemux/mp_taglists.c Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Jul 28 18:25:03 2009 (r29455) +++ trunk/etc/codecs.conf Thu Jul 30 10:36:17 2009 (r29456) @@ -3548,6 +3548,13 @@ audiocodec ffmlp driver ffmpeg dll "mlp" +audiocodec fftruehd + info "FFmpeg TrueHD" + status working + fourcc TRHD ; internal MPlayer FourCC + driver ffmpeg + dll "truehd" + audiocodec ffnellymoser info "FFmpeg Nellymoser Audio" status working Modified: trunk/libmpdemux/mp_taglists.c ============================================================================== --- trunk/libmpdemux/mp_taglists.c Tue Jul 28 18:25:03 2009 (r29455) +++ trunk/libmpdemux/mp_taglists.c Thu Jul 30 10:36:17 2009 (r29456) @@ -44,6 +44,7 @@ static const AVCodecTag mp_wav_tags[] = { CODEC_ID_ROQ_DPCM, MKTAG('R', 'o', 'Q', 'A')}, { CODEC_ID_SHORTEN, MKTAG('s', 'h', 'r', 'n')}, { CODEC_ID_SPEEX, MKTAG('s', 'p', 'x', ' ')}, + { CODEC_ID_TRUEHD, MKTAG('T', 'R', 'H', 'D')}, { CODEC_ID_TTA, MKTAG('T', 'T', 'A', '1')}, { CODEC_ID_WAVPACK, MKTAG('W', 'V', 'P', 'K')}, { CODEC_ID_WESTWOOD_SND1, MKTAG('S', 'N', 'D', '1')},

4 6

r29457 - trunk/libmpdemux/demux_ts.c
by nicodvb 30 Jul '09

30 Jul '09

Author: nicodvb Date: Thu Jul 30 10:37:10 2009 New Revision: 29457 Log: handle TrueHD streams (they are carried in 0xFD PES streams in substream 0x72) Modified: trunk/libmpdemux/demux_ts.c Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c Thu Jul 30 10:36:17 2009 (r29456) +++ trunk/libmpdemux/demux_ts.c Thu Jul 30 10:37:10 2009 (r29457) @@ -77,6 +77,7 @@ typedef enum AUDIO_DTS = 0x2001, AUDIO_LPCM_BE = 0x10001, AUDIO_AAC = mmioFOURCC('M', 'P', '4', 'A'), + AUDIO_TRUEHD = mmioFOURCC('T', 'R', 'H', 'D'), SPU_DVD = 0x3000000, SPU_DVB = 0x3000001, PES_PRIVATE1 = 0xBD00000, @@ -244,7 +245,7 @@ typedef struct { } TS_pids_t; -#define IS_AUDIO(x) (((x) == AUDIO_MP2) || ((x) == AUDIO_A52) || ((x) == AUDIO_LPCM_BE) || ((x) == AUDIO_AAC) || ((x) == AUDIO_DTS)) +#define IS_AUDIO(x) (((x) == AUDIO_MP2) || ((x) == AUDIO_A52) || ((x) == AUDIO_LPCM_BE) || ((x) == AUDIO_AAC) || ((x) == AUDIO_DTS) || ((x) == AUDIO_TRUEHD)) #define IS_VIDEO(x) (((x) == VIDEO_MPEG1) || ((x) == VIDEO_MPEG2) || ((x) == VIDEO_MPEG4) || ((x) == VIDEO_H264) || ((x) == VIDEO_AVC) || ((x) == VIDEO_VC1)) static int ts_parse(demuxer_t *demuxer, ES_stream_t *es, unsigned char *packet, int probe); @@ -871,6 +872,8 @@ static off_t ts_detect_streams(demuxer_t mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO LPCM(pid=%d)", param->apid); else if(param->atype == AUDIO_AAC) mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO AAC(pid=%d)", param->apid); + else if(param->atype == AUDIO_TRUEHD) + mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO TRUEHD(pid=%d)", param->apid); else { audio_found = 0; @@ -1412,6 +1415,8 @@ static int pes_parse2(unsigned char *buf int ssid = parse_pes_extension_fields(p, pkt_len); if((audio_substream_id!=-1) && (ssid != audio_substream_id)) return 0; + if(ssid == 0x72) + es->type = type_from_pmt = AUDIO_TRUEHD; } p += header_len + 9;

1 0

r29455 - trunk/stream/realrtsp/real.c
by uau 28 Jul '09

28 Jul '09

Author: uau Date: Tue Jul 28 18:25:03 2009 New Revision: 29455 Log: stream/realrtsp/real.c: Fix another integer overflow Modified: trunk/stream/realrtsp/real.c Modified: trunk/stream/realrtsp/real.c ============================================================================== --- trunk/stream/realrtsp/real.c Tue Jul 28 07:45:47 2009 (r29454) +++ trunk/stream/realrtsp/real.c Tue Jul 28 18:25:03 2009 (r29455) @@ -382,6 +382,8 @@ int real_get_rdt_chunk(rtsp_t *rtsp_sess ph.flags=0; *buffer = xbuffer_ensure_size(*buffer, 12+size); if(rdt_rawdata) { + if (size < 12) + return 0; n=rtsp_read_data(rtsp_session, *buffer, size-12); return (n <= 0) ? 0 : n; }

1 0