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

r32664 - trunk/vidix/radeon_vid.c
by reimar 24 Dec '10

24 Dec '10

Author: reimar Date: Sun Nov 28 16:25:15 2010 New Revision: 32664 Log: Restore big-endian support removed in thoughtless upstream merge at r23062. Modified: trunk/vidix/radeon_vid.c Modified: trunk/vidix/radeon_vid.c ============================================================================== --- trunk/vidix/radeon_vid.c Sun Nov 28 08:47:37 2010 (r32663) +++ trunk/vidix/radeon_vid.c Sun Nov 28 16:25:15 2010 (r32664) @@ -1268,6 +1268,7 @@ typedef struct saved_regs_s uint32_t ov0_graphics_key_msk; uint32_t ov0_key_cntl; uint32_t disp_merge_cntl; + uint32_t config_cntl; }saved_regs_t; static saved_regs_t savreg; @@ -1280,6 +1281,13 @@ static void save_regs( void ) savreg.ov0_graphics_key_msk = INREG(OV0_GRAPHICS_KEY_MSK); savreg.ov0_key_cntl = INREG(OV0_KEY_CNTL); savreg.disp_merge_cntl = INREG(DISP_MERGE_CNTL); +#if HAVE_BIGENDIAN +#ifdef RAGE128 + savereg.config_cntl = INREG(CONFIG_CNTL); +#else + savereg.config_cntl = INREG(RADEON_SURFACE_CNTL); +#endif +#endif } static void restore_regs( void ) @@ -1291,6 +1299,13 @@ static void restore_regs( void ) OUTREG(OV0_GRAPHICS_KEY_MSK,savreg.ov0_graphics_key_msk); OUTREG(OV0_KEY_CNTL,savreg.ov0_key_cntl); OUTREG(DISP_MERGE_CNTL,savreg.disp_merge_cntl); +#if HAVE_BIGENDIAN +#ifdef RAGE128 + OUTREG(CONFIG_CNTL, savereg.config_cntl); +#else + OUTREG(RADEON_SURFACE_CNTL, savereg.config_cntl); +#endif +#endif } static int radeon_init(void) @@ -1352,6 +1367,18 @@ static int radeon_init(void) } #endif save_regs(); + /* XXX: hack, but it works for me (tm) */ +#if HAVE_BIGENDIAN +#ifdef RAGE128 + OUTREG(CONFIG_CNTL, + savereg.config_cntl & + ~(APER_0_BIG_ENDIAN_16BPP_SWAP | APER_0_BIG_ENDIAN_32BPP_SWAP)); +#else + OUTREG(RADEON_SURFACE_CNTL, + savereg.config_cntl & + ~(RADEON_NONSURF_AP0_SWP_32BPP | RADEON_NONSURF_AP0_SWP_16BPP)); +#endif +#endif return 0; }

2 1

r32658 - trunk/etc/codecs.conf
by compn 29 Nov '10

29 Nov '10

Author: compn Date: Sat Nov 27 14:29:16 2010 New Revision: 32658 Log: change dnxhd to qtdnxhd. consistant with all other quicktime decoders Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat Nov 27 13:24:01 2010 (r32657) +++ trunk/etc/codecs.conf Sat Nov 27 14:29:16 2010 (r32658) @@ -2714,7 +2714,7 @@ videocodec ffcavs dll "cavs" out YV12,I420 -videocodec dnxhd +videocodec qtdnxhd info "QuickTime Avid DNxHD" comment "needed for decoding 10-bit DNxHD" status working

2 1

r32668 - trunk/libmpdemux/demux_audio.c
by reimar 29 Nov '10

29 Nov '10

Author: reimar Date: Mon Nov 29 19:56:21 2010 New Revision: 32668 Log: Set needs_parsing to 1 for DTS audio. Modified: trunk/libmpdemux/demux_audio.c Modified: trunk/libmpdemux/demux_audio.c ============================================================================== --- trunk/libmpdemux/demux_audio.c Sun Nov 28 19:02:50 2010 (r32667) +++ trunk/libmpdemux/demux_audio.c Mon Nov 29 19:56:21 2010 (r32668) @@ -471,8 +471,10 @@ static int demux_audio_open(demuxer_t* d break; } } - if (sh_audio->format == 0x2001) + if (sh_audio->format == 0x2001) { + sh_audio->needs_parsing = 1; mp_msg(MSGT_DEMUX,MSGL_DBG2,"[demux_audio] DTS sync offset = %u\n", i); + } } stream_seek(s,demuxer->movi_start);

1 0

r32667 - trunk/libmpdemux/demux_ts.c
by reimar 28 Nov '10

28 Nov '10

Author: reimar Date: Sun Nov 28 19:02:50 2010 New Revision: 32667 Log: Fix TS files with MP4 ES AAC descriptor to be correctly recognized as AAC and not AAC in LATM. This fixes playback of http://samples.mplayerhq.hu/A-codecs/AAC/freetv_aac_latm.ts, actual LATM samples seem unaffected. Modified: trunk/libmpdemux/demux_ts.c Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c Sun Nov 28 17:10:56 2010 (r32666) +++ trunk/libmpdemux/demux_ts.c Sun Nov 28 19:02:50 2010 (r32667) @@ -2347,8 +2347,9 @@ static int parse_descriptors(struct pmt_ mp_msg(MSGT_DEMUX, MSGL_DBG2, "FORMAT %s\n", es->format_descriptor); } } - else if(ptr[j] == 0x1e) + else if(ptr[j] == 0x1e || ptr[j] == 0x1f) { + // 0x1f is FMC, but currently it is easiest to handle them the same way es->mp4_es_id = (ptr[j+2] << 8) | ptr[j+3]; mp_msg(MSGT_DEMUX, MSGL_V, "SL Descriptor: ES_ID: %d(%x), pid: %d\n", es->mp4_es_id, es->mp4_es_id, es->pid); } @@ -2400,6 +2401,7 @@ static int parse_pmt(ts_priv_t * priv, u struct pmt_es_t *tmp_es; ts_section_t *section; ES_stream_t *tss; + int i; idx = progid_idx_in_pmt(priv, progid); @@ -2522,6 +2524,10 @@ static int parse_pmt(ts_priv_t * priv, u break; case 0x11: pmt->es[idx].type = AUDIO_AAC_LATM; + for (i = 0; i < pmt->mp4es_cnt; i++) + if (pmt->mp4es[i].id == pmt->es[idx].mp4_es_id && + pmt->mp4es[i].decoder.object_type == AUDIO_AAC) + pmt->es[idx].type = AUDIO_AAC; break; case 0x1b: pmt->es[idx].type = VIDEO_H264;

3 3

r32666 - trunk/vidix/radeon_vid.c
by reimar 28 Nov '10

28 Nov '10

Author: reimar Date: Sun Nov 28 17:10:56 2010 New Revision: 32666 Log: Add horrible hack to make xvidix work on big-endian. Modified: trunk/vidix/radeon_vid.c Modified: trunk/vidix/radeon_vid.c ============================================================================== --- trunk/vidix/radeon_vid.c Sun Nov 28 16:33:45 2010 (r32665) +++ trunk/vidix/radeon_vid.c Sun Nov 28 17:10:56 2010 (r32666) @@ -1308,6 +1308,24 @@ static void restore_regs( void ) #endif } +/** + * Clear swap bits of surface data control regs for bigendian + */ +static void clear_swap(void) +{ +#if HAVE_BIGENDIAN +#ifdef RAGE128 + OUTREG(CONFIG_CNTL, + savreg.config_cntl & + ~(APER_0_BIG_ENDIAN_16BPP_SWAP | APER_0_BIG_ENDIAN_32BPP_SWAP)); +#else + OUTREG(SURFACE_CNTL, + savreg.config_cntl & + ~(NONSURF_AP0_SWP_32BPP | NONSURF_AP0_SWP_16BPP)); +#endif +#endif +} + static int radeon_init(void) { int err; @@ -1367,18 +1385,7 @@ static int radeon_init(void) } #endif save_regs(); - /* XXX: hack, but it works for me (tm) */ -#if HAVE_BIGENDIAN -#ifdef RAGE128 - OUTREG(CONFIG_CNTL, - savreg.config_cntl & - ~(APER_0_BIG_ENDIAN_16BPP_SWAP | APER_0_BIG_ENDIAN_32BPP_SWAP)); -#else - OUTREG(SURFACE_CNTL, - savreg.config_cntl & - ~(NONSURF_AP0_SWP_32BPP | NONSURF_AP0_SWP_16BPP)); -#endif -#endif + clear_swap(); return 0; } @@ -3178,6 +3185,11 @@ static int radeon_frame_select(unsigned { uint32_t off[6]; int prev_frame= (frame-1+besr.vid_nbufs) % besr.vid_nbufs; + // This really only needs to be set during data writes, + // however we don't have a hook there. + // The setup at startup is not enough since X11 regularly + // resets this to values to the wrong values for us. + clear_swap(); /* buf3-5 always should point onto second buffer for better deinterlacing and TV-in

1 0

r32665 - in trunk/vidix: radeon.h radeon_vid.c
by reimar 28 Nov '10

28 Nov '10

Author: reimar Date: Sun Nov 28 16:33:45 2010 New Revision: 32665 Log: 100l, fix vidix compilation on big-endian Modified: trunk/vidix/radeon.h trunk/vidix/radeon_vid.c Modified: trunk/vidix/radeon.h ============================================================================== --- trunk/vidix/radeon.h Sun Nov 28 16:25:15 2010 (r32664) +++ trunk/vidix/radeon.h Sun Nov 28 16:33:45 2010 (r32665) @@ -77,6 +77,8 @@ #define I2C_DATA 0x0098 #define CONFIG_CNTL 0x00E0 /* CONFIG_CNTL bit constants */ +# define APER_0_BIG_ENDIAN_16BPP_SWAP 0x00000001 +# define APER_0_BIG_ENDIAN_32BPP_SWAP 0x00000002 # define CFG_VGA_RAM_EN 0x00000100 #ifdef RAGE128 #define GEN_RESET_CNTL 0x00f0 Modified: trunk/vidix/radeon_vid.c ============================================================================== --- trunk/vidix/radeon_vid.c Sun Nov 28 16:25:15 2010 (r32664) +++ trunk/vidix/radeon_vid.c Sun Nov 28 16:33:45 2010 (r32665) @@ -1283,9 +1283,9 @@ static void save_regs( void ) savreg.disp_merge_cntl = INREG(DISP_MERGE_CNTL); #if HAVE_BIGENDIAN #ifdef RAGE128 - savereg.config_cntl = INREG(CONFIG_CNTL); + savreg.config_cntl = INREG(CONFIG_CNTL); #else - savereg.config_cntl = INREG(RADEON_SURFACE_CNTL); + savreg.config_cntl = INREG(SURFACE_CNTL); #endif #endif } @@ -1301,9 +1301,9 @@ static void restore_regs( void ) OUTREG(DISP_MERGE_CNTL,savreg.disp_merge_cntl); #if HAVE_BIGENDIAN #ifdef RAGE128 - OUTREG(CONFIG_CNTL, savereg.config_cntl); + OUTREG(CONFIG_CNTL, savreg.config_cntl); #else - OUTREG(RADEON_SURFACE_CNTL, savereg.config_cntl); + OUTREG(SURFACE_CNTL, savreg.config_cntl); #endif #endif } @@ -1371,12 +1371,12 @@ static int radeon_init(void) #if HAVE_BIGENDIAN #ifdef RAGE128 OUTREG(CONFIG_CNTL, - savereg.config_cntl & + savreg.config_cntl & ~(APER_0_BIG_ENDIAN_16BPP_SWAP | APER_0_BIG_ENDIAN_32BPP_SWAP)); #else - OUTREG(RADEON_SURFACE_CNTL, - savereg.config_cntl & - ~(RADEON_NONSURF_AP0_SWP_32BPP | RADEON_NONSURF_AP0_SWP_16BPP)); + OUTREG(SURFACE_CNTL, + savreg.config_cntl & + ~(NONSURF_AP0_SWP_32BPP | NONSURF_AP0_SWP_16BPP)); #endif #endif return 0;

1 0

r32663 - trunk/vidix/radeon_vid.c
by reimar 28 Nov '10

28 Nov '10

Author: reimar Date: Sun Nov 28 08:47:37 2010 New Revision: 32663 Log: Add R_OVL_SHIFT to all R280 devices. Only actually confirmed for two. Fixes bug #1826. Modified: trunk/vidix/radeon_vid.c Modified: trunk/vidix/radeon_vid.c ============================================================================== --- trunk/vidix/radeon_vid.c Sun Nov 28 06:32:00 2010 (r32662) +++ trunk/vidix/radeon_vid.c Sun Nov 28 08:47:37 2010 (r32663) @@ -394,15 +394,16 @@ static const ati_card_ids_t ati_card_ids { DEVICE_ATI_RADEON_R250_LG, R_250|R_OVL_SHIFT }, { DEVICE_ATI_RV250_RADEON_9000, R_250|R_OVL_SHIFT }, { DEVICE_ATI_RADEON_RV250_RADEON2, R_250|R_OVL_SHIFT }, - { DEVICE_ATI_RV280_RADEON_9200, R_280 }, - { DEVICE_ATI_RV280_RADEON_92002, R_280 }, - { DEVICE_ATI_RV280_RADEON_92003, R_280 }, - { DEVICE_ATI_RV280_RADEON_92004, R_280 }, - { DEVICE_ATI_RV280_RADEON_92005, R_280 }, - { DEVICE_ATI_RV280_RADEON_92006, R_280 }, - { DEVICE_ATI_RV280_RADEON_92007, R_280 }, - { DEVICE_ATI_M9_5C61_RADEON, R_280 }, - { DEVICE_ATI_M9_5C63_RADEON, R_280 }, + // Only 92006 and 92007 tested to actually require this + { DEVICE_ATI_RV280_RADEON_9200, R_280|R_OVL_SHIFT }, + { DEVICE_ATI_RV280_RADEON_92002, R_280|R_OVL_SHIFT }, + { DEVICE_ATI_RV280_RADEON_92003, R_280|R_OVL_SHIFT }, + { DEVICE_ATI_RV280_RADEON_92004, R_280|R_OVL_SHIFT }, + { DEVICE_ATI_RV280_RADEON_92005, R_280|R_OVL_SHIFT }, + { DEVICE_ATI_RV280_RADEON_92006, R_280|R_OVL_SHIFT }, + { DEVICE_ATI_RV280_RADEON_92007, R_280|R_OVL_SHIFT }, + { DEVICE_ATI_M9_5C61_RADEON, R_280|R_OVL_SHIFT }, + { DEVICE_ATI_M9_5C63_RADEON, R_280|R_OVL_SHIFT }, /* Radeon3 (indeed: Rage 1024 Pro ;) */ { DEVICE_ATI_R300_AG_FIREGL, R_300 }, { DEVICE_ATI_RADEON_R300_ND, R_300 },

1 0

r32662 - trunk/etc/codecs.conf
by compn 28 Nov '10

28 Nov '10

Author: compn Date: Sun Nov 28 06:32:00 2010 New Revision: 32662 Log: add ffmpeg g722 audio codec works on incoming/g722/ sample Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sat Nov 27 20:15:54 2010 (r32661) +++ trunk/etc/codecs.conf Sun Nov 28 06:32:00 2010 (r32662) @@ -4714,6 +4714,13 @@ audiocodec g72x driver g72x dll "g72x.c" +audiocodec ffg722 + info "G.722 Audio" + status working + format 0x28F + driver ffmpeg + dll "g722" + audiocodec ffg726 info "Sharp G.726 Audio" status working

1 0

r32649 - trunk/etc/codecs.conf
by reimar 28 Nov '10

28 Nov '10

Author: reimar Date: Sat Nov 27 10:49:17 2010 New Revision: 32649 Log: Add support for decoding Avid DNxHD through the QuickTime component. This is needed for the 10-bit variant which the FFmpeg decoder does not support (unfortunately both use the same FourCC). Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Fri Nov 26 21:52:35 2010 (r32648) +++ trunk/etc/codecs.conf Sat Nov 27 10:49:17 2010 (r32649) @@ -2714,6 +2714,15 @@ videocodec ffcavs dll "cavs" out YV12,I420 +videocodec dnxhd + info "QuickTime Avid DNxHD" + comment "needed for decoding 10-bit DNxHD" + status working + fourcc AVdn + driver qtvideo + dll "AvidAVdnCodec.qtx" + out UYVY,BGR24 + videocodec ffdnxhd info "FFmpeg DNxHD" status working

2 2

r32661 - in trunk: DOCS/man/en/mplayer.1 libmpcodecs/ve_xvid4.c
by iive 27 Nov '10

27 Nov '10

Author: iive Date: Sat Nov 27 20:15:54 2010 New Revision: 32661 Log: Expose the VBV options of xvid encoder to the command line interface. Also remove incorrect multiply of debug option. Patch by Lasse Collin < lasse point collin at tukaani point org>. Modified: trunk/libmpcodecs/ve_xvid4.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/libmpcodecs/ve_xvid4.c ============================================================================== --- trunk/libmpcodecs/ve_xvid4.c Sat Nov 27 19:06:45 2010 (r32660) +++ trunk/libmpcodecs/ve_xvid4.c Sat Nov 27 20:15:54 2010 (r32661) @@ -209,6 +209,10 @@ static int xvidenc_vbr_kfreduction = 0; static int xvidenc_vbr_kfthreshold = 0; static int xvidenc_vbr_container_frame_overhead = 24; /* mencoder uses AVI container */ +static int xvidenc_vbv_size = 0; +static int xvidenc_vbv_initial = 0; +static int xvidenc_vbv_maxrate = 0; + // commandline profile option string - default to unrestricted static char *xvidenc_profile = "unrestricted"; @@ -296,6 +300,11 @@ const m_option_t xvidencopts_conf[] = {"kfthreshold", &xvidenc_vbr_kfthreshold, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, {"container_frame_overhead", &xvidenc_vbr_container_frame_overhead, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, + /* section [vbv] */ + {"vbv_bufsize", &xvidenc_vbv_size, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, + {"vbv_initial", &xvidenc_vbv_initial, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, + {"vbv_maxrate", &xvidenc_vbv_maxrate, CONF_TYPE_INT, CONF_MIN, 0, 0, NULL}, + /* Section Aspect Ratio */ {"par", &xvidenc_par, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"par_width", &xvidenc_par_width, CONF_TYPE_INT, CONF_RANGE, 0, 255, NULL}, @@ -775,13 +784,44 @@ static int dispatch_settings(xvid_mplaye /* VBV */ #if XVID_API >= XVID_MAKE_API(4,1) - pass2->vbv_size = selected_profile->max_vbv_size; - pass2->vbv_initial = (selected_profile->max_vbv_size*3)>>2; /* 75% */ - pass2->vbv_maxrate = selected_profile->max_bitrate; - pass2->vbv_peakrate = selected_profile->vbv_peakrate*3; + if(xvidenc_vbv_size > 0) { + if(selected_profile->max_vbv_size > 0 && xvidenc_vbv_size > selected_profile->max_vbv_size) { + mp_msg(MSGT_MENCODER,MSGL_ERR, + "xvid:[ERROR] Selected profile limits vbv_bufsize <= %d\n", selected_profile->max_vbv_size); + return BAD; + } + + pass2->vbv_size = xvidenc_vbv_size; + } else { + pass2->vbv_size = selected_profile->max_vbv_size; + } + + if(xvidenc_vbv_initial > 0) { + if(xvidenc_vbv_initial > pass2->vbv_size) { + mp_msg(MSGT_MENCODER,MSGL_ERR, + "xvid:[ERROR] vbv_initial must be <= vbv_bufsize\n"); + return BAD; + } + + pass2->vbv_initial = xvidenc_vbv_initial; + } else { + pass2->vbv_initial = (pass2->vbv_size*3)>>2; /* 75% */ + } + + if(xvidenc_vbv_maxrate > 0) { + if(selected_profile->max_bitrate > 0 && xvidenc_vbv_maxrate > selected_profile->max_bitrate) { + mp_msg(MSGT_MENCODER,MSGL_ERR, + "xvid:[ERROR] Selected profile limits vbv_maxrate <= %d\n", selected_profile->max_bitrate); + return BAD; + } + + pass2->vbv_maxrate = xvidenc_vbv_maxrate; + } else { + pass2->vbv_maxrate = selected_profile->max_bitrate; + } + + pass2->vbv_peakrate = selected_profile->vbv_peakrate; /* Useless */ #endif -// XXX: xvidcore currently provides a "peak bits over 3 seconds" constraint. -// according to the latest dxn literature, a 1 second constraint is now used create->profile = selected_profile->id;

1 0