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

r31920 - trunk/libmpdemux/genres.h
by siretart 04 Aug '10

04 Aug '10

Author: siretart Date: Wed Aug 4 14:20:01 2010 New Revision: 31920 Log: reintroduce typo in genres.h that was fixed fixed r31913 to match the id3v2 spec Modified: trunk/libmpdemux/genres.h Modified: trunk/libmpdemux/genres.h ============================================================================== --- trunk/libmpdemux/genres.h Wed Aug 4 08:16:42 2010 (r31919) +++ trunk/libmpdemux/genres.h Wed Aug 4 14:20:01 2010 (r31920) @@ -99,7 +99,7 @@ const char * const genres[] = { "Native American", /* 64 */ "Cabaret", /* 65 */ "New Wave", /* 66 */ -"Psychedelic", /* 67 */ +"Psychadelic", /* 67 */ /* typo taken from the id3v2spec*/ "Rave", /* 68 */ "Show Tunes", /* 69 */ "Trailer", /* 70 */

1 0

r31919 - trunk/stream/stream_bd.c
by diego 04 Aug '10

04 Aug '10

Author: diego Date: Wed Aug 4 08:16:42 2010 New Revision: 31919 Log: whitespace cosmetics: prettyprinting, move statements to the next line. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Tue Aug 3 23:06:15 2010 (r31918) +++ trunk/stream/stream_bd.c Wed Aug 4 08:16:42 2010 (r31919) @@ -30,8 +30,8 @@ #include "m_option.h" #include "stream.h" -static const int BD_UNIT_SIZE = 6144; -static const char *BD_UKF_PATH = "/%s/AACS/Unit_Key_RO.inf"; +static const int BD_UNIT_SIZE = 6144; +static const char *BD_UKF_PATH = "/%s/AACS/Unit_Key_RO.inf"; static const char *BD_M2TS_PATH = "/%s/BDMV/STREAM/%05d.m2ts"; static const char *DEFAULT_BD_DEVICE = "/mnt/bd"; @@ -42,7 +42,7 @@ static const uint8_t BD_CBC_IV[] = { }; static const struct stream_priv_s { - int title; + int title; char *device; } stream_priv_dflts = { 0, @@ -69,24 +69,24 @@ static const struct m_struct_st stream_o typedef union { uint64_t u64[2]; - uint8_t u8[16]; + uint8_t u8[16]; } key; struct uks { - int count; + int count; key *keys; }; struct bd_priv { - key vuk; - key iv; - int title; - const char *device; - FILE *title_file; + key vuk; + key iv; + int title; + const char *device; + FILE *title_file; struct AVAES *aescbc; struct AVAES *aeseed; - off_t pos; - struct uks uks; + off_t pos; + struct uks uks; }; static void bd_stream_close(stream_t *s) @@ -182,7 +182,8 @@ static int bd_get_uks(struct bd_priv *bd //This means: first string up to whitespace is discid sscanf(line, "%40s", d); for (i = 0; i < 20; ++i) { - if (sscanf(&d[i*2], "%2x", &byte) != 1) break; + if (sscanf(&d[i*2], "%2x", &byte) != 1) + break; id[i] = byte; } if (memcmp(id, discid, 20) != 0) @@ -190,10 +191,12 @@ static int bd_get_uks(struct bd_priv *bd mp_msg(MSGT_OPEN, MSGL_V, "KeyDB found Entry for DiscID:\n%s\n", line); vst = strstr(line, "| V |"); - if (vst == 0) break; + if (vst == 0) + break; sscanf(&vst[6], "%32s", d); for (i = 0; i < 16; i++) { - if (sscanf(&d[i*2], "%2x", &byte) != 1) break; + if (sscanf(&d[i*2], "%2x", &byte) != 1) + break; bd->vuk.u8[i] = byte; } vukfound = 1; @@ -224,10 +227,12 @@ static int bd_get_uks(struct bd_priv *bd j = av_aes_init(a, bd->vuk.u8, 128, 1); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BD_DISCID="); - for (j = 0; j < 20; j++) mp_msg(MSGT_IDENTIFY, MSGL_INFO, "%02x", discid[j]); + for (j = 0; j < 20; j++) + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "%02x", discid[j]); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "\n"); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BD_VUK="); - for (j = 0; j < 20; j++) mp_msg(MSGT_IDENTIFY, MSGL_INFO, "%02x", discid[j]); + for (j = 0; j < 20; j++) + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "%02x", discid[j]); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "\n"); for (i = 0; i < bd->uks.count; i++) { @@ -278,7 +283,8 @@ static off_t bd_read(struct bd_priv *bd, av_aes_init(bd->aescbc, enc_seed.u8, 128, 1); // decrypt - av_aes_crypt(bd->aescbc, &buf[16], &buf[16], (len - 16) / 16, bd->iv.u8, 1); + av_aes_crypt(bd->aescbc, &buf[16], &buf[16], + (len - 16) / 16, bd->iv.u8, 1); } bd->pos += read_len;

1 0

r31918 - trunk/mplayer.c
by reimar 03 Aug '10

03 Aug '10

Author: reimar Date: Tue Aug 3 23:06:15 2010 New Revision: 31918 Log: 100l, do not free vo_spudec if e.g. just the audio is reinitialized. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Tue Aug 3 19:09:16 2010 (r31917) +++ trunk/mplayer.c Tue Aug 3 23:06:15 2010 (r31918) @@ -664,6 +664,11 @@ void uninit_player(unsigned int mask){ #ifdef CONFIG_DVDNAV mp_dvdnav_context_free(mpctx); #endif + if (vo_spudec){ + current_module="uninit_spudec"; + spudec_free(vo_spudec); + vo_spudec=NULL; + } } // Must be after libvo uninit, as few vo drivers (svgalib) have tty code. @@ -682,12 +687,6 @@ void uninit_player(unsigned int mask){ vo_vobsub=NULL; } - if (vo_spudec){ - current_module="uninit_spudec"; - spudec_free(vo_spudec); - vo_spudec=NULL; - } - if(mask&INITIALIZED_AO){ initialized_flags&=~INITIALIZED_AO; current_module="uninit_ao";

1 0

r31913 - in trunk: etc/codecs.conf help/help_mp-en.h libao2/ao_alsa.c libmpcodecs/vd_lzo.c libmpdemux/aviheader.c libmpdemux/genres.h libvo/vo_gl2.c libvo/vo_pnm.c libvo/vo_xvmc.c libvo/x11_common....
by siretart 03 Aug '10

03 Aug '10

Author: siretart Date: Tue Aug 3 17:55:17 2010 New Revision: 31913 Log: various spelling fixes, found by the Debian QA tool 'lintian' Modified: trunk/etc/codecs.conf trunk/libao2/ao_alsa.c trunk/libmpcodecs/vd_lzo.c trunk/libmpdemux/aviheader.c trunk/libmpdemux/genres.h trunk/libvo/vo_gl2.c trunk/libvo/vo_pnm.c trunk/libvo/vo_xvmc.c trunk/libvo/x11_common.c trunk/m_option.c trunk/stream/pnm.c trunk/stream/tvi_v4l.c trunk/stream/tvi_v4l2.c trunk/vidix/mga_vid.c trunk/vidix/pci.db Changes in other areas also in this revision: Modified: trunk/help/help_mp-en.h Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/etc/codecs.conf Tue Aug 3 17:55:17 2010 (r31913) @@ -2212,7 +2212,7 @@ videocodec mwv1 out BGR24,BGR15 flip videocodec wavcvfw - info "centre for wavelets, approximation and infromation processing" + info "centre for wavelets, approximation and information processing" status working fourcc wavc driver vfw Modified: trunk/libao2/ao_alsa.c ============================================================================== --- trunk/libao2/ao_alsa.c Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/libao2/ao_alsa.c Tue Aug 3 17:55:17 2010 (r31913) @@ -62,7 +62,7 @@ static const ao_info_t info = "ALSA-0.9.x-1.x audio output", "alsa", "Alex Beregszaszi, Zsolt Barat <joy(a)streamminister.de>", - "under developement" + "under development" }; LIBAO_EXTERN(alsa) Modified: trunk/libmpcodecs/vd_lzo.c ============================================================================== --- trunk/libmpcodecs/vd_lzo.c Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/libmpcodecs/vd_lzo.c Tue Aug 3 17:55:17 2010 (r31913) @@ -122,10 +122,10 @@ static mp_image_t* decode(sh_video_t *sh if (w == 0) { priv->codec = IMGFMT_BGR24; - mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] codec choosen is BGR24\n", MOD_NAME); + mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] codec chosen is BGR24\n", MOD_NAME); } else if (w == (sh->bih->biSizeImage)/2) { priv->codec = IMGFMT_YV12; - mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] codec choosen is YV12\n", MOD_NAME); + mp_msg (MSGT_DECVIDEO, MSGL_V, "[%s] codec chosen is YV12\n", MOD_NAME); } else { priv->codec = -1; mp_msg(MSGT_DECVIDEO,MSGL_ERR,"[%s] Unsupported out_fmt\n", MOD_NAME); Modified: trunk/libmpdemux/aviheader.c ============================================================================== --- trunk/libmpdemux/aviheader.c Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/libmpdemux/aviheader.c Tue Aug 3 17:55:17 2010 (r31913) @@ -172,7 +172,7 @@ while(1){ // required to produce the file (the format depends on the hardware used). case mmioFOURCC('I','S','H','P'): hdr="Sharpness";break; // ISRC - Identifies the name of the person or organization who - // suplied the original subject of the file; for example, "Try Research." + // supplied the original subject of the file; for example, "Try Research." case mmioFOURCC('I','S','R','C'): hdr="Source";break; // ISRF - Identifies the original form of the material that was digitized, // such as "slide," "paper," "map," and so on. This is not necessarily Modified: trunk/libmpdemux/genres.h ============================================================================== --- trunk/libmpdemux/genres.h Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/libmpdemux/genres.h Tue Aug 3 17:55:17 2010 (r31913) @@ -99,7 +99,7 @@ const char * const genres[] = { "Native American", /* 64 */ "Cabaret", /* 65 */ "New Wave", /* 66 */ -"Psychadelic", /* 67 */ +"Psychedelic", /* 67 */ "Rave", /* 68 */ "Show Tunes", /* 69 */ "Trailer", /* 70 */ Modified: trunk/libvo/vo_gl2.c ============================================================================== --- trunk/libvo/vo_gl2.c Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/libvo/vo_gl2.c Tue Aug 3 17:55:17 2010 (r31913) @@ -209,7 +209,7 @@ static int initTextures(void) mp_msg (MSGT_VO, MSGL_V, "[%dx%d] !\n", texture_width, texture_height); if(texture_width < 64 || texture_height < 64) { - mp_msg (MSGT_VO, MSGL_FATAL, "[gl2] Give up .. usable texture size not avaiable, or texture config error !\n"); + mp_msg (MSGT_VO, MSGL_FATAL, "[gl2] Give up .. usable texture size not available, or texture config error !\n"); return -1; } } while (texture_width > 1 && texture_height > 1); Modified: trunk/libvo/vo_pnm.c ============================================================================== --- trunk/libvo/vo_pnm.c Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/libvo/vo_pnm.c Tue Aug 3 17:55:17 2010 (r31913) @@ -441,7 +441,7 @@ static void pnm_write_image(mp_image_t * FILE *outfile; if (!mpi) { - mp_msg(MSGT_VO, MSGL_ERR, "%s: No image data suplied to video output driver\n", info.short_name ); + mp_msg(MSGT_VO, MSGL_ERR, "%s: No image data supplied to video output driver\n", info.short_name ); exit_player(EXIT_ERROR); } Modified: trunk/libvo/vo_xvmc.c ============================================================================== --- trunk/libvo/vo_xvmc.c Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/libvo/vo_xvmc.c Tue Aug 3 17:55:17 2010 (r31913) @@ -298,7 +298,7 @@ static int xvmc_find_surface_by_format(i /* check if adaptor number has been specified */ if (xv_adaptor != -1 && xv_adaptor != i) continue; - mp_msg(MSGT_VO,MSGL_DBG3,"vo_xvmc: Quering adaptor #%d\n",i); + mp_msg(MSGT_VO,MSGL_DBG3,"vo_xvmc: Querying adaptor #%d\n",i); if( ai[i].type == 0 ) continue;// we need at least dummy type! //probing ports for(p=ai[i].base_id; p<ai[i].base_id+ai[i].num_ports; p++) @@ -1071,7 +1071,7 @@ static int query_format(uint32_t format) mp_msg(MSGT_VO,MSGL_DBG4,"vo_xvmc: query_format=%X\n",format); if(!IMGFMT_IS_XVMC(format)) return 0;// no caps supported - mode_id = xvmc_find_surface_by_format(format, 16, 16, &qsurface_info, 1);//true=1 - quering + mode_id = xvmc_find_surface_by_format(format, 16, 16, &qsurface_info, 1);//true=1 - querying if( mode_id == 0 ) return 0; @@ -1151,7 +1151,7 @@ static void check_osd_source(struct xvmc //If this is source surface, check does the OSD rendering is compleate if(src_rndr->state & AV_XVMC_STATE_OSD_SOURCE){ - mp_msg(MSGT_VO,MSGL_DBG4,"vo_xvmc: OSD surface=%p quering\n",src_rndr); + mp_msg(MSGT_VO,MSGL_DBG4,"vo_xvmc: OSD surface=%p querying\n",src_rndr); osd_rndr = src_rndr->p_osd_target_surface_render; XvMCGetSurfaceStatus(mDisplay, osd_rndr->p_surface, &stat); if(!(stat & XVMC_RENDERING)) Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/libvo/x11_common.c Tue Aug 3 17:55:17 2010 (r31913) @@ -248,7 +248,7 @@ void fstype_help(void) mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "below", "use _NETWM_STATE_BELOW hint if available"); mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "fullscreen", - "use _NETWM_STATE_FULLSCREEN hint if availale"); + "use _NETWM_STATE_FULLSCREEN hint if available"); mp_msg(MSGT_VO, MSGL_INFO, " %-15s %s\n", "stays_on_top", "use _NETWM_STATE_STAYS_ON_TOP hint if available"); mp_msg(MSGT_VO, MSGL_INFO, Modified: trunk/m_option.c ============================================================================== --- trunk/m_option.c Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/m_option.c Tue Aug 3 17:55:17 2010 (r31913) @@ -282,7 +282,7 @@ static char* print_double(const m_option const m_option_type_t m_option_type_double = { "Double", - "double precission floating point number or ratio (numerator[:/]denominator)", + "double precision floating point number or ratio (numerator[:/]denominator)", sizeof(double), 0, parse_double, Modified: trunk/stream/pnm.c ============================================================================== --- trunk/stream/pnm.c Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/stream/pnm.c Tue Aug 3 17:55:17 2010 (r31913) @@ -378,7 +378,7 @@ static int pnm_get_chunk(pnm_t *p, case MDPR_TAG: case CONT_TAG: if (chunk_size > max || chunk_size < PREAMBLE_SIZE) { - mp_msg(MSGT_OPEN, MSGL_ERR, "error: max chunk size exceded (max was 0x%04x)\n", max); + mp_msg(MSGT_OPEN, MSGL_ERR, "error: max chunk size exceeded (max was 0x%04x)\n", max); #ifdef LOG n=rm_read (p->s, &data[PREAMBLE_SIZE], 0x100 - PREAMBLE_SIZE); hexdump(data,n+PREAMBLE_SIZE); Modified: trunk/stream/tvi_v4l.c ============================================================================== --- trunk/stream/tvi_v4l.c Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/stream/tvi_v4l.c Tue Aug 3 17:55:17 2010 (r31913) @@ -496,14 +496,14 @@ static int init(priv_t *priv) /* get capabilities (priv->capability is needed!) */ if (ioctl(priv->video_fd, VIDIOCGCAP, &priv->capability) == -1) { - mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilites failed: %s\n", strerror(errno)); + mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilities failed: %s\n", strerror(errno)); goto err; } fcntl(priv->video_fd, F_SETFD, FD_CLOEXEC); mp_msg(MSGT_TV, MSGL_INFO, "Selected device: %s\n", priv->capability.name); - mp_msg(MSGT_TV, MSGL_INFO, " Capabilites: "); + mp_msg(MSGT_TV, MSGL_INFO, " Capabilities: "); for (i = 0; device_cap2name[i] != NULL; i++) if (priv->capability.type & (1 << i)) mp_msg(MSGT_TV, MSGL_INFO, "%s ", device_cap2name[i]); @@ -810,7 +810,7 @@ static int vbi_init(priv_t* priv,char* d } if(ioctl(vbi_fd,VIDIOCGCAP,&cap)<0){ - mp_msg(MSGT_TV,MSGL_ERR,"vbi: Query capatibilities failed for %s\n",priv->vbi_dev); + mp_msg(MSGT_TV,MSGL_ERR,"vbi: Query capabilities failed for %s\n",priv->vbi_dev); close(vbi_fd); return TVI_CONTROL_FALSE; } @@ -1397,7 +1397,7 @@ static int control(priv_t *priv, int cmd } if (ioctl(priv->video_fd, VIDIOCGCAP, &priv->capability) == -1) { - mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilites failed: %s\n", strerror(errno)); + mp_msg(MSGT_TV, MSGL_ERR, "ioctl get capabilities failed: %s\n", strerror(errno)); return TVI_CONTROL_FALSE; } Modified: trunk/stream/tvi_v4l2.c ============================================================================== --- trunk/stream/tvi_v4l2.c Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/stream/tvi_v4l2.c Tue Aug 3 17:55:17 2010 (r31913) @@ -609,7 +609,7 @@ static int vbi_init(priv_t* priv,char* d } if(ioctl(vbi_fd,VIDIOC_QUERYCAP,&cap)<0){ - mp_msg(MSGT_TV,MSGL_ERR,"vbi: Query capatibilities failed for %s\n",priv->vbi_dev); + mp_msg(MSGT_TV,MSGL_ERR,"vbi: Query capabilities failed for %s\n",priv->vbi_dev); close(vbi_fd); return TVI_CONTROL_FALSE; } @@ -1263,7 +1263,7 @@ static int init(priv_t *priv) (priv->tuner.rxsubchans & V4L2_TUNER_SUB_LANG1) ? " LANG1" : "", (priv->tuner.rxsubchans & V4L2_TUNER_SUB_LANG2) ? " LANG2" : ""); } - mp_msg(MSGT_TV, MSGL_INFO, " Capabilites:%s%s%s%s%s%s%s%s%s%s%s\n", + mp_msg(MSGT_TV, MSGL_INFO, " Capabilities:%s%s%s%s%s%s%s%s%s%s%s\n", priv->capability.capabilities & V4L2_CAP_VIDEO_CAPTURE? " video capture": "", priv->capability.capabilities & V4L2_CAP_VIDEO_OUTPUT? Modified: trunk/vidix/mga_vid.c ============================================================================== --- trunk/vidix/mga_vid.c Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/vidix/mga_vid.c Tue Aug 3 17:55:17 2010 (r31913) @@ -1149,7 +1149,7 @@ card_found: probed = 1; memcpy(&pci_info, &lst[i], sizeof(pciinfo_t)); - mga_cap.device_id = pci_info.device; /* set device id in capabilites */ + mga_cap.device_id = pci_info.device; /* set device id in capabilities */ return 0; } Modified: trunk/vidix/pci.db ============================================================================== --- trunk/vidix/pci.db Tue Aug 3 15:02:07 2010 (r31912) +++ trunk/vidix/pci.db Tue Aug 3 17:55:17 2010 (r31913) @@ -6067,7 +6067,7 @@ v 1137 Cisco Systems Inc 0 v 1138 Ziatech Corporation 0 d 11388905 8905 [STD 32 Bridge] 0 v 1139 Dynamic Pictures, Inc 0 -d 11390001 VGA Compatable 3D Graphics 0 +d 11390001 VGA Compatible 3D Graphics 0 v 113a FWB Inc 0 v 113b Network Computing Devices 0 v 113c Cyclone Microsystems, Inc. 0 @@ -9437,9 +9437,9 @@ d 14f20122 EV1000 Serial port 0 d 14f20123 EV1000 Keyboard controller 0 d 14f20124 EV1000 Mouse controller 0 v 14f3 BroadLogic 0 -d 14f32030 2030 DVB-S Satellite Reciever 0 -d 14f32050 2050 DVB-T Terrestrial (Cable) Reciever 0 -d 14f32060 2060 ATSC Terrestrial (Cable) Reciever 0 +d 14f32030 2030 DVB-S Satellite Receiver 0 +d 14f32050 2050 DVB-T Terrestrial (Cable) Receiver 0 +d 14f32060 2060 ATSC Terrestrial (Cable) Receiver 0 v 14f4 TOKYO Electronic Industry CO Ltd 0 v 14f5 SOPAC Ltd 0 v 14f6 COYOTE Technologies LLC 0 @@ -12580,7 +12580,7 @@ v 8401 TRENDware International Inc. 0 v 8686 ScaleMP 0 d 86861010 vSMPowered system controller [vSMP CTL] 0 v 8800 Trigem Computer Inc. 0 -d 88002008 Video assistent component 0 +d 88002008 Video assistant component 0 v 8866 T-Square Design Inc. 0 v 8888 Silicon Magic 0 v 8912 TRX 0

3 2

r31917 - trunk/mpcommon.c
by reimar 03 Aug '10

03 Aug '10

Author: reimar Date: Tue Aug 3 19:09:16 2010 New Revision: 31917 Log: Move initialization of vo_spudec further behind to avoid issues with PGS subtitles being scaled incorrectly. Modified: trunk/mpcommon.c Modified: trunk/mpcommon.c ============================================================================== --- trunk/mpcommon.c Tue Aug 3 19:01:13 2010 (r31916) +++ trunk/mpcommon.c Tue Aug 3 19:09:16 2010 (r31917) @@ -133,8 +133,6 @@ void update_subtitles(sh_video_t *sh_vid if (vo_config_count && (vobsub_id >= 0 || type == 'v')) { int timestamp; - if (!vo_spudec) - vo_spudec = spudec_new(NULL); current_module = "spudec"; /* Get a sub packet from the DVD or a vobsub */ while(1) { @@ -167,6 +165,12 @@ void update_subtitles(sh_video_t *sh_vid } } if (len<=0 || !packet) break; + // create it only here, since with some broken demuxers we might + // type = v but no DVD sub and we currently do not change the + // "original frame size" ever after init, leading to wrong-sized + // PGS subtitles. + if (!vo_spudec) + vo_spudec = spudec_new(NULL); if (vo_vobsub || timestamp >= 0) spudec_assemble(vo_spudec, packet, len, timestamp); }

1 0

r31916 - trunk/mplayer.c
by reimar 03 Aug '10

03 Aug '10

Author: reimar Date: Tue Aug 3 19:01:13 2010 New Revision: 31916 Log: Remove useless cast. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Tue Aug 3 18:26:50 2010 (r31915) +++ trunk/mplayer.c Tue Aug 3 19:01:13 2010 (r31916) @@ -1187,7 +1187,7 @@ void init_vo_spudec(void) { #endif if (vo_spudec==NULL) { - sh_sub_t *sh = (sh_sub_t *)mpctx->d_sub->sh; + sh_sub_t *sh = mpctx->d_sub->sh; current_module="spudec_init_normal"; vo_spudec=spudec_new_scaled(NULL, mpctx->sh_video->disp_w, mpctx->sh_video->disp_h, sh->extradata, sh->extradata_len); spudec_set_font_factor(vo_spudec,font_factor);

1 0

r31914 - in trunk/stream: cache2.c stream.h
by reimar 03 Aug '10

03 Aug '10

Author: reimar Date: Tue Aug 3 18:01:40 2010 New Revision: 31914 Log: Add sanity-check for sector size to avoid strange crashes if it is too large. Modified: trunk/stream/cache2.c trunk/stream/stream.h Modified: trunk/stream/cache2.c ============================================================================== --- trunk/stream/cache2.c Tue Aug 3 17:55:17 2010 (r31913) +++ trunk/stream/cache2.c Tue Aug 3 18:01:40 2010 (r31914) @@ -498,13 +498,19 @@ static void *ThreadProc( void *s ){ int cache_stream_fill_buffer(stream_t *s){ int len; + int sector_size; if(!s->cache_pid) return stream_fill_buffer(s); // cache_stats(s->cache_data); if(s->pos!=((cache_vars_t*)s->cache_data)->read_filepos) mp_msg(MSGT_CACHE,MSGL_ERR,"!!! read_filepos differs!!! report this bug...\n"); + sector_size = ((cache_vars_t*)s->cache_data)->sector_size; + if (sector_size > STREAM_MAX_SECTOR_SIZE) { + mp_msg(MSGT_CACHE, MSGL_ERR, "Sector size %i larger than maximum %i\n", sector_size, STREAM_MAX_SECTOR_SIZE); + sector_size = STREAM_MAX_SECTOR_SIZE; + } - len=cache_read(s->cache_data,s->buffer, ((cache_vars_t*)s->cache_data)->sector_size); + len=cache_read(s->cache_data,s->buffer, sector_size); //printf("cache_stream_fill_buffer->read -> %d\n",len); if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } Modified: trunk/stream/stream.h ============================================================================== --- trunk/stream/stream.h Tue Aug 3 17:55:17 2010 (r31913) +++ trunk/stream/stream.h Tue Aug 3 18:01:40 2010 (r31914) @@ -54,6 +54,7 @@ #define STREAMTYPE_BLURAY 20 #define STREAM_BUFFER_SIZE 2048 +#define STREAM_MAX_SECTOR_SIZE (8*1024) #define VCD_SECTOR_SIZE 2352 #define VCD_SECTOR_OFFS 24 @@ -162,7 +163,7 @@ typedef struct stream { #ifdef CONFIG_NETWORKING streaming_ctrl_t *streaming_ctrl; #endif - unsigned char buffer[STREAM_BUFFER_SIZE>VCD_SECTOR_SIZE?STREAM_BUFFER_SIZE:VCD_SECTOR_SIZE]; + unsigned char buffer[STREAM_BUFFER_SIZE>STREAM_MAX_SECTOR_SIZE?STREAM_BUFFER_SIZE:STREAM_MAX_SECTOR_SIZE]; } stream_t; #ifdef CONFIG_NETWORKING

1 0

r31912 - in trunk: DOCS/tech/MAINTAINERS README debian debian/all-lang-config-mak.sh debian/clean debian/compat debian/control debian/copyright debian/daily-build.sh debian/mplayer-dbg.links debian...
by siretart 03 Aug '10

03 Aug '10

Author: siretart Date: Tue Aug 3 15:02:07 2010 New Revision: 31912 Log: Add new debian packaging based on official distro packages Added: trunk/debian/ (props changed) trunk/debian/all-lang-config-mak.sh (contents, props changed) trunk/debian/clean trunk/debian/compat trunk/debian/control trunk/debian/copyright trunk/debian/daily-build.sh (contents, props changed) trunk/debian/mplayer-dbg.links trunk/debian/mplayer-doc.doc-base.cs trunk/debian/mplayer-doc.doc-base.de trunk/debian/mplayer-doc.doc-base.en trunk/debian/mplayer-doc.doc-base.es trunk/debian/mplayer-doc.doc-base.fr trunk/debian/mplayer-doc.doc-base.hu trunk/debian/mplayer-doc.doc-base.pl trunk/debian/mplayer-doc.doc-base.ru trunk/debian/mplayer-doc.docs trunk/debian/mplayer-gui.menu trunk/debian/mplayer-gui.mime trunk/debian/mplayer.conf trunk/debian/mplayer.examples trunk/debian/mplayer.install trunk/debian/mplayer.mime trunk/debian/mplayer.preinst trunk/debian/prefs/ trunk/debian/prefs/MD5SUMS trunk/debian/prefs/codecs_list trunk/debian/prefs/mirrors trunk/debian/rules (contents, props changed) trunk/debian/source/ trunk/debian/source/format Modified: trunk/DOCS/tech/MAINTAINERS trunk/README Modified: trunk/DOCS/tech/MAINTAINERS ============================================================================== --- trunk/DOCS/tech/MAINTAINERS Tue Aug 3 14:32:17 2010 (r31911) +++ trunk/DOCS/tech/MAINTAINERS Tue Aug 3 15:02:07 2010 (r31912) @@ -58,7 +58,7 @@ Documentation translations: * Russian: Vladimir Voroshilov Platforms/ports: - * Debian packaging: Diego Biurrun + * Debian/Ubuntu packaging: Reinhard Tartler, Diego Biurrun * Red Hat/RPM packaging: Dominik Mierzejewski * FreeBSD: Vladimir Kushnir, Nexus * BSD/OS: Steven Schultz Modified: trunk/README ============================================================================== --- trunk/README Tue Aug 3 14:32:17 2010 (r31911) +++ trunk/README Tue Aug 3 15:02:07 2010 (r31912) @@ -133,22 +133,15 @@ Sometimes running 'ldconfig' is enough t NOTE: If you run Debian you can configure, compile and build a proper Debian .deb package with only one command: - fakeroot debian/rules binary - -If you want to pass custom options to configure, you can set up the -DEB_BUILD_OPTIONS environment variable. For instance, if you want GUI -and OSD menu support you would use: - - DEB_BUILD_OPTIONS="--enable-gui --enable-menu" fakeroot debian/rules binary - -You can also pass some variables to the Makefile. For example, if you want -to compile with gcc 3.4 even if it's not the default compiler: + debian/daily-build.sh -b - CC=gcc-3.4 DEB_BUILD_OPTIONS="--enable-gui" fakeroot debian/rules binary +If you want to modify options to configure, please adjust the file +debian/rules to your needs. To clean up the source tree run the following command: fakeroot debian/rules clean + rm debian/changelog ______________________________________ STEP4: Choose an onscreen display font Added: trunk/debian/all-lang-config-mak.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/all-lang-config-mak.sh Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,9 @@ +#!/bin/sh + +# hack to avoid having to configure mplayer just for building the +# xml documentation + +doc_lang_all=`echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/$..$/:\1:g" -e "s:DOCS/xml/$.._..$/:\1:g"` + +echo "DOC_LANG_ALL = ${doc_lang_all}" +echo "DOC_LANGS = ${doc_lang_all}" Added: trunk/debian/clean ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/clean Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,7 @@ +debian/postrm +debian/menu +debian/TODO.Debian +debian/templates +debian/mime +debian/config +debian/dirs Added: trunk/debian/compat ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/compat Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1 @@ +7 Added: trunk/debian/control ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/control Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,170 @@ +Source: mplayer +Section: video +Priority: optional +Maintainer: The Mplayer Developers <mplayer-dev-eng(a)mplayerhq.hu> +DM-Upload-Allowed: yes +Standards-Version: 3.9.1 +Homepage: http://www.mplayerhq.hu/ +Build-Depends: debhelper (>= 7), + docbook-xml, + docbook-xsl, + ladspa-sdk, + libenca-dev, + libaa1-dev, + libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libaudio-dev, + libcaca-dev, + libcdparanoia-dev | libcdparanoia0-dev, + libdirectfb-dev, + libdts-dev, + libesd0-dev, + libfaad-dev, + libfontconfig1-dev, + libfreetype6-dev, + libfribidi-dev, + libgif-dev, + libgl1-mesa-dev, + libgtk2.0-dev, + libjack-dev, + libjpeg62-dev, + liblircclient-dev, + liblivemedia-dev, + liblzo2-dev, + libmp3lame-dev, + libmpcdec-dev, + libncurses5-dev, + libopenal-dev, + libpng12-dev | libpng-dev, + libpulse-dev, + libschroedinger-dev, + libsdl1.2-dev | libsdl1.1-dev, + libsmbclient-dev, + libspeex-dev, + libsvga1-dev [i386 amd64], + libswscale-dev, + libtheora-dev (>= 1.0~beta1), + libvorbis-dev, + libvorbisidec-dev, + libx11-dev, + libx264-dev (>= 2:0.85.1442), + libxext-dev, + libxinerama-dev, + libxv-dev, + libxvidcore-dev, + libxvmc-dev, + libxxf86dga-dev, + libxxf86vm-dev, + libvdpau-dev [i386 amd64], + pkg-config, + vstream-client-dev, + x11proto-core-dev, + xsltproc, + zlib1g-dev + +Package: mplayer-gui +Architecture: any +Suggests: mplayer-doc, + ttf-freefont, + bzip2, + fontconfig +Depends: mplayer-skin, + mplayer, + ${shlibs:Depends}, + ${misc:Depends} +Replaces: mplayer-doc (<< 2:1.0~rc3+svn20090426-2), + mplayer (<< 2:1.0~rc3+svn20090426-2) +Description: movie player for Unix-like systems + MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO, + ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files, + supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can + also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies. + . + Another big feature of MPlayer is the wide range of supported output + drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, + DirectFB, but also SDL (plus all its drivers) and some + low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64 + and Permedia3). Most of them support software or hardware scaling, + therefore allowing fullscreen display. MPlayer is also able + to use some hardware MPEG decoder boards, such as the DVB + and DXR3/Hollywood+. + . + This package includes the gui variant of mplayer. + +Package: mencoder +Architecture: any +Suggests: mplayer-doc, + ttf-freefont, + bzip2, + fontconfig +Depends: mplayer, + ${shlibs:Depends}, + ${misc:Depends} +Description: MPlayer's Movie Encoder + MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO, + ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files, + supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can + also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies. + . + This package contains menconder, a simple movie encoder, designed to + encode MPlayer-playable movies + (AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET) to other + MPlayer-playable formats. It can encode with various codecs, like DivX4 + (1 or 2 passes), libavcodec, PCM/MP3/VBRMP3 audio. Also has stream + copying and video resizing abilities. + +Package: mplayer +Architecture: any +Suggests: mplayer-doc, + ttf-freefont, + netselect | fping, + bzip2, + fontconfig +Depends: ${shlibs:Depends}, + ${misc:Depends} +Replaces: mplayer-doc (<< 2:1.0~rc3+svn20090426-2), + mplayer-nogui (<< 2:1.0~rc3+svn20090426-2), + mencoder (<< 2:1.0~rc3+svn20090426-2) +Description: movie player for Unix-like systems + MPlayer plays most MPEG, VOB, AVI, Ogg/OGM, VIVO, + ASF/WMA/WMV, QT/MOV/MP4, FLI, RM, NuppelVideo, yuv4mpeg, FILM, RoQ, PVA files, + supported by many native, XAnim, RealPlayer, and Win32 DLL codecs. It can + also play VideoCD, SVCD, DVD, 3ivx, RealMedia, and DivX movies. + . + Another big feature of MPlayer is the wide range of supported output + drivers. It works with X11, Xv, DGA, OpenGL, SVGAlib, fbdev, + DirectFB, but also SDL (plus all its drivers) and some + low level card-specific drivers (for Matrox, 3Dfx and Radeon, Mach64 + and Permedia3). Most of them support software or hardware scaling, + therefore allowing fullscreen display. MPlayer is also able + to use some hardware MPEG decoder boards, such as the DVB + and DXR3/Hollywood+. + . + Not all of the upstream code is distributed in the source tarball. + See the README.Debian and copyright files for details. + +Package: mplayer-dbg +Architecture: any +Section: debug +Priority: extra +Depends: mplayer, + ${misc:Depends} +Recommends: ffmpeg-dbg +Description: debugging symbols for MPlayer + This package contains the debugging symbols for MPlayer, a movie + player for Unix-like systems. + . + You only need these if you want to generate usefule debugging + backtraces. + +Package: mplayer-doc +Architecture: all +Section: doc +Recommends: mplayer +Depends: ${misc:Depends} +Replaces: mplayer (<< 2:1.0~rc3+svn20090426-1) +Description: documentation for MPlayer + This package contains the HTML documentation for MPlayer, a movie player for + Unix-like systems. It is available in several languages. + . + You only need this package if you want to read the mplayer manual. The manpages + are included in the regular mplayer package. Added: trunk/debian/copyright ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/copyright Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,835 @@ +----- Debian package + +This package was first debianized by * TeLeNiEkO * telenieko(a)telenieko.com on +Mon, 26 Feb 2001 12:24:04 +0100. + +The current Debian Mantainer is: Dariush Pietrzak <eyck(a)ghost.anime.pl> +sponsored by: A Mennucci <mennucc1(a)debian.org> + +Dariush Pietrzak and A Mennucci hold copyright (c) on the Debian +packaging, that is available under the terms of GNU GPL v2 (see below +for header). + +Original source can be found at: http://www.mplayerhq.hu/ +but (!) the orig.tar.gz contained in Debian is not the +upstream one. See README.Debian for details. + +MPlayer was originally written by Árpád Gereöffy and has been extended and +worked on by many more since then; see the AUTHORS file for an (incomplete) +list. + +----- Copyright of MPlayer + +MPlayer is nowadays copyrighted by the MPlayer team ; +this copyright applies to code written specifically for MPlayer +(see (*) below for the list exceptions). + +----- License of MPlayer + +MPlayer is licensed under the terms of GNU GPL v2 ;the licence header is: + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General Public +License, version 2, can be found in /usr/share/common-licenses/GPL-2. + +This license applies to code written specifically for MPlayer; +(see (*) below for the list exceptions). + +---- (*) Other License and Copyright + +MPlayer includes code from several external sources; this is shipped +in subdirectories; (summarized) copyrights and licenses are as follows: + +Name: FFmpeg +Version: CVS snapshot +Homepage: http://www.ffmpeg.org +Directory: libavcodec, libavformat, libavutil, libpostproc +Copyright (c) The ffmpeg Project + (see individual files for other copyrights) +License: GNU Lesser General Public License, some parts GNU General Public + License, GNU General Public License when combined + +Name: FAAD2 +Version: 2.1 beta (20040915 CVS snapshot) + fixes and portability patches +Homepage: http://www.audiocoding.com +Directory: libfaad2 +Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com +License: GNU General Public License + +Name: GSM 06.10 library +Version: patchlevel 10 +Homepage: http://kbs.cs.tu-berlin.de/~jutta/toast.html +Copyright 1992 by Jutta Degener and Carsten Bormann, Technische Universitaet Berlin +Directory: libmpcodecs/native/ +License: + Any use of this software is permitted provided that this notice is + not removed and that neither the authors nor the Technische + Universitaet Berlin are deemed to have made any representations as to + the suitability of this software for any purpose nor are held + responsible for any defects of this software. THERE IS ABSOLUTELY NO + WARRANTY FOR THIS SOFTWARE. + As a matter of courtesy, the authors request to be informed about + uses this software has found, about bugs in this software, and about + any improvements that may be of general interest. + . + As of the libgsm debian package version 1.0.13-1, the following + copyright addition has been made to the libgsm package: + . + Since the original terms of 15 years ago maybe do not make our + intentions completely clear given today's refined usage of the legal + terms, we append this additional permission: + . + Permission to use, copy, modify, and distribute this software + for any purpose with or without fee is hereby granted, + provided that this notice is not removed and that neither + the authors nor the Technische Universitaet Berlin are + deemed to have made any representations as to the suitability + of this software for any purpose nor are held responsible + for any defects of this software. THERE IS ABSOLUTELY NO + WARRANTY FOR THIS SOFTWARE. + . + Berkeley/Bremen, 05.04.2009 + Jutta Degener + Carsten Bormann + +Name: miniLZO +Version: 1.07 +Homepage: http://www.oberhumer.com/opensource/lzo/#minilzo +File: libmpcodecs/native/minilzo.c libmpcodecs/native/minilzo.h +Copyright (C) 1996-2000 Markus Franz Xaver Johannes Oberhumer +License: GNU General Public License + +Name: liba52 +Version: 0.7.4 + patches +Homepage: http://liba52.sourceforge.net/ +Directory: liba52 +Copyright (C) 2000-2001 Michel Lespinasse <walken(a)zoy.org> +Copyright (C) 1999-2000 Aaron Holtzman <aholtzma(a)ess.engr.uvic.ca> +License: GNU General Public License + +Name: libmpeg2 +Version: 0.4.0b + patches +Homepage: http://libmpeg2.sourceforge.net/ +Directory: libmpeg2 +Copyright (C) 2000-2003 Michel Lespinasse <walken(a)zoy.org> +Copyright (C) 1999-2000 Aaron Holtzman <aholtzma(a)ess.engr.uvic.ca> +Copyright (C) 2003 David S. Miller <davem(a)redhat.com> +Copyright (c) 2002-2003 Falk Hueffner <falk(a)debian.org> +License: GNU General Public License + +Name: mpg123 +Version: 0.59s + significant changes +Homepage: http://www.mpg123.de/ +Directory: mp3lib +Copyright (c) 1995 by Michael Hipp +License: GNU General Public License + +Name: Tremor +Version: 1.0 + parts CVS from December 2004 + patches +Homepage: http://xiph.org/ +Directory: tremor +Copyright (c) 2002, Xiph.org Foundation +License: BSD-like: + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + - Neither the name of the Xiph.org Foundation nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION + OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Name: avifile DLL loader +Version: 0.47 + patches + CVS updates +Homepage: http://avifile.sourceforge.net/ +Directory: loader/ +Copyright 1995 Alexandre Julliard +Copyright 1994 Eric Youndale & Erik Bos +Copyright 1996-98 Marcus Meissner +Copyright 1995 Thomas Sandford +Copyright 1996 Martin von Loewis +Copyright 1993 Robert J. Amstadt +Copyright 1995-1996 Alexandre Julliard +Copyright 2000-2001 Eugene Kuznetsov (divx(a)euro.ru) +License: GNU General Public License + +Name: dvbstream +Version: 0.4.3-pre3 (cvs checkout) +Homepage: http://www.linuxstb.org/dvbstream/ + now at http://prdownloads.sourceforge.net/dvbtools/ +File: libmpdemux/dvbin.h libmpdemux/dvbin.c libmpdemux/rtp.h +Copyright (C) 2002 the xine project +License: GNU General Public License + +Name: librtsp +Version: xine CVS 2003/04/10 + patches +Homepage: http://www.xinehq.de +Directory: stream/librtsp/ +Copyright (C) 2000-2002 the xine project +License: GNU General Public License + +Name: realrtsp +Version: xine CVS 2003/04/17 + patches +Homepage: http://www.xinehq.de +Directory: stream/realrtsp/ +Copyright (C) 2000-2002 the xine project +License: GNU General Public License + +Name: id3edit +Version: 1.9 + patches +Homepage: http://id3edit.sourceforge.net/ +Directory: libmpdemux/genres.h +Copyright (C) 2001 Jason Carter +License: GNU General Public License + +Name: matroxset +Version: 0.3 +Homepage: ftp://platan.vc.cvut.cz/pub/linux/matrox-latest/ +Directory: TOOLS/TVout/matroxset/ +License: GNU General Public License + +Name: unrarlib +Version: 0.4.0 + patches +Homepage: http://www.unrarlib.org/ +File: unrarlib.[ch] +Copyright (C) 2000-2002 by Christian Scheurer (www.ChristianScheurer.ch) + UNIX port copyright (c) 2000-2002 by Johannes Winkelmann (jw(a)tks6.net) +License: GNU General Public License / UniquE RAR File Library License + +Name: uCIFS library +Version: development files as of september 2004 +Homepage: http://ubiqx.org/libcifs/ +Directory: libvo/md5sum.[ch] +License: GNU Lesser General Public License + +Name: FreeSDP +Version: 0.4.1 +Homepage: https://savannah.nongnu.org/projects/freesdp/ +Directory: stream/freesdp/ +Copyright (C) 2001,2002,2003 Federico Montesino Pouzols <fedemp(a)suidzer0.org> +License: GNU General Public License + +--- libmpdemux +libmpdemux is itself a collection of code from different sources + +File: libmpdemux/pnm.c libmpdemux/pnm.h +Copyright (C) 2000-2002 the xine project +License: GNU General Public License + +File: libmpdemux/demux_avs.c libmpdemux/demux_avs.h +Copyright (c) 2005 Gianluigi Tiesi <sherpya(a)netfarm.it> +Copyright 2003 Kevin Atkinson +License: GNU General Public License + + +Name: lavtools +File: libmpdemux/yuv4mpeg.h +Home: mjpeg.sourceforge.net +Copyright (C) 2001 Matthew J. Marjanovic <maddog(a)mir.com> +License: GNU General Public License + + +Name: XMMS - Cross-platform multimedia player +File: libmpdemux/demux_xmms_plugin.h +Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies +License: + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. 2. + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + +--- TOOLS + +In the TOOLS directory you can find some nice scripts and code that +makes using MPlayer and MEncoder easier, for example scripts for DVD +track encoding in three pass mode or creating SVCDs from a movie. + +MPlayer scripts in the TOOLS dir +-------------------------------- + +edgedetect.fp, emboss.fp + +Author: Reimar Döffinger + +Description: Examples of custom fragment program for OpenGL video out driver + +Usage: mplayer -vo gl:yuv=4:customprog=edgedetect.fp + + +midentify.sh + +Author: Tobias Diedrich + +Description: Runs 'mplayer -identify' for all arguments while preventing + video window flashing. + +Usage: midentify.sh file1 [file2 ...] + + +mpconsole.sh + +Author: Rich Felker + +Description: Script to run MPlayer on the console (fbdev/mga_vid/etc.) without + the console text and/or flashing cursor getting in the way. + +Usage: mpconsole.sh [mplayer options] + + +mplmult.sh + +Author: Reimar Döffinger + +Description: Example how to output video on multiple windows in sync. Might + be even more useful in combination with -vo ggi to distribute + the video arbitrarily. + +Usage: mplmult.sh <n> <options> + n Number of MPlayer instances that display the video. + options Any options you would pass to MPlayer, more than + one file will usually not work. + + +subsearch.sh + +Author: Alex Beregszaszi + +Description: Collects subtitle files from the directory given as argument + ('.' if none is given) and its subdirectories and prints + them as a comma separated list to stdout. + +Usage: subsearch.sh [directory] + mplayer -sub `subsearch.sh` movie + + +wma2ogg.pl + +Author: Peter Simon + +Description: Converts WMA files to Ogg or MP3. + +Usage: wma2ogg [options] <-f FILE1 | -f FILE2 ... | -a> + -f, -file filename + -a converts all WMA files in the current directory + -t output filetype (ogg, mp3) [default=ogg] + -lame I wanna use L.A.M.E. sure enough! + -br bitrate (kb/s) [default=from the WMA] + -del remove WMA file(s) after the transcoding + + + +MEncoder scripts in the TOOLS dir +--------------------------------- + +divx2svcd.sh + +Author: Miklos Vajna + +Description: A simple utility that creates an SVCD from a video in an AVI + container. + +Usage: divx2svcd.sh <input_avi> [options] + see 'divx2svcd.sh -h' for more info + + +mencvcd.sh + +Author: Jürgen Hammelmann + +Description: Converts DVD (or anything else that MPlayer plays) to (S)VCD + +Usage: mencvcd.sh <basename> [mencvcd.sh options] [mplayer options] + see 'mencvcd.sh -h' for more info + +Note: Requires MPlayer, mjpegtools, VCDImager, cdrdao, and optionally + LAME, tooLAME and SoX. + + +dvd2divxscript.pl + +Author: Florian Schilhabel + +Description: Yet another DVD to divx helper script. + This script encodes a DVD track in three pass mode to MPEG-4 with + libavcodec. Optionally it writes the resulting movie file to + CD-ROM the corresponding audio track to MP3. It can also shut + down the computer when it finishes. If you like, you can + watch the MEncoder output on /dev/tty8. + +Usage: --help show help + --abr (AudioBitRate) Please enter the desired bitrate this + can be either [96|128|192] kbit/sec (default: 128). + --lang Specify the Language of the audio track this can be + for example <en> or <de> (default: <de>). + --dvd Specify the DVD track you want to encode. + --cdsize Specify the size of your CD-ROM (default: 700MB). + --shutdown Shutdown the system, when the encoding process has + finished. Needs appropriate privileges. + --out Specify the name of your encoded movie. The file + extension will be appended automatically. + --writecd Takes the newly created movie and writes it to a + CD-ROM. + --writedev cdrecord device identifier, for example 0,1,0 + --speed writing speed (default: 4) + --dvd-device device to pull the video off (default: /dev/dvd) + + +aconvert.sh + +Author: Jonas Jermann + +Description: A hack to allow MEncoder to read respectively encode from audio + only files. + +Usage: aconvert.sh <"input file"> <"output file"> <"options"> + If no options are specified the following is assumed: + -oac lavc -lavcopts acodec=mp3:abitrate=192 + +Note: The script is probably bash dependent and it's just a quick + hack, feel free to improve it (or much better: fix MEncoder ;). + + + +qepdvcd.sh + +Author: Reynaldo H. Verdejo Pinochet + +Description: converter from any supported format to VCD/SVCD PAL/NTSC + +Usage: qepdvcd.sh file <options> + Run with no arguments to see the list of options. + +Note: You will need vcdimager/cdrecord to master/burn the resulting + files. + + + +Tech scripts in the TOOLS dir +----------------------------- + +calcbpp.pl + +Author: Moritz Bunkus + +Description: A script that calculates the $bpp for a movie, mentioned in + DOCS/tech/encoding-tips.txt, see that document for more info. + +Usage: calcbpp.pl <resolution> <aspect ratio> <bitrate> <fps> + resolution: the cropped but unscaled resolution + (use '-vf cropdetect') + aspect ratio: the encoded aspect ratio. All DVDs come at + 720x576 but contain a flag that tells the player + wether it should display the DVD at an aspect + ratio of 4/3 (1.333) or at 16/9 (1.777). Have a + look at MPlayer's output - there's something + about 'prescaling'. That's what you are looking + for. + bitrate: the video bitrate in kbit/s + fps: the fps + + example: calcbpp.pl 720x440 16/9 896 25 + + +countquant.pl + +Author: Moritz Bunkus + +Description: Counts the quantizers used for the encoding, mentioned in + DOCS/tech/encoding-tips.txt, see that document for more info. + +Usage: countquant.pl < divx2pass.log + It will print out which quantizer was used how often. If you see + that e.g. the lowest quantizer (vqmin=2) gets used for > 95% of + the frames then you can safely increase your picture size. + + +plotpsnr.pl + +Author: Jonas Jermann + +Description: Draw PSNR log graphs using gnuplot. + +Usage: plotpsnr.pl [options] <file> + -h, --help Display this help message + -quant Display quantizers + -size Display size + -psnr Display PSNR + -iframes Display I-frames + -pframes Display P-frames + -bframes Display B-frames + -aframes Display all frames in different colors + -cmp <file2> Compare two files + -qs <style> Quantizer style + -ss <style> Size style + -ps <style> PSNR style + + Default: -quant -size -psnr -qs "p" -ss "i" -ps "p" + +Note: Requires gnuplot. Comparison is based on file2. Comparison + assumes that the frame numbers of both files fit. + + +psnr-video.sh + +Author: Matthias Wieser + +Description: Calculates the PSNR between two existing video files. + The PSNR is calculated frame by frame. + Also prints the overall PSNR. + The script can be used to: + * Compare different softwarescalers (should I use + -sws 1 or -sws 2 ?) + * Compare different resolutions (is it better to scale + down to 640x360 or to 560x320) + * Compare different deinterlacers + * Compare different video codecs + * Compare video filters (is it better to use -vf hqdn3d + or lavcopts:nr=400) + * [...] + +Usage: psnr-video.sh <file1> <file2> [<frames>] [<options1>] [<options2>] + + <file1> and <file2> are the video files for which the PSNR + should be calculated. + [<frames>] is the number of frames to process, starting + from frame 1. + [<options1>] are additional MPlayer options for <file1> + [<options2>] are additional MPlayer options for <file2> + + A file called ./psnr.dat will be created with the following + content: + + File;Y;Cb;Cr + 00000001.ppm;34.23;39.54;40.06;35.426 + 00000002.ppm;33.03;38.71;39.26;34.271 + 00000003.ppm;33.45;38.91;39.28;34.655 + 00000004.ppm;32.72;38.69;38.85;33.972 + [...] + 00000247.ppm;35.55;40.84;42.15;36.785 + PSNR:;35.9887 + +Note: This script relies on the the tool "pnmpsnr" for the + frame-by-frame PSNR calculation. + Be aware that psnr-video.sh needs a lot of temporary space + in /tmp/. + + +asfinfo + +Author: Arpi + +Description: a simple ASF header display program + +Usage: asfinfo <filename.asf> + +Note: Also see MPlayer's -identify option. + + +avi-fix + +Author: Arpi + +Description: A simple tool to fix chunk sizes in RIFF AVI files. + +Usage: avi-fix [-fix] <badfile.avi> + +Note: It does not check or fix the index, to do this use + 'mencoder -forceidx -oac copy -ovc copy'. + + +checktree.sh + +Author: Ivo van Poorten + +Description: Check the source tree for anomalies. + +Usage: checktree.sh -help + +Note: This script is meant for developers to check the current + source tree and/or the patches they are working on. + + +mphelp_check.py + +Author: Uoti Urpala + +Description: Check console message translations for common errors. + +Usage: mphelp_check.py [--missing] <master file> <files to check> + +Note: Compares MPlayer translation files against a master file and + reports conflicting arguments, extra strings not present in + the base file and (optionally) missing strings. + + +cpuinfo + +Author: Jürgen Keil + +Description: the prototype ../cpuinfo.c + +Note: Used by configure to emulate /proc/cpuinfo on non-Linux systems. + + +dump_mp4 + +Author: Arpi + +Description: MPEG4-ES stream inspector, dumps the stream startcodes. + + +fastmemcpybench + +Author: Felix Bünemann + +Description: benchmark/testbed for fastmemcpy stuff + +Note: Also see fastmem.sh. + + +movinfo + +Author: Arpi + +Description: Show QuickTime MOV file structure. + +Usage: movinfo <filename.mov> + + +vivodump + +Author: Arpi + +Description: Dump H.263 frame headers from VIVO files. + +Usage: vivodump <input_file> <output_file> + + + +Miscellaneous scripts in the TOOLS dir +-------------------------------------- + +subedit.pl + +Author: Michael Klepikov + +Description: A script for pipelined editing of subtitle files. + +Usage: subedit.pl [switches] + -if,--input-format <fmt> input format; supported: SRT (default: SRT) + -of,--output-format <fmt> output format; supported: SRT + (default: input format) + -s,--shift <time> shift all subtitles by <time> + (format: [-]hh:mm:ss,fraction) + -c,--scale <time> scale by adding <time> to overall duration + -f,--split-from <time> drop subtitles that end before <time> + -t,--split-to <time> drop subtitles that start after <time> (will + truncate timing if it overlaps a boundary) + -r,--renumber renumber SRT subtitles in output + -d,--debug enable debug output + -h,--help help message + + +w32codec_dl.pl + +Author: Tom Lees + +Description: This script will use the Windows Media Player codec download + infrastructure to aquire the codecs listed in codecs.conf and put + them in a directory named "codecs/" below the current directory. + +Usage: w32codec_dl.pl <codecs.conf location> + +Note: You will need the libwww-perl stuff and the cabextract utility + which can be found at http://www.kyz.uklinux.net/cabextract.php3. + + +binary_codecs.sh + +Author: Andrea Menucci, thuglife + +Description: Downloads binary codecs from mplayerhq.hu and installs them + on a Debian system. + +Usage: binary_codecs.sh install + binary_codecs.sh uninstall + + +vobshift.py + +Author: Gábor Farkas + +Description: Adjust the time-info in vobsub files + +Usage: vobshift.py in.idx out.idx +8.3 + Will shift the time by 8.3 seconds + + +subrip.c + +Author: Kim Minh Kaplan + +Description: Transform VOBsub subtitles into Subrip text subtitles using + GOCR/JOCR. + +Usage: subrip <vobsub basename> [subid [output filename] ] + +Note: Requires at least JOCR/GOCR 0.37. + You will have to change the 'vobsub_id' value if you want a + subtitle different from number 0. Hint: You can view the + subtitle that is being decoded with "display subtitle-*.pgm". + + +alaw-gen.c + +Author: Arpi + +Description: Generates alaw/ulaw tables. + +Note: Created to work around a past license issue, no longer useful. + + +avisubdump.c + +Author: Tobias Diedrich + +Description: Dumps vobsub soft subtitles streams embedded in AVI files. + +Usage: avisubdump <movie.avi> + + +vfw2menc.c + +Author: Gianluigi Tiesi + +Description: Creates a codec settings file from the Video for Windows codecs + found in the mplayer codec packs. + +Usage: vfw2menc -f <fourcc> -d <codec.dll> -s <settingsfile.mcf> + -h|--help - displays this help + -d|--driver filename - dll or drv to load + -f|--fourcc fourcc - fourcc of selected driver + -s|--save filename - save settings to file + -c|--check filename - load and show setting in filename + -v|--view - displays the config dialog and do nothing + +Notes: Works on Windows/Linux x86 only. + + +modify_reg.c + +Author: Alan Nisota + +Description: Modifies registry file (usually ~/.mplayer/registry) + +Usage: modify_reg -r <registry_file> -l + modify_reg -r <registry_file> -k <key> [-d|-v <value>[-t <type>]] + -r|--registry - path to registry file + -l|--list - shows all keys and values + -k|--key - registry key + -d|--del - delete key + -v|--value - new value for key + -t|--type - key type: string (default) or dword + +Notes: Necessary to use CoreAVC with MPlayer + + +compare.c + +Author: Michael Niedermayer + +Description: Simple file compare program that detects the number of rounding + errors and dies if the error is too large. + +Usage: compare <file1> <file2> + + +realcodecs/ + +Author: miscellaneous + +Description: Wrappers for Linux Real binary codecs used to analyze, alter and + dump the data flow between RealPlayer and its codecs. + +Usage: - Set the path to the RealPlayer codecs directory in the C files. + - Run 'make realcodecs'. + - Rename the original codecs to match the names expected in the + wrapper sources. The default is to give them a "real" prefix, + e.g. realcook.so.6.0. + - Put the wrappers in the RealPlayer codecs directory. + +Notes: Known to work at least on Linux x86 with RealPlayer8. + + + +netstream - access remote streams +--------------------------------- + +NOTE: netstream does not link at the moment - help welcome. + +netstream allows you to access most MPlayer stream types from a remote host. +The main purpose of this feature is to make it possible to directly use the +CD or DVD drive of another computer on the network (provided you have the +required bandwidth). On the downside some stream types (currently TV and MF) +are not usable remotely because they are implemented at the demuxer level. + +Be aware that currently the server is not secure at all. + +Compile the server by running 'make netstream' and then copy the netstream +binary to the right place on your system (usually /usr/local/bin on Unix). +Start the netstream server on the computer you intend to access remotely. +There are no command line arguments. + +Play the second track of a VCD on the server with: + + mplayer -cache 5000 mpst://servername/vcd://2 + +Access files on this server with: + + mplayer -cache 5000 mpst://servername//usr/local/movies/lol.avi + +Note that paths which do not start with a / will be interpreted as relative to +the directory where the server is running. The '-cache' option is not needed +but highly recommended. Added: trunk/debian/daily-build.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/daily-build.sh Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,16 @@ +#!/bin/sh + +# wrapper around dpkg-buildpackage to generate correct changelog +# use "debian/daily-build.sh -b" to create binary packages +# and "debian/daily-build.sh -S" to create a source package only + +LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2 +version=$(LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2) + +# ensure correct directory +test -r debian/control || exit 1 + +rm debian/changelog +dch --create --empty --package mplayer -v 2:1.0~svn${version} "Daily build" + +dpkg-buildpackage -us -uc "$@" Added: trunk/debian/mplayer-dbg.links ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer-dbg.links Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1 @@ +/usr/lib/debug/usr/bin/mplayer /usr/lib/debug/usr/bin/gmplayer Added: trunk/debian/mplayer-doc.doc-base.cs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer-doc.doc-base.cs Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,11 @@ +Document: mplayer-cs +Title: MPlayer documentation (Czech) +Author: The MPlayer team +Abstract: This documentation describes the use of MPlayer. (Czech) + MPlayer is a movie player for GNU/Linux that supports a wide + range of audio and video formats, and output drivers. +Section: Sound + +Format: HTML +Index: /usr/share/doc/mplayer-doc/HTML/cs/index.html +Files: /usr/share/doc/mplayer-doc/HTML/cs/*.html Added: trunk/debian/mplayer-doc.doc-base.de ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer-doc.doc-base.de Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,11 @@ +Document: mplayer-de +Title: MPlayer documentation (German) +Author: The MPlayer team +Abstract: This documentation describes the use of MPlayer. (German) + MPlayer is a movie player for GNU/Linux that supports a wide + range of audio and video formats, and output drivers. +Section: Sound + +Format: HTML +Index: /usr/share/doc/mplayer-doc/HTML/de/index.html +Files: /usr/share/doc/mplayer-doc/HTML/de/*.html Added: trunk/debian/mplayer-doc.doc-base.en ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer-doc.doc-base.en Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,11 @@ +Document: mplayer-en +Title: MPlayer documentation (English) +Author: The MPlayer team +Abstract: This documentation describes the use of MPlayer. (English) + MPlayer is a movie player for GNU/Linux that supports a wide + range of audio and video formats, and output drivers. +Section: Sound + +Format: HTML +Index: /usr/share/doc/mplayer-doc/HTML/en/index.html +Files: /usr/share/doc/mplayer-doc/HTML/en/*.html Added: trunk/debian/mplayer-doc.doc-base.es ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer-doc.doc-base.es Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,11 @@ +Document: mplayer-es +Title: MPlayer documentation (Spanish) +Author: The MPlayer team +Abstract: This documentation describes the use of MPlayer. (Spanish) + MPlayer is a movie player for GNU/Linux that supports a wide + range of audio and video formats, and output drivers. +Section: Sound + +Format: HTML +Index: /usr/share/doc/mplayer-doc/HTML/es/index.html +Files: /usr/share/doc/mplayer-doc/HTML/es/*.html Added: trunk/debian/mplayer-doc.doc-base.fr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer-doc.doc-base.fr Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,11 @@ +Document: mplayer-fr +Title: MPlayer documentation (French) +Author: The MPlayer team +Abstract: This documentation describes the use of MPlayer. (French) + MPlayer is a movie player for GNU/Linux that supports a wide + range of audio and video formats, and output drivers. +Section: Sound + +Format: HTML +Index: /usr/share/doc/mplayer-doc/HTML/fr/index.html +Files: /usr/share/doc/mplayer-doc/HTML/fr/*.html Added: trunk/debian/mplayer-doc.doc-base.hu ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer-doc.doc-base.hu Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,11 @@ +Document: mplayer-hu +Title: MPlayer documentation (Hungarian) +Author: The MPlayer team +Abstract: This documentation describes the use of MPlayer. (Hungarian) + MPlayer is a movie player for GNU/Linux that supports a wide + range of audio and video formats, and output drivers. +Section: Sound + +Format: HTML +Index: /usr/share/doc/mplayer-doc/HTML/hu/index.html +Files: /usr/share/doc/mplayer-doc/HTML/hu/*.html Added: trunk/debian/mplayer-doc.doc-base.pl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer-doc.doc-base.pl Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,11 @@ +Document: mplayer-pl +Title: MPlayer documentation (Polish) +Author: The MPlayer team +Abstract: This documentation describes the use of MPlayer. (Polish) + MPlayer is a movie player for GNU/Linux that supports a wide + range of audio and video formats, and output drivers. +Section: Sound + +Format: HTML +Index: /usr/share/doc/mplayer-doc/HTML/pl/index.html +Files: /usr/share/doc/mplayer-doc/HTML/pl/*.html Added: trunk/debian/mplayer-doc.doc-base.ru ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer-doc.doc-base.ru Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,11 @@ +Document: mplayer-ru +Title: MPlayer documentation (Russian) +Author: The MPlayer team +Abstract: This documentation describes the use of MPlayer. (Russian) + MPlayer is a movie player for GNU/Linux that supports a wide + range of audio and video formats, and output drivers. +Section: Sound + +Format: HTML +Index: /usr/share/doc/mplayer-doc/HTML/ru/index.html +Files: /usr/share/doc/mplayer-doc/HTML/ru/*.html Added: trunk/debian/mplayer-doc.docs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer-doc.docs Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,3 @@ +Copyright +DOCS/HTML +DOCS/tech Added: trunk/debian/mplayer-gui.menu ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer-gui.menu Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1 @@ +?package(mplayer):command="/usr/bin/gmplayer" section="Applications/Video" needs="X11" title="gmplayer" Added: trunk/debian/mplayer-gui.mime ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer-gui.mime Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,21 @@ +application/x-ogg; /usr/bin/gmplayer %s; description="OggVorbis Audio" +application/ogg; /usr/bin/gmplayer %s; description="OggVorbis Audio" +audio/mpeg; /usr/bin/gmplayer %s; description="MPEG Audio Format" +audio/x-mpegurl; /usr/bin/gmplayer %s; description="Icecast Playlists" +audio/x-ms-wax; /usr/bin/gmplayer %s; description="Audio Format" +audio/x-ms-wma; /usr/bin/gmplayer %s; description="Audio Format" +audio/x-pls; /usr/bin/gmplayer %s; description="MP3 ShoutCast/IceCast Playlist" +audio/x-scpls; /usr/bin/gmplayer %s; description="Shoutcast Playlists" +audio/x-wav; /usr/bin/gmplayer %s; description="Waveform Microsoft Wave/RIFF" +video/mpeg; /usr/bin/gmplayer %s; description="MPEG Video Format"; test=test -n "$DISPLAY" +video/quicktime; /usr/bin/gmplayer %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY" +video/x-mpeg2; /usr/bin/gmplayer %s; description="MPEG Video"; test=test -n "$DISPLAY" +video/x-mpeg; /usr/bin/gmplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY" +video/mpeg; /usr/bin/gmplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY" +video/x-ms-afs; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" +video/x-ms-asf; /usr/bin/gmplayer %s; description="MS ASF video"; test=test -n "$DISPLAY" +video/x-msvideo; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" +video/x-ms-wma; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" +video/x-ms-wmv; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" +video/x-ms-wmx; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" +video/x-ms-wvx; /usr/bin/gmplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" Added: trunk/debian/mplayer.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer.conf Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,130 @@ +# +# MPlayer configuration file +# +# Configuration files are read system-wide from /etc/mplayer/mplayer.conf +# and per user from ~/.mplayer/config, where per-user settings override +# system-wide settings, all of which are overrriden by the command line. +# +# The configuration file settings are the same as the command line +# options without the preceding '-'. +# +# See the CONFIGURATION FILES section in the man page +# for a detailed description of the syntax. + + +################## +# video settings # +################## + +# Specify default video driver (see -vo help for a list). +# vo=xv,x11 + +# FBdev driver: +# +# mode to use (read from fb.modes) +#fbmode = 640x480-120 +# +# location of the fb.modes file +#fbmodeconfig = /etc/fb.modes + +# Specify your monitor timings for the vesa and fbdev video output drivers. +# See /etc/X11/XF86Config for timings. Be careful; if you specify settings +# that exceed the capabilities of your monitor, you may damage it. +# +# horizontal frequency range (k stands for 1000) +#monitor-hfreq = 31.5k-50k,70k +# +# vertical frequency range +#monitor-vfreq = 50-90 +# +# dotclock (or pixelclock) range (m stands for 1000000) +#monitor-dotclock = 30M-300M + +# Start in fullscreen mode by default. +#fs=yes + +# Change to a different videomode when going fullscreen. +#vm=yes + +# Override the autodetected color depth, may need 'vm=yes' as well. +#bpp=0 + +# Enable software scaling (powerful CPU needed) for video output +# drivers that do not support hardware scaling. +#zoom=yes + +# standard monitor size, with square pixels +#monitoraspect=4:3 + +# Use this for a widescreen monitor, non-square pixels. +#monitoraspect=16:9 + +# Keep the player window on top of all other windows. +#ontop=yes + + +################## +# audio settings # +################## + +# Use pulse, then alsa, then SDL video with the aalib subdriver by default. +ao=pulse,alsa,sdl:aalib + +# Use SDL audio driver with the esd subdriver by default. +#ao = sdl:esd + +# Specify the mixer device. +#mixer = /dev/mixer + +# Resample the sound to 44100Hz with the lavcresample audio filter. +#af=lavcresample=44100 + + +################## +# other settings # +################## + +stop-xscreensaver=yes + +# Pretend to be Window Media Player. +# Fixes playback when playlist and media file use the same URL. +#user-agent=NSPlayer/4.1.0.3856 + +# Drop frames to preserve audio/video sync. +#framedrop = yes + +# Specify your preferred skin here (skins are searched for in +# /usr/local/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>). +#skin = Abyss + +# Resample the font alphamap. +# 0 plain white fonts +# 0.75 very narrow black outline (default) +# 1 narrow black outline +# 10 bold black outline +#ffactor = 0.75 + +# cache settings +# +# Use 8MB input cache by default. +#cache = 8192 +# +# Prefill 20% of the cache before starting playback. +#cache-min = 20.0 +# +# Prefill 50% of the cache before restarting playback after the cache emptied. +#cache-seek-min = 50 + +# DVD: Display English subtitles if available. +#slang = en + +# DVD: Play English audio tracks if available. +#alang = en + +################### +# DVDNAV Settings # +################### +#vc=ffmpeg12, + +# You can also include other configuration files. +#include = /path/to/the/file/you/want/to/include Added: trunk/debian/mplayer.examples ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer.examples Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,3 @@ +etc/example.conf +etc/menu.conf +etc/input.conf Added: trunk/debian/mplayer.install ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer.install Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,4 @@ +TOOLS/binary_codecs.sh usr/share/mplayer/ +TOOLS/midentify.sh usr/share/mplayer/ +debian/prefs var/lib/mplayer/ +etc/input.conf etc/menu.conf etc/mplayer Added: trunk/debian/mplayer.mime ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer.mime Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,21 @@ +application/x-ogg; /usr/bin/mplayer %s; description="OggVorbis Audio" +application/ogg; /usr/bin/mplayer %s; description="OggVorbis Audio" +audio/mpeg; /usr/bin/mplayer %s; description="MPEG Audio Format" +audio/x-mpegurl; /usr/bin/mplayer %s; description="Icecast Playlists" +audio/x-ms-wax; /usr/bin/mplayer %s; description="Audio Format" +audio/x-ms-wma; /usr/bin/mplayer %s; description="Audio Format" +audio/x-pls; /usr/bin/mplayer %s; description="MP3 ShoutCast/IceCast Playlist" +audio/x-scpls; /usr/bin/mplayer %s; description="Shoutcast Playlists" +audio/x-wav; /usr/bin/mplayer %s; description="Waveform Microsoft Wave/RIFF" +video/mpeg; /usr/bin/mplayer %s; description="MPEG Video Format"; test=test -n "$DISPLAY" +video/quicktime; /usr/bin/mplayer %s; description="Apple Quicktime Video"; test=test -n "$DISPLAY" +video/x-mpeg2; /usr/bin/mplayer %s; description="MPEG Video"; test=test -n "$DISPLAY" +video/x-mpeg; /usr/bin/mplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY" +video/mpeg; /usr/bin/mplayer %s; description="MPEG 2 Video"; test=test -n "$DISPLAY" +video/x-ms-afs; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" +video/x-ms-asf; /usr/bin/mplayer %s; description="MS ASF video"; test=test -n "$DISPLAY" +video/x-msvideo; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" +video/x-ms-wma; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" +video/x-ms-wmv; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" +video/x-ms-wmx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" +video/x-ms-wvx; /usr/bin/mplayer %s; description="Audio Video Interleave - Microsoft"; test=test -n "$DISPLAY" Added: trunk/debian/mplayer.preinst ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/mplayer.preinst Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,44 @@ +#!/bin/sh +# preinst script +# + +set -e + +# summary of how this script can be called: +# * <new-preinst> `install' +# * <new-preinst> `install' <old-version> +# * <new-preinst> `upgrade' <old-version> +# * <old-preinst> `abort-upgrade' <new-version> +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package + +case "$1" in + install) + ;; + upgrade) + if dpkg --compare-versions "$2" le "1.0~rc3+svn20090405-1"; then + md5=`md5sum /etc/mplayer/mplayer.conf | cut -d' ' -f1` + case "$md5" in + 9bdac8eb1184daa188d4829575ceafe8|\ + 46f52a60c07ed788500056dd7ffd27b9) + echo "removing obsolete /etc/mplayer/mplayer.conf" + rm -f /etc/mplayer/mplayer.conf + esac + fi + + ;; + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 Added: trunk/debian/prefs/MD5SUMS ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/prefs/MD5SUMS Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,34 @@ +cb4bb06ebc804f5dc4ec0ed516dc20d9 all-20061022.tar.bz2 +0407e8ad132e37ccd3f932448ca201c5 all-20071007.tar.bz2 +c71cbf23c9ac84b85a15801af6fe5fa4 all-alpha-20061028.tar.bz2 +7918b605cca3df7e2c34784f1328e494 all-ppc-20061022.tar.bz2 +abcf4a3abc16cf88c9df7e0a77e9b941 essential-20061022.tar.bz2 +4ea9c2dbd0945c83af1a8d0dd363993c essential-20071007.tar.bz2 +96fe3d614650531dda6675124f986a13 essential-alpha-20061028.tar.bz2 +af409ba2918dc8f639dded805102fc76 essential-amd64-20061203.tar.bz2 +8e1ceeec51469f5baac65e56fac709e8 essential-amd64-20071007.tar.bz2 +df9ec99d9fa7ef0ab6a633cfb421d637 essential-ppc-20061022.tar.bz2 +6682d5013a91bb80fdde87a516f6a8af essential-ppc-20071007.tar.bz2 +1f5b8e9d9e31f898b1207a0b3bd70f32 qt5dlls-20040626.tar.bz2 +dbb2e77156a69179473b86f7498e9b29 qt63dlls-20050115.tar.bz2 +9fb88417aef157e2f1f5b7be57eaed7b qt65dlls-20040704.tar.bz2 +c8cc10f2c9f109fa44fc4dddb91571c4 qt6dlls-20040626.tar.bz2 +a7e750afda31796d322395d77c4184d0 qtextras-20041107.tar.bz2 +c9ae3969ba1e73a8cbeef38f5803fd2e rp8codecs-20040626.tar.bz2 +32919658c4bdfb3454173e3d64d26dc2 rp8codecs-alpha-20050115.tar.bz2 +4cc9a6270f9aa834b4fef49d71b9faf9 rp8codecs-ppc-20050115.tar.bz2 +534658c867abb81c38e0c05bccc79a79 rp8codecs-win32-20040626.tar.bz2 +a32f4fa1f77593536a57e4b662fde7aa rp9codecs-20050115.tar.bz2 +6b56c1c127f5ac0c4c8a9878f24477ca rp9codecs-win32-20050115.tar.bz2 +4558d3690e9479b06df16d0a15b35f9d unsupported-20040809.tar.bz2 +90ba6a76ded2f9fd9f865024bd8de3d3 win32codecs-20040703.tar.bz2 +58ce4d68001d4f39c3e84d52834fb3ef win32codecs-essential-20040703.tar.bz2 +a7c980a1a94fbac6ebd34c7485a1891d xanimdlls-20040626.tar.bz2 +0b4877ac52eb7e84eb3031e6d7a3f65d xanimdlls-alpha-20061028.tar.bz2 +8965e5f67f39530f293fc6c594bca19a xanimdlls-ppc-20040626.tar.bz2 +1e409d500336a8318cbe2a67bbf9d9ca essential-macosx-x86-20060611.zip +788cf4940280fd787c0a2141d88ce3c7 rp9codecs-macosx-20041107.pkg.zip +1323e8d46bfc7b8d1d6d172018222e9c windows-all-20061022.zip +f96557eeddb4ea9d286a89ff8c91750a windows-all-20071007.zip +0cc375cebb4f7820ad82bc2802171193 windows-essential-20061022.zip +e32bdc9970f0df7da8eb23d2b254b866 windows-essential-20071007.zip Added: trunk/debian/prefs/codecs_list ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/prefs/codecs_list Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,10 @@ +i386 @MAINSITE@ releases/codecs essential-20071007.tar.bz2 +powerpc @MAINSITE@ releases/codecs essential-ppc-20071007.tar.bz2 +amd64 @MAINSITE@ releases/codecs essential-amd64-20071007.tar.bz2 +alpha @MAINSITE@ releases/codecs essential-alpha-20061028.tar.bz2 + + + + + + Added: trunk/debian/prefs/mirrors ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/prefs/mirrors Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,7 @@ +http://www1.mplayerhq.hu/MPlayer/ +http://www2.mplayerhq.hu/MPlayer/ +http://www3.mplayerhq.hu/MPlayer/ +http://www4.mplayerhq.hu/MPlayer/ +http://www5.mplayerhq.hu/MPlayer/ +http://www7.mplayerhq.hu/MPlayer/ +http://www8.mplayerhq.hu/MPlayer/ Added: trunk/debian/rules ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/rules Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1,193 @@ +#!/usr/bin/make -f + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +# Support multiple makes at once +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +NUMJOBS = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +else +# on i386 and amd64, we query the system unless overriden by DEB_BUILD_OPTIONS +ifeq ($(DEB_BUILD_ARCH),i386) +NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) +else ifeq ($(DEB_BUILD_ARCH),amd64) +NUMJOBS := -j$(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1) +endif +endif + + +# do not run the actual rules of this makefile in parallel. sub-makes +# can go in parallel +.NOTPARALLEL: + +############ + +DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p') +DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p') +UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//') +SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-~]+\+svn([0-9]+)$$/\1/p') + + +#UPSTREAMSOURCE := upstream SVN repository +UPSTREAMSOURCE := http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 + +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) + + +# XXX enable-menu is frowned upon by upstream +CONFIGURE_FLAGS = \ + --prefix=/usr \ + --confdir=/etc/mplayer \ + --enable-xvmc \ + --enable-menu \ + --disable-arts \ + --enable-largefiles \ + --language=all \ + $(archconf) + +ifeq ($(DEB_HOST_ARCH),i386) +#configure optimizes for the cpu detected at ./configure time +#in order to build a generic binary, avoid non-standard opcodes through gcc + archconf += --target=i586-linux + CONFIGURE_FLAGS += --enable-runtime-cpudetection +endif +ifeq ($(DEB_HOST_ARCH),amd64) + CONFIGURE_FLAGS += --enable-runtime-cpudetection +endif +ifeq ($(DEB_HOST_ARCH),kfreebsd-i386) + CONFIGURE_FLAGS += --enable-runtime-cpudetection +endif +ifeq ($(DEB_HOST_ARCH),kfreebsd-amd64) + CONFIGURE_FLAGS += --enable-runtime-cpudetection +endif +ifeq ($(DEB_HOST_ARCH),powerpc) + CONFIGURE_FLAGS += --enable-runtime-cpudetection +endif +ifeq ($(DEB_HOST_ARCH),alpha) +#Avoid high optimization through gcc. +# see http://permalink.gmane.org/gmane.linux.debian.ports.alpha/7295 + archconf += --target=alpha_ev5-linux +endif + +# generate debugging symbols for mplayer-dbg for all archs but mipsen, +# see bug #520113 +ifeq (,$(findstring mips,$(DEB_HOST_ARCH))) +CONFIGURE_FLAGS += --enable-debug +endif + +ifeq (linux,$(DEB_HOST_ARCH_OS)) + CONFIGURE_FLAGS += --enable-mga --enable-3dfx --enable-tdfxfb +endif + +# See http://wiki.debian.org/Teams/Dpkg/DebianRules; #465282 and +# https://wiki.ubuntu.com/DistCompilerFlags +CLEAN_ENV=env -u CFLAGS -u CPPFLAGS -u LDFLAGS -u FFLAGS -u CXXFLAGS + +build: build-arch build-indep + +####### build-arch +build-arch: + dh_testdir + dh_prep -a + $(MAKE) -f debian/rules debian/mplayer/usr/bin/mplayer + $(MAKE) -f debian/rules debian/mencoder/usr/bin/mencoder + $(MAKE) -f debian/rules debian/mplayer-gui/usr/bin/gmplayer + +# build non-gui version +# & mencoder +debian/mplayer/usr/bin/mplayer debian/mencoder/usr/bin/mencoder: + dh_testdir + $(CLEAN_ENV) \ + ./configure $(CONFIGURE_FLAGS) --disable-gui + $(CLEAN_ENV) \ + $(MAKE) $(NUMJOBS) mplayer mencoder + $(MAKE) install-mplayer DESTDIR=$(CURDIR)/debian/mplayer + $(MAKE) install-mplayer-man DESTDIR=$(CURDIR)/debian/mplayer + $(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder + $(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mplayer + install -D -m 644 debian/mplayer.conf \ + $(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf + +# build gui version +debian/mplayer-gui/usr/bin/gmplayer: + dh_testdir + $(CLEAN_ENV) \ + ./configure $(CONFIGURE_FLAGS) --enable-gui + $(CLEAN_ENV) \ + $(MAKE) $(NUMJOBS) mplayer + install -D -m 755 mplayer $(CURDIR)/debian/mplayer-gui/usr/bin/gmplayer + install -D -m 644 etc/mplayer.desktop \ + $(CURDIR)/debian/mplayer-gui/usr/share/applications/mplayer.desktop + install -D -m 644 etc/mplayer.xpm \ + $(CURDIR)/debian/mplayer-gui/usr/share/pixmaps/mplayer.xpm + + +# binaries already installed via build rules as we have to build several flavors +install-arch: build-arch + +###### build-indep +DOCS/HTML/en/index.html: + sh debian/all-lang-config-mak.sh > config.mak + cd DOCS/xml && ./configure + $(MAKE) -C DOCS/xml html-chunked + +build-indep: + dh_testdir + dh_prep -i + test ! -f DOCS/HTML/en/index.html || $(MAKE) -f debian/rules DOCS/HTML/en/index.html + +# commands to compile the documentation +install-indep: build-indep + dh_installchangelogs -i + dh_installdocs -i + dh_compress -i + dh_fixperms -i + +################ clean + +clean: + dh_testdir + dh_testroot + [ ! -f config.mak ] || $(MAKE) -C DOCS/xml releaseclean && $(MAKE) distclean + dh_clean snapshot_version + +# Build architecture-independent packages +binary-indep: install-indep + +# Build architecture-dependent packages +binary-arch: install-arch + dh_testdir + dh_testroot + dh_install -a + dh_installchangelogs -a + dh_installdocs -a + dh_installexamples -a + dh_installmenu -a + dh_installmime -a + dh_installman -a + dh_strip -a --dbg-package=mplayer-dbg + dh_link + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch + +get-orig-source: + dh_testdir + sh debian/get-orig-source.sh -d $(SVN_VERSION) + +PHONY += build clean binary-indep binary-arch binary-common binary +PHONY += install binary binary-arch binary-indep clean checkroot get-orig-source +PHONY += autocontrol fix-orig-source copy-orig-from-svn download-and-unpack-orig + +.PHONY: $(PHONY) Added: trunk/debian/source/format ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/debian/source/format Tue Aug 3 15:02:07 2010 (r31912) @@ -0,0 +1 @@ +3.0 (quilt)

1 0

r31911 - trunk/debian
by siretart 03 Aug '10

03 Aug '10

Author: siretart Date: Tue Aug 3 14:32:17 2010 New Revision: 31911 Log: remove old debian packaging Deleted: trunk/debian/

1 0

r31910 - trunk/configure
by diego 03 Aug '10

03 Aug '10

Author: diego Date: Tue Aug 3 13:46:55 2010 New Revision: 31910 Log: Suppress unsupported compiler options when building with clang on Darwin/PPC. patch by Rowan James, rowanj(a)phere.net Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Aug 3 13:40:01 2010 (r31909) +++ trunk/configure Tue Aug 3 13:46:55 2010 (r31910) @@ -1526,7 +1526,10 @@ if netbsd || dragonfly ; then fi if darwin; then - extra_cflags="-mdynamic-no-pic -falign-loops=16 -shared-libgcc $extra_cflags" + extra_cflags="-mdynamic-no-pic $extra_cflags" + if test "$(basename $_cc)" != "clang" ; then + extra_cflags="-falign-loops=16 -shared-libgcc $extra_cflags" + fi _timer=timer-darwin.c fi

1 0

r31909 - trunk/configure
by diego 03 Aug '10

03 Aug '10

Author: diego Date: Tue Aug 3 13:40:01 2010 New Revision: 31909 Log: Add -Wno-parentheses to CFLAGS. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Aug 3 10:57:48 2010 (r31908) +++ trunk/configure Tue Aug 3 13:40:01 2010 (r31909) @@ -2565,7 +2565,7 @@ elif test -z "$CFLAGS" ; then elif test "$cc_vendor" != "gnu" ; then CFLAGS="-O2 $_march $_mcpu $_pipe" else - CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" + CFLAGS="-Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer" extra_ldflags="$extra_ldflags -ffast-math" fi else

1 0

r31908 - trunk/configure
by diego 03 Aug '10

03 Aug '10

Author: diego Date: Tue Aug 3 10:57:48 2010 New Revision: 31908 Log: The default CD-ROM device on OpenBSD is /dev/rcd0c, not /dev/rcd0a. patch by Edd Barrett, vext01 gmail com Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Aug 3 07:18:28 2010 (r31907) +++ trunk/configure Tue Aug 3 10:57:48 2010 (r31908) @@ -6059,7 +6059,7 @@ elif dragonfly ; then elif freebsd ; then default_cdrom_device="/dev/acd0" elif openbsd ; then - default_cdrom_device="/dev/rcd0a" + default_cdrom_device="/dev/rcd0c" elif sunos ; then default_cdrom_device="/vol/dev/aliases/cdrom0" # Modern Solaris versions use HAL instead of the vold daemon, the volfs

1 0

r31907 - trunk/stream/cache2.c
by reimar 03 Aug '10

03 Aug '10

Author: reimar Date: Tue Aug 3 07:18:28 2010 New Revision: 31907 Log: Avoid STREAM_CTRL_SEEK_TO_TIME messing up the current position for stream types which do not support it. Fixes seeking in local flv files. Modified: trunk/stream/cache2.c Modified: trunk/stream/cache2.c ============================================================================== --- trunk/stream/cache2.c Mon Aug 2 20:28:42 2010 (r31906) +++ trunk/stream/cache2.c Tue Aug 3 07:18:28 2010 (r31907) @@ -600,7 +600,8 @@ int cache_do_control(stream_t *stream, i case STREAM_CTRL_SEEK_TO_CHAPTER: case STREAM_CTRL_SEEK_TO_TIME: case STREAM_CTRL_SET_ANGLE: - stream->pos = s->read_filepos = s->control_new_pos; + if (s->control_res != STREAM_UNSUPPORTED) + stream->pos = s->read_filepos = s->control_new_pos; break; } return s->control_res;

1 0

r31906 - trunk/loader/win32.c
by alexc 02 Aug '10

02 Aug '10

Author: alexc Date: Mon Aug 2 20:28:42 2010 New Revision: 31906 Log: Add msvcr100 support to the win32 loader. This is required for the Expression Screen Codec binary decoder. Modified: trunk/loader/win32.c Modified: trunk/loader/win32.c ============================================================================== --- trunk/loader/win32.c Mon Aug 2 19:39:20 2010 (r31905) +++ trunk/loader/win32.c Mon Aug 2 20:28:42 2010 (r31906) @@ -5585,6 +5585,15 @@ static const struct exports exp_msvcp60[ {"??1_Lockit@std@@QAE@XZ", -1, exp_1Lockit_dummy} }; +static const struct exports exp_msvcr100[]={ + FF(memcpy, -1) + FF(memset, -1) + FF(_initterm_e, -1) + FF(_initterm, -1) + {"??2@YAPAXI@Z", -1, expnew}, + {"??3@YAXPAX@Z", -1, expdelete} +}; + #define LL(X) \ {#X".dll", sizeof(exp_##X)/sizeof(struct exports), exp_##X}, @@ -5613,6 +5622,7 @@ static const struct libs libraries[]={ LL(shlwapi) LL(msvcr80) LL(msvcp60) + LL(msvcr100) }; static WIN_BOOL WINAPI ext_stubs(void)

1 0

r31905 - in trunk: cpudetect.c cpudetect.h loader/win32.c
by reimar 02 Aug '10

02 Aug '10

Author: reimar Date: Mon Aug 2 19:39:20 2010 New Revision: 31905 Log: Reuse do_cpuid from cpudetect.c in loader/win32.c. Also avoids several "used uninitialized" warnings. Modified: trunk/cpudetect.c trunk/cpudetect.h trunk/loader/win32.c Modified: trunk/cpudetect.c ============================================================================== --- trunk/cpudetect.c Mon Aug 2 19:36:16 2010 (r31904) +++ trunk/cpudetect.c Mon Aug 2 19:39:20 2010 (r31905) @@ -89,7 +89,7 @@ static int has_cpuid(void) #endif } -static void +void do_cpuid(unsigned int ax, unsigned int *p) { // code from libavcodec: Modified: trunk/cpudetect.h ============================================================================== --- trunk/cpudetect.h Mon Aug 2 19:36:16 2010 (r31904) +++ trunk/cpudetect.h Mon Aug 2 19:39:20 2010 (r31905) @@ -49,6 +49,8 @@ typedef struct cpucaps_s { extern CpuCaps gCpuCaps; +void do_cpuid(unsigned int ax, unsigned int *p); + void GetCpuCaps(CpuCaps *caps); /* returned value is malloc()'ed so free() it after use */ Modified: trunk/loader/win32.c ============================================================================== --- trunk/loader/win32.c Mon Aug 2 19:36:16 2010 (r31904) +++ trunk/loader/win32.c Mon Aug 2 19:39:20 2010 (r31905) @@ -76,22 +76,8 @@ for DLL to know too much about its envir #endif #include "osdep/mmap_anon.h" #include "libavutil/avstring.h" +#include "cpudetect.h" -static void do_cpuid(unsigned int ax, unsigned int *regs) -{ - __asm__ volatile - ( - "pushl %%ebx; pushl %%ecx; pushl %%edx;" - ".byte 0x0f, 0xa2;" - "movl %%eax, (%2);" - "movl %%ebx, 4(%2);" - "movl %%ecx, 8(%2);" - "movl %%edx, 12(%2);" - "popl %%edx; popl %%ecx; popl %%ebx;" - : "=a" (ax) - : "0" (ax), "S" (regs) - ); -} static unsigned int c_localcount_tsc(void) { int a;

1 0

r31904 - trunk/cpudetect.c
by reimar 02 Aug '10

02 Aug '10

Author: reimar Date: Mon Aug 2 19:36:16 2010 New Revision: 31904 Log: Remove outdated cpuid code. Modified: trunk/cpudetect.c Modified: trunk/cpudetect.c ============================================================================== --- trunk/cpudetect.c Mon Aug 2 19:32:42 2010 (r31903) +++ trunk/cpudetect.c Mon Aug 2 19:36:16 2010 (r31904) @@ -92,13 +92,6 @@ static int has_cpuid(void) static void do_cpuid(unsigned int ax, unsigned int *p) { -#if 0 - __asm__ volatile( - "cpuid;" - : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax) - ); -#else // code from libavcodec: __asm__ volatile ("mov %%"REG_b", %%"REG_S"\n\t" @@ -107,7 +100,6 @@ do_cpuid(unsigned int ax, unsigned int * : "=a" (p[0]), "=S" (p[1]), "=c" (p[2]), "=d" (p[3]) : "0" (ax)); -#endif } void GetCpuCaps( CpuCaps *caps)

1 0

r31903 - trunk/loader/win32.c
by reimar 02 Aug '10

02 Aug '10

Author: reimar Date: Mon Aug 2 19:32:42 2010 New Revision: 31903 Log: Add const to avoid warnings. The const on the return type is not correct compared to the real win32 API functions, but that really does not matter for us, avoiding the warning is more useful. Modified: trunk/loader/win32.c Modified: trunk/loader/win32.c ============================================================================== --- trunk/loader/win32.c Mon Aug 2 19:30:00 2010 (r31902) +++ trunk/loader/win32.c Mon Aug 2 19:32:42 2010 (r31903) @@ -4995,8 +4995,8 @@ static WIN_BOOL WINAPI expGetOpenFileNam return 1; } -static char * WINAPI expPathFindExtensionA(const char *path) { - char *ext; +static const char * WINAPI expPathFindExtensionA(const char *path) { + const char *ext; if (!path) ext = NULL; else { @@ -5008,8 +5008,8 @@ static char * WINAPI expPathFindExtensio return ext; } -static char * WINAPI expPathFindFileNameA(const char *path) { - char *name; +static const char * WINAPI expPathFindFileNameA(const char *path) { + const char *name; if (!path || strlen(path) < 2) name = path; else {

1 0

r31902 - trunk/loader/win32.c
by reimar 02 Aug '10

02 Aug '10

Author: reimar Date: Mon Aug 2 19:30:00 2010 New Revision: 31902 Log: Avoid arithmetic on void * pointers. Modified: trunk/loader/win32.c Modified: trunk/loader/win32.c ============================================================================== --- trunk/loader/win32.c Mon Aug 2 19:27:20 2010 (r31901) +++ trunk/loader/win32.c Mon Aug 2 19:30:00 2010 (r31902) @@ -4748,7 +4748,7 @@ static void WINAPI expGlobalMemoryStatus lpmem->dwAvailPageFile = 16*1024*1024; } expGetSystemInfo(&si); - lpmem->dwTotalVirtual = si.lpMaximumApplicationAddress-si.lpMinimumApplicationAddress; + lpmem->dwTotalVirtual = (uint8_t *)si.lpMaximumApplicationAddress-(uint8_t *)si.lpMinimumApplicationAddress; /* FIXME: we should track down all the already allocated VM pages and substract them, for now arbitrarily remove 64KB so that it matches NT */ lpmem->dwAvailVirtual = lpmem->dwTotalVirtual-64*1024; memcpy(&cached_memstatus,lpmem,sizeof(MEMORYSTATUS));

1 0

r31901 - trunk/loader/win32.c
by reimar 02 Aug '10

02 Aug '10

Author: reimar Date: Mon Aug 2 19:27:20 2010 New Revision: 31901 Log: Fix type in conditional. Modified: trunk/loader/win32.c Modified: trunk/loader/win32.c ============================================================================== --- trunk/loader/win32.c Mon Aug 2 19:26:28 2010 (r31900) +++ trunk/loader/win32.c Mon Aug 2 19:27:20 2010 (r31901) @@ -3895,7 +3895,7 @@ static WIN_BOOL WINAPI expWriteFile(HAND static DWORD WINAPI expSetFilePointer(HANDLE h, LONG val, LPLONG ext, DWORD whence) { int wh; - dbgprintf("SetFilePointer(%d, 0x%x, 0x%x = %d, %d)\n", h, val, ext, ext ? *ext : NULL, whence); + dbgprintf("SetFilePointer(%d, 0x%x, 0x%x = %d, %d)\n", h, val, ext, ext ? *ext : 0, whence); //why would DLL want temporary file with >2Gb size? switch(whence) {

1 0

r31900 - trunk/loader/win32.c
by reimar 02 Aug '10

02 Aug '10

Author: reimar Date: Mon Aug 2 19:26:28 2010 New Revision: 31900 Log: Make function declarations proper prototypes. Modified: trunk/loader/win32.c Modified: trunk/loader/win32.c ============================================================================== --- trunk/loader/win32.c Mon Aug 2 19:19:45 2010 (r31899) +++ trunk/loader/win32.c Mon Aug 2 19:26:28 2010 (r31900) @@ -141,7 +141,7 @@ static void c_longcount_notsc(long long* } static unsigned int localcount_stub(void); static void longcount_stub(long long*); -static unsigned int (*localcount)()=localcount_stub; +static unsigned int (*localcount)(void)=localcount_stub; static void (*longcount)(long long*)=longcount_stub; static pthread_mutex_t memmut = PTHREAD_MUTEX_INITIALIZER; @@ -2758,7 +2758,7 @@ static int WINAPI expMonitorFromPoint(vo } static int WINAPI expEnumDisplayMonitors(void *dc, RECT *r, - int WINAPI (*callback_proc)(), void *callback_param) + int WINAPI (*callback_proc)(HMONITOR, HDC, LPRECT, LPARAM), void *callback_param) { dbgprintf("EnumDisplayMonitors(0x%x, 0x%x, 0x%x, 0x%x) => ?\n", dc, r, callback_proc, callback_param); @@ -2858,7 +2858,7 @@ static int WINAPI expCreateRectRgn(int x return 0; } -static int WINAPI expEnumWindows(int (*callback_func)(), void *callback_param) +static int WINAPI expEnumWindows(int (*callback_func)(HWND, LPARAM), void *callback_param) { int i, i2; dbgprintf("EnumWindows(0x%x, 0x%x) => 1\n", callback_func, callback_param);

1 0

r31899 - trunk/loader/win32.c
by reimar 02 Aug '10

02 Aug '10

Author: reimar Date: Mon Aug 2 19:19:45 2010 New Revision: 31899 Log: Avoid mixing code and declarations. Modified: trunk/loader/win32.c Modified: trunk/loader/win32.c ============================================================================== --- trunk/loader/win32.c Mon Aug 2 19:18:18 2010 (r31898) +++ trunk/loader/win32.c Mon Aug 2 19:19:45 2010 (r31899) @@ -678,8 +678,9 @@ static pthread_mutex_t mlist_lock = PTHR void destroy_event(void* event) { + mutex_list *pp; pthread_mutex_lock(&mlist_lock); - mutex_list* pp=mlist; + pp=mlist; // printf("garbage collector: destroy_event(%x)\n", event); while(pp) {

1 0

r31898 - trunk/loader/win32.c
by reimar 02 Aug '10

02 Aug '10

Author: reimar Date: Mon Aug 2 19:18:18 2010 New Revision: 31898 Log: Make library/export function tables static const. Modified: trunk/loader/win32.c Modified: trunk/loader/win32.c ============================================================================== --- trunk/loader/win32.c Mon Aug 2 19:07:29 2010 (r31897) +++ trunk/loader/win32.c Mon Aug 2 19:18:18 2010 (r31898) @@ -5142,7 +5142,7 @@ struct libs { char name[64]; int length; - struct exports* exps; + const struct exports* exps; }; #define FF(X,Y) \ @@ -5151,7 +5151,7 @@ struct libs #define UNDEFF(X, Y) \ {#X, Y, (void*)-1}, -struct exports exp_kernel32[]= +static const struct exports exp_kernel32[]= { FF(GetVolumeInformationA,-1) FF(GetDriveTypeA,-1) @@ -5327,7 +5327,7 @@ struct exports exp_kernel32[]= UNDEFF(FlsFree, -1) }; -struct exports exp_msvcrt[]={ +static const struct exports exp_msvcrt[]={ FF(malloc, -1) FF(_initterm, -1) FF(__dllonexit, -1) @@ -5391,7 +5391,7 @@ struct exports exp_msvcrt[]={ FF(realloc,-1) {"puts",-1,(void*)&puts} }; -struct exports exp_winmm[]={ +static const struct exports exp_winmm[]={ FF(GetDriverModuleHandle, -1) FF(timeGetTime, -1) FF(DefDriverProc, -1) @@ -5404,10 +5404,10 @@ struct exports exp_winmm[]={ FF(waveOutGetNumDevs, -1) #endif }; -struct exports exp_psapi[]={ +static const struct exports exp_psapi[]={ FF(GetModuleBaseNameA, -1) }; -struct exports exp_user32[]={ +static const struct exports exp_user32[]={ FF(LoadIconA,-1) FF(LoadStringA, -1) FF(wsprintfA, -1) @@ -5455,7 +5455,7 @@ struct exports exp_user32[]={ FF(CharNextA, -1) FF(EnumDisplaySettingsA, -1) }; -struct exports exp_advapi32[]={ +static const struct exports exp_advapi32[]={ FF(RegCloseKey, -1) FF(RegCreateKeyA, -1) FF(RegCreateKeyExA, -1) @@ -5467,7 +5467,7 @@ struct exports exp_advapi32[]={ FF(RegSetValueExA, -1) FF(RegQueryInfoKeyA, -1) }; -struct exports exp_gdi32[]={ +static const struct exports exp_gdi32[]={ FF(CreateCompatibleDC, -1) FF(CreateFontA, -1) FF(DeleteDC, -1) @@ -5480,10 +5480,10 @@ struct exports exp_gdi32[]={ FF(CreateRectRgn, -1) #endif }; -struct exports exp_version[]={ +static const struct exports exp_version[]={ FF(GetFileVersionInfoSizeA, -1) }; -struct exports exp_ole32[]={ +static const struct exports exp_ole32[]={ FF(CoCreateFreeThreadedMarshaler,-1) FF(CoCreateInstance, -1) FF(CoInitialize, -1) @@ -5496,22 +5496,22 @@ struct exports exp_ole32[]={ }; // do we really need crtdll ??? // msvcrt is the correct place probably... -struct exports exp_crtdll[]={ +static const struct exports exp_crtdll[]={ FF(memcpy, -1) FF(wcscpy, -1) }; -struct exports exp_comctl32[]={ +static const struct exports exp_comctl32[]={ FF(StringFromGUID2, -1) FF(InitCommonControls, 17) #ifdef CONFIG_QTX_CODECS FF(CreateUpDownControl, 16) #endif }; -struct exports exp_wsock32[]={ +static const struct exports exp_wsock32[]={ FF(htonl,8) FF(ntohl,14) }; -struct exports exp_msdmo[]={ +static const struct exports exp_msdmo[]={ FF(memcpy, -1) // just test FF(MoCopyMediaType, -1) FF(MoCreateMediaType, -1) @@ -5520,7 +5520,7 @@ struct exports exp_msdmo[]={ FF(MoFreeMediaType, -1) FF(MoInitMediaType, -1) }; -struct exports exp_oleaut32[]={ +static const struct exports exp_oleaut32[]={ FF(SysAllocStringLen, 4) FF(SysFreeString, 6) FF(VariantInit, 8) @@ -5545,7 +5545,7 @@ struct exports exp_oleaut32[]={ 23022 411 _purecall */ #ifdef REALPLAYER -struct exports exp_pncrt[]={ +static const struct exports exp_pncrt[]={ FF(malloc, -1) // just test FF(free, -1) // just test FF(fprintf, -1) // just test @@ -5565,21 +5565,21 @@ struct exports exp_pncrt[]={ #endif #ifdef CONFIG_QTX_CODECS -struct exports exp_ddraw[]={ +static const struct exports exp_ddraw[]={ FF(DirectDrawCreate, -1) }; #endif -struct exports exp_comdlg32[]={ +static const struct exports exp_comdlg32[]={ FF(GetOpenFileNameA, -1) }; -struct exports exp_shlwapi[]={ +static const struct exports exp_shlwapi[]={ FF(PathFindExtensionA, -1) FF(PathFindFileNameA, -1) }; -struct exports exp_msvcr80[]={ +static const struct exports exp_msvcr80[]={ FF(_CIpow,-1) FF(_CIsin,-1) FF(_CIcos,-1) @@ -5593,7 +5593,7 @@ struct exports exp_msvcr80[]={ {"??3@YAXPAX@Z", -1, expdelete} }; -struct exports exp_msvcp60[]={ +static const struct exports exp_msvcp60[]={ {"??0_Lockit@std@@QAE@XZ", -1, exp_0Lockit_dummy}, {"??1_Lockit@std@@QAE@XZ", -1, exp_1Lockit_dummy} }; @@ -5601,7 +5601,7 @@ struct exports exp_msvcp60[]={ #define LL(X) \ {#X".dll", sizeof(exp_##X)/sizeof(struct exports), exp_##X}, -struct libs libraries[]={ +static const struct libs libraries[]={ LL(kernel32) LL(msvcrt) LL(winmm)

1 0

r31897 - in branches/1.0rc4: . mpcommon.c
by diego 02 Aug '10

02 Aug '10

Author: diego Date: Mon Aug 2 19:07:29 2010 New Revision: 31897 Log: 10l: Add the Subversion revision to the version string, not "VERSION". backport r31873 by diego Modified: branches/1.0rc4/ (props changed) branches/1.0rc4/mpcommon.c Modified: branches/1.0rc4/mpcommon.c ============================================================================== --- branches/1.0rc4/mpcommon.c Mon Aug 2 16:35:02 2010 (r31896) +++ branches/1.0rc4/mpcommon.c Mon Aug 2 19:07:29 2010 (r31897) @@ -44,8 +44,8 @@ ass_track_t* ass_track = 0; // current t sub_data* subdata = NULL; subtitle* vo_sub_last = NULL; -const char *mencoder_version = "MEncoder VERSION"; -const char *mplayer_version = "MPlayer VERSION"; +const char *mencoder_version = "MEncoder " VERSION; +const char *mplayer_version = "MPlayer " VERSION; void print_version(const char* name) {

1 0

[propchange]: r31848 - svn:log
by diego 02 Aug '10

02 Aug '10

Author: diego Revision: 31848 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,2 +1 @@ Create 1.0rc4 release branch. -

1 0

[propchange]: r31852 - svn:log
by diego 02 Aug '10

02 Aug '10

Author: diego Revision: 31852 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,2 +1 @@ Backport documentation changes r31665-31851 by diego from trunk -

1 0

[propchange]: r31859 - svn:log
by diego 02 Aug '10

02 Aug '10

Author: diego Revision: 31859 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,2 +1 @@ Revert commits 31299 and 31187 by cehoyos for compatibility with 0.6 -

1 0

[propchange]: r31860 - svn:log
by diego 02 Aug '10

02 Aug '10

Author: diego Revision: 31860 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -2,5 +2,3 @@ Only try to merge packets if we have a p Based on patch by 191919 [191919 gmail com]. backport r31787 by reimar - -

1 0

[propchange]: r31858 - svn:log
by diego 02 Aug '10

02 Aug '10

Author: diego Revision: 31858 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,2 +1 @@ Restore compatibility with FFmpeg 0.6 by reverting commit r31322 by cehoyos -

1 0

[propchange]: r31850 - svn:log
by diego 02 Aug '10

02 Aug '10

Author: diego Revision: 31850 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,4 +1,3 @@ Readd "obsolete" may_alias-related defines. This is still required for FFmpeg 0.6 This reverts commit r31267 by reimar -

1 0

r31896 - trunk/configure
by diego 02 Aug '10

02 Aug '10

Author: diego Date: Mon Aug 2 16:35:02 2010 New Revision: 31896 Log: Add missing libavcore bits: enabling options and help output Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Aug 2 00:53:09 2010 (r31895) +++ trunk/configure Mon Aug 2 16:35:02 2010 (r31896) @@ -345,11 +345,13 @@ Codecs: --disable-libnut disable libnut [autodetect] --disable-libavutil_a disable static libavutil [autodetect] --disable-libavcodec_a disable static libavcodec [autodetect] + --disable-libavcore_a disable static libavcore [autodetect] --disable-libavformat_a disable static libavformat [autodetect] --disable-libpostproc_a disable static libpostproc [autodetect] --disable-libswscale_a disable static libswscale [autodetect] --disable-libavutil_so disable shared libavutil [autodetect] --disable-libavcodec_so disable shared libavcodec [autodetect] + --disable-libavcore_so disable shared libavcore [autodetect] --disable-libavformat_so disable shared libavformat [autodetect] --disable-libpostproc_so disable shared libpostproc [autodetect] --disable-libswscale_so disable shared libswscale [autodetect] @@ -585,6 +587,7 @@ _libavutil_a=auto _libavutil_so=auto _libavcodec_a=auto _libavcore_a=auto +_libavcore_so=auto _libopencore_amrnb=auto _libopencore_amrwb=auto libopenjpeg=auto @@ -1211,6 +1214,10 @@ for ac_option do --disable-libavcodec_a) _libavcodec_a=no ;; --enable-libavcodec_so) _libavcodec_so=yes ;; --disable-libavcodec_so) _libavcodec_so=no ;; + --enable-libavcore_a) _libavcore_a=yes ;; + --disable-libavcore_a) _libavcore_a=no ;; + --enable-libavcore_so) _libavcore_so=yes ;; + --disable-libavcore_so) _libavcore_so=no ;; --enable-libopencore_amrnb) _libopencore_amrnb=yes ;; --disable-libopencore_amrnb) _libopencore_amrnb=no ;; --enable-libopencore_amrwb) _libopencore_amrwb=yes ;;

1 0

r31883 - in trunk/libdvdcss: css.c css.h libdvdcss.c
by reimar 02 Aug '10

02 Aug '10

Author: reimar Date: Sun Aug 1 15:52:17 2010 New Revision: 31883 Log: Handle failing ioctls more gracefully for dvdcss. Also set b_scrambled and b_ioctls in the dvdcss_test function instead of both in and outside it and in case of b_scrambled forgetting to set it half of the time. Modified: trunk/libdvdcss/css.c trunk/libdvdcss/css.h trunk/libdvdcss/libdvdcss.c Modified: trunk/libdvdcss/css.c ============================================================================== --- trunk/libdvdcss/css.c Sun Aug 1 15:30:26 2010 (r31882) +++ trunk/libdvdcss/css.c Sun Aug 1 15:52:17 2010 (r31883) @@ -90,57 +90,48 @@ static int AttackPadding ( uint8_t co /***************************************************************************** * _dvdcss_test: check if the disc is encrypted or not ***************************************************************************** - * Return values: - * 1: DVD is scrambled but can be read - * 0: DVD is not scrambled and can be read - * -1: could not get "copyright" information - * -3: drive is RPC-II, region is not set, and DVD is scrambled: the RPC - * scheme will prevent us from reading the scrambled data + * Sets b_scrambled, b_ioctl *****************************************************************************/ -int _dvdcss_test( dvdcss_t dvdcss ) +void _dvdcss_test( dvdcss_t dvdcss ) { char const *psz_type, *psz_rpc; int i_ret, i_copyright, i_type, i_mask, i_rpc; i_ret = ioctl_ReadCopyright( dvdcss->i_fd, 0 /* i_layer */, &i_copyright ); -#ifdef WIN32 if( i_ret < 0 ) { /* Maybe we didn't have enough privileges to read the copyright * (see ioctl_ReadCopyright comments). * Apparently, on unencrypted DVDs _dvdcss_disckey() always fails, so * we can check this as a workaround. */ +#ifdef WIN32 i_ret = 0; +#else + /* Since it's the first ioctl we try to issue, we add a notice */ + print_error( dvdcss, "css error: could not get \"copyright\"" + " information, make sure there is a DVD in the drive," + " and that you have used the correct device node." ); + /* Try without ioctls */ + dvdcss->b_ioctls = 0; +#endif i_copyright = 1; if( _dvdcss_disckey( dvdcss ) < 0 ) { i_copyright = 0; } } -#endif - - if( i_ret < 0 ) - { - /* Since it's the first ioctl we try to issue, we add a notice */ - print_error( dvdcss, "css error: could not get \"copyright\"" - " information, make sure there is a DVD in the drive," - " and that you have used the correct device node." ); - - return -1; - } print_debug( dvdcss, "disc reports copyright information 0x%x", i_copyright ); + dvdcss->b_scrambled = i_copyright; i_ret = ioctl_ReportRPC( dvdcss->i_fd, &i_type, &i_mask, &i_rpc); if( i_ret < 0 ) { - print_error( dvdcss, "css error: could not get RPC status" ); - // do not return an error, the drive might be a region-free one - // and we definitely should not just fail for that case. - return i_copyright ? 1 : 0; + print_error( dvdcss, "css error: could not get RPC status, region-free drive?" ); + return; } switch( i_rpc ) @@ -166,10 +157,7 @@ int _dvdcss_test( dvdcss_t dvdcss ) { print_error( dvdcss, "css error: drive will prevent access to " "scrambled data" ); - return -3; } - - return i_copyright ? 1 : 0; } /***************************************************************************** Modified: trunk/libdvdcss/css.h ============================================================================== --- trunk/libdvdcss/css.h Sun Aug 1 15:30:26 2010 (r31882) +++ trunk/libdvdcss/css.h Sun Aug 1 15:52:17 2010 (r31883) @@ -48,7 +48,7 @@ typedef struct css_s /***************************************************************************** * Prototypes in css.c *****************************************************************************/ -int _dvdcss_test ( dvdcss_t ); +void _dvdcss_test ( dvdcss_t ); int _dvdcss_title ( dvdcss_t, int ); int _dvdcss_disckey ( dvdcss_t ); int _dvdcss_titlekey ( dvdcss_t, int , dvd_key_t ); Modified: trunk/libdvdcss/libdvdcss.c ============================================================================== --- trunk/libdvdcss/libdvdcss.c Sun Aug 1 15:30:26 2010 (r31882) +++ trunk/libdvdcss/libdvdcss.c Sun Aug 1 15:52:17 2010 (r31883) @@ -366,27 +366,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( if( dvdcss->b_ioctls ) { - i_ret = _dvdcss_test( dvdcss ); - - if( i_ret == -3 ) - { - print_debug( dvdcss, "scrambled disc on a region-free RPC-II " - "drive: possible failure, but continuing " - "anyway" ); - } - else if( i_ret < 0 ) - { - /* Disable the CSS ioctls and hope that it works? */ - print_debug( dvdcss, - "could not check whether the disc was scrambled" ); - dvdcss->b_ioctls = 0; - } - else - { - print_debug( dvdcss, i_ret ? "disc is scrambled" - : "disc is unscrambled" ); - dvdcss->b_scrambled = i_ret; - } + _dvdcss_test( dvdcss ); } /* If disc is CSS protected and the ioctls work, authenticate the drive */

3 2

r31872 - trunk/etc/codecs.conf
by compn 02 Aug '10

02 Aug '10

Author: compn Date: Sat Jul 31 15:47:47 2010 New Revision: 31872 Log: add binary expression codec for fourcc MTS2 Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Fri Jul 30 20:28:02 2010 (r31871) +++ trunk/etc/codecs.conf Sat Jul 31 15:47:47 2010 (r31872) @@ -1265,6 +1265,16 @@ videocodec wms10dmod guid 0x7bafb3b1, 0xd8f4, 0x4279, 0x92, 0x53, 0x27, 0xda, 0x42, 0x31, 0x08, 0xde out BGR32,BGR24,BGR16 +videocodec eescreen + info "expression encoder" + comment "requires xp or newer and msvcr100.dll" + status working + fourcc MTS2 + driver dmo + dll "Microsoft.Expression.Encoder.EEScreen.Codec.dll" + guid 0x9a6e798c, 0x00ba, 0x478c, 0x8d, 0x64, 0x88, 0xf2, 0xe5, 0xb2, 0x5c, 0x1a + out BGR32,BGR24,BGR16 ;,BGR15 + videocodec gotomeeting info "GoToMeeting codec" status working

2 1

r31895 - trunk/stream/stream_dvd.c
by diego 01 Aug '10

01 Aug '10

Author: diego Date: Mon Aug 2 00:53:09 2010 New Revision: 31895 Log: dvd: Improve seeking by position. The current code takes the angle into account. This is a mistake since the position is independent of the angle. patch by Olivier Rolland, billl users.sourceforge net Modified: trunk/stream/stream_dvd.c Modified: trunk/stream/stream_dvd.c ============================================================================== --- trunk/stream/stream_dvd.c Mon Aug 2 00:51:15 2010 (r31894) +++ trunk/stream/stream_dvd.c Mon Aug 2 00:53:09 2010 (r31895) @@ -380,24 +380,17 @@ static void dvd_seek(dvd_priv_t *d, int d->cur_pack<d->cur_pgc->cell_playback[ d->cur_cell ].first_sector) { // ok, cell change, find the right cell! - d->cur_cell=0; - if(d->cur_pgc->cell_playback[d->cur_cell].block_type == BLOCK_TYPE_ANGLE_BLOCK ) - d->cur_cell+=dvd_angle; - - while(1) { - int next; - d->cell_last_pack=d->cur_pgc->cell_playback[ d->cur_cell ].last_sector; - if(d->cur_pack<d->cur_pgc->cell_playback[ d->cur_cell ].first_sector) { - d->cur_pack=d->cur_pgc->cell_playback[ d->cur_cell ].first_sector; + cell_playback_t *cell; + for(d->cur_cell=0; d->cur_cell < d->cur_pgc->nr_of_cells; d->cur_cell++) { + cell = &(d->cur_pgc->cell_playback[d->cur_cell]); + if(cell->block_type == BLOCK_TYPE_ANGLE_BLOCK && cell->block_mode != BLOCK_MODE_FIRST_CELL) + continue; + d->cell_last_pack=cell->last_sector; + if(d->cur_pack<cell->first_sector) { + d->cur_pack=cell->first_sector; break; } if(d->cur_pack<=d->cell_last_pack) break; // ok, we find it! :) - next=dvd_next_cell(d); - if(next<0) { - //d->cur_pack=d->cell_last_pack+1; - break; // we're after the last cell - } - d->cur_cell=next; } }

1 0

r31894 - trunk/stream/stream_dvd.c
by diego 01 Aug '10

01 Aug '10

Author: diego Date: Mon Aug 2 00:51:15 2010 New Revision: 31894 Log: dvd: Improve seeking by chapters. The current code seeks to the start of the chapter. From this position, it then tries to figure out the starting cell. This is completely suboptimal and error prone since the starting cell can be directly deduced from the chapter. patch by Olivier Rolland, billl users.sourceforge net Modified: trunk/stream/stream_dvd.c Modified: trunk/stream/stream_dvd.c ============================================================================== --- trunk/stream/stream_dvd.c Mon Aug 2 00:48:01 2010 (r31893) +++ trunk/stream/stream_dvd.c Mon Aug 2 00:51:15 2010 (r31894) @@ -507,7 +507,7 @@ static int get_num_chapter(ifo_handle_t static int seek_to_chapter(stream_t *stream, ifo_handle_t *vts_file, tt_srpt_t *tt_srpt, int title_no, int chapter) { - int cell; + dvd_priv_t *d = stream->priv; ptt_info_t ptt; pgc_t *pgc; off_t pos; @@ -530,11 +530,18 @@ static int seek_to_chapter(stream_t *str ptt = vts_file->vts_ptt_srpt->title[title_no].ptt[chapter]; pgc = vts_file->vts_pgcit->pgci_srp[ptt.pgcn-1].pgc; - cell = pgc->program_map[ptt.pgn - 1] - 1; - pos = (off_t) pgc->cell_playback[cell].first_sector * 2048; + d->cur_cell = pgc->program_map[ptt.pgn - 1] - 1; + if(pgc->cell_playback[d->cur_cell].block_type == BLOCK_TYPE_ANGLE_BLOCK) + d->cur_cell += dvd_angle; + d->cur_pack = pgc->cell_playback[d->cur_cell].first_sector; + d->cell_last_pack = pgc->cell_playback[d->cur_cell].last_sector; + + d->packs_left = -1; + d->angle_seek = 0; + + pos = (off_t) d->cur_pack * 2048; mp_msg(MSGT_OPEN,MSGL_V,"\r\nSTREAM_DVD, seeked to chapter: %d, cell: %u, pos: %"PRIu64"\n", - chapter, pgc->cell_playback[cell].first_sector, pos); - stream_seek(stream, pos); + chapter, d->cur_pack, pos); return chapter; }

1 0

r31893 - trunk/stream/stream_dvd.c
by diego 01 Aug '10

01 Aug '10

Author: diego Date: Mon Aug 2 00:48:01 2010 New Revision: 31893 Log: Fix the incorrect assumption that the number of chapters of a DVD title is equal to the number of cells. patch by Olivier Rolland, billl users.sourceforge net Modified: trunk/stream/stream_dvd.c Modified: trunk/stream/stream_dvd.c ============================================================================== --- trunk/stream/stream_dvd.c Sun Aug 1 23:06:51 2010 (r31892) +++ trunk/stream/stream_dvd.c Mon Aug 2 00:48:01 2010 (r31893) @@ -93,7 +93,7 @@ int dvd_parse_chapter_range(const m_opti dvd_chapter = 1; dvd_last_chapter = 0; if(*range && isdigit(*range)) { - dvd_chapter = strtol(range, &s, 10); + dvd_chapter = strtol(range, (char **) &s, 10); if(range == s) { mp_msg(MSGT_OPEN, MSGL_ERR, MSGTR_DVDinvalidChapterRange, range); return M_OPT_INVALID; @@ -488,6 +488,23 @@ static int mp_describe_titleset(dvd_read return 1; } +static int get_num_chapter(ifo_handle_t *vts_file, tt_srpt_t *tt_srpt, int title_no) +{ + if(!vts_file || !tt_srpt) + return 0; + + if(title_no < 0 || title_no >= tt_srpt->nr_of_srpts) + return 0; + + // map global title to vts title + title_no = tt_srpt->title[title_no].vts_ttn - 1; + + if(title_no < 0 || title_no >= vts_file->vts_ptt_srpt->nr_of_srpts) + return 0; + + return vts_file->vts_ptt_srpt->title[title_no].nr_of_ptts; +} + static int seek_to_chapter(stream_t *stream, ifo_handle_t *vts_file, tt_srpt_t *tt_srpt, int title_no, int chapter) { int cell; @@ -522,27 +539,36 @@ static int seek_to_chapter(stream_t *str return chapter; } -static void list_chapters(pgc_t *pgc) +static void list_chapters(ifo_handle_t *vts_file, tt_srpt_t *tt_srpt, int title_no) { - unsigned int i, cell; + unsigned int i, cell, last_cell; unsigned int t=0, t2=0; + ptt_info_t *ptt; + pgc_t *pgc; - if(pgc->nr_of_programs < 2) + title_no = tt_srpt->title[title_no].vts_ttn - 1; + if(vts_file->vts_ptt_srpt->title[title_no].nr_of_ptts < 2) return; + ptt = vts_file->vts_ptt_srpt->title[title_no].ptt; mp_msg(MSGT_IDENTIFY, MSGL_INFO, "CHAPTERS: "); - for(i=0; i<pgc->nr_of_programs; i++) + for(i=0; i<vts_file->vts_ptt_srpt->title[title_no].nr_of_ptts; i++) { - cell = pgc->program_map[i]; //here the cell is 1-based + pgc = vts_file->vts_pgcit->pgci_srp[ptt[i].pgcn-1].pgc; + cell = pgc->program_map[ptt[i].pgn-1]; //here the cell is 1-based + if(ptt[i].pgn<pgc->nr_of_programs) + last_cell = pgc->program_map[ptt[i].pgn]; + else + last_cell = 0; t2 = t/1000; mp_msg(MSGT_IDENTIFY, MSGL_INFO, "%02d:%02d:%02d,", t2/3600, (t2/60)%60, t2%60); - while(i+1<pgc->nr_of_programs && cell < pgc->program_map[i+1]) { + do { if(!(pgc->cell_playback[cell-1].block_type == BLOCK_TYPE_ANGLE_BLOCK && pgc->cell_playback[cell-1].block_mode != BLOCK_MODE_FIRST_CELL) ) t += mp_dvdtimetomsec(&pgc->cell_playback[cell-1].playback_time); cell++; - } + } while(cell < last_cell); } mp_msg(MSGT_IDENTIFY, MSGL_INFO, "\n"); } @@ -642,8 +668,10 @@ static int control(stream_t *stream,int } case STREAM_CTRL_GET_NUM_CHAPTERS: { - if(! d->cur_pgc->nr_of_programs) return STREAM_UNSUPPORTED; - *((unsigned int *)arg) = d->cur_pgc->nr_of_programs; + int r; + r = get_num_chapter(d->vts_file, d->tt_srpt, d->cur_title-1); + if(! r) return STREAM_UNSUPPORTED; + *((unsigned int *)arg) = r; return 1; } case STREAM_CTRL_SEEK_TO_CHAPTER: @@ -991,7 +1019,7 @@ static int open_s(stream_t *stream,int m return STREAM_UNSUPPORTED; for(k=0; k<d->cur_pgc->nr_of_cells; k++) d->cell_times_table[k] = mp_dvdtimetomsec(&d->cur_pgc->cell_playback[k].playback_time); - list_chapters(d->cur_pgc); + list_chapters(vts_file,tt_srpt,dvd_title); // ... (unimplemented) // return NULL;

1 0

r31892 - trunk/mp3lib/sr1.c
by diego 01 Aug '10

01 Aug '10

Author: diego Date: Sun Aug 1 23:06:51 2010 New Revision: 31892 Log: Remove unnecessary #undef (f)printf. Modified: trunk/mp3lib/sr1.c Modified: trunk/mp3lib/sr1.c ============================================================================== --- trunk/mp3lib/sr1.c Sun Aug 1 23:04:20 2010 (r31891) +++ trunk/mp3lib/sr1.c Sun Aug 1 23:06:51 2010 (r31892) @@ -24,9 +24,6 @@ #include "libavutil/common.h" -#undef fprintf -#undef printf - #if ARCH_X86_64 // 3DNow! and 3DNow!Ext routines don't compile under AMD64 #undef HAVE_AMD3DNOW

1 0

r31891 - in trunk/mp3lib: dct64_sse.c sr1.c
by diego 01 Aug '10

01 Aug '10

Author: diego Date: Sun Aug 1 23:04:20 2010 New Revision: 31891 Log: Remove unnecessary libavutil/internal.h #includes. Modified: trunk/mp3lib/dct64_sse.c trunk/mp3lib/sr1.c Modified: trunk/mp3lib/dct64_sse.c ============================================================================== --- trunk/mp3lib/dct64_sse.c Sun Aug 1 22:10:42 2010 (r31890) +++ trunk/mp3lib/dct64_sse.c Sun Aug 1 23:04:20 2010 (r31891) @@ -6,7 +6,6 @@ */ #include "libavutil/mem.h" -#include "libavutil/internal.h" #include "mpg123.h" extern float __attribute__((aligned(16))) costab_mmx[]; Modified: trunk/mp3lib/sr1.c ============================================================================== --- trunk/mp3lib/sr1.c Sun Aug 1 22:10:42 2010 (r31890) +++ trunk/mp3lib/sr1.c Sun Aug 1 23:04:20 2010 (r31891) @@ -23,7 +23,6 @@ #include "libvo/fastmemcpy.h" #include "libavutil/common.h" -#include "libavutil/internal.h" #undef fprintf #undef printf

1 0

r31890 - in branches/1.0rc4/libdvdcss: . css.c css.h libdvdcss.c
by siretart 01 Aug '10

01 Aug '10

Author: siretart Date: Sun Aug 1 22:10:42 2010 New Revision: 31890 Log: Sync libdvdcss/ directory to r31884 from trunk Modified: branches/1.0rc4/libdvdcss/ (props changed) branches/1.0rc4/libdvdcss/css.c branches/1.0rc4/libdvdcss/css.h branches/1.0rc4/libdvdcss/libdvdcss.c Modified: branches/1.0rc4/libdvdcss/css.c ============================================================================== --- branches/1.0rc4/libdvdcss/css.c Sun Aug 1 19:51:28 2010 (r31889) +++ branches/1.0rc4/libdvdcss/css.c Sun Aug 1 22:10:42 2010 (r31890) @@ -90,56 +90,48 @@ static int AttackPadding ( uint8_t co /***************************************************************************** * _dvdcss_test: check if the disc is encrypted or not ***************************************************************************** - * Return values: - * 1: DVD is scrambled but can be read - * 0: DVD is not scrambled and can be read - * -1: could not get "copyright" information - * -2: could not get RPC information (reading the disc might be possible) - * -3: drive is RPC-II, region is not set, and DVD is scrambled: the RPC - * scheme will prevent us from reading the scrambled data + * Sets b_scrambled, b_ioctls *****************************************************************************/ -int _dvdcss_test( dvdcss_t dvdcss ) +void _dvdcss_test( dvdcss_t dvdcss ) { char const *psz_type, *psz_rpc; int i_ret, i_copyright, i_type, i_mask, i_rpc; i_ret = ioctl_ReadCopyright( dvdcss->i_fd, 0 /* i_layer */, &i_copyright ); -#ifdef WIN32 if( i_ret < 0 ) { /* Maybe we didn't have enough privileges to read the copyright * (see ioctl_ReadCopyright comments). * Apparently, on unencrypted DVDs _dvdcss_disckey() always fails, so * we can check this as a workaround. */ +#ifdef WIN32 i_ret = 0; +#else + /* Since it's the first ioctl we try to issue, we add a notice */ + print_error( dvdcss, "css error: could not get \"copyright\"" + " information, make sure there is a DVD in the drive," + " and that you have used the correct device node." ); + /* Try without ioctls */ + dvdcss->b_ioctls = 0; +#endif i_copyright = 1; if( _dvdcss_disckey( dvdcss ) < 0 ) { i_copyright = 0; } } -#endif - - if( i_ret < 0 ) - { - /* Since it's the first ioctl we try to issue, we add a notice */ - print_error( dvdcss, "css error: could not get \"copyright\"" - " information, make sure there is a DVD in the drive," - " and that you have used the correct device node." ); - - return -1; - } print_debug( dvdcss, "disc reports copyright information 0x%x", i_copyright ); + dvdcss->b_scrambled = i_copyright; i_ret = ioctl_ReportRPC( dvdcss->i_fd, &i_type, &i_mask, &i_rpc); if( i_ret < 0 ) { - print_error( dvdcss, "css error: could not get RPC status" ); - return -2; + print_error( dvdcss, "css error: could not get RPC status, region-free drive?" ); + return; } switch( i_rpc ) @@ -165,10 +157,7 @@ int _dvdcss_test( dvdcss_t dvdcss ) { print_error( dvdcss, "css error: drive will prevent access to " "scrambled data" ); - return -3; } - - return i_copyright ? 1 : 0; } /***************************************************************************** Modified: branches/1.0rc4/libdvdcss/css.h ============================================================================== --- branches/1.0rc4/libdvdcss/css.h Sun Aug 1 19:51:28 2010 (r31889) +++ branches/1.0rc4/libdvdcss/css.h Sun Aug 1 22:10:42 2010 (r31890) @@ -48,7 +48,7 @@ typedef struct css_s /***************************************************************************** * Prototypes in css.c *****************************************************************************/ -int _dvdcss_test ( dvdcss_t ); +void _dvdcss_test ( dvdcss_t ); int _dvdcss_title ( dvdcss_t, int ); int _dvdcss_disckey ( dvdcss_t ); int _dvdcss_titlekey ( dvdcss_t, int , dvd_key_t ); Modified: branches/1.0rc4/libdvdcss/libdvdcss.c ============================================================================== --- branches/1.0rc4/libdvdcss/libdvdcss.c Sun Aug 1 19:51:28 2010 (r31889) +++ branches/1.0rc4/libdvdcss/libdvdcss.c Sun Aug 1 22:10:42 2010 (r31890) @@ -366,27 +366,7 @@ LIBDVDCSS_EXPORT dvdcss_t dvdcss_open ( if( dvdcss->b_ioctls ) { - i_ret = _dvdcss_test( dvdcss ); - - if( i_ret == -3 ) - { - print_debug( dvdcss, "scrambled disc on a region-free RPC-II " - "drive: possible failure, but continuing " - "anyway" ); - } - else if( i_ret < 0 ) - { - /* Disable the CSS ioctls and hope that it works? */ - print_debug( dvdcss, - "could not check whether the disc was scrambled" ); - dvdcss->b_ioctls = 0; - } - else - { - print_debug( dvdcss, i_ret ? "disc is scrambled" - : "disc is unscrambled" ); - dvdcss->b_scrambled = i_ret; - } + _dvdcss_test( dvdcss ); } /* If disc is CSS protected and the ioctls work, authenticate the drive */

1 0

r31889 - trunk/libmpdemux/demux_lavf.c
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 19:51:28 2010 New Revision: 31889 Log: Update for libavformat matroska demuxer name change. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Sun Aug 1 19:38:28 2010 (r31888) +++ trunk/libmpdemux/demux_lavf.c Sun Aug 1 19:51:28 2010 (r31889) @@ -210,7 +210,7 @@ static const char * const preferred_list "gxf", "nut", "nuv", - "matroska", + "matroska,webm", "mov,mp4,m4a,3gp,3g2,mj2", "mpc", "mpc8",

1 0

r31888 - trunk/libvo/vo_gl.c
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 19:38:28 2010 New Revision: 31888 Log: Reindent. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sun Aug 1 19:37:38 2010 (r31887) +++ trunk/libvo/vo_gl.c Sun Aug 1 19:38:28 2010 (r31888) @@ -762,33 +762,33 @@ static void do_render_osd(int type) { int draw_eosd = (type & RENDER_EOSD) && eosdDispList; if (!draw_osd && !draw_eosd) return; - // set special rendering parameters - if (!scaled_osd) { - mpglMatrixMode(GL_PROJECTION); - mpglPushMatrix(); - mpglLoadIdentity(); - mpglOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1); - } - mpglEnable(GL_BLEND); - if (draw_eosd) { - mpglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - mpglCallList(eosdDispList); - } - if (draw_osd) { - mpglColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24)); - // draw OSD + // set special rendering parameters + if (!scaled_osd) { + mpglMatrixMode(GL_PROJECTION); + mpglPushMatrix(); + mpglLoadIdentity(); + mpglOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1); + } + mpglEnable(GL_BLEND); + if (draw_eosd) { + mpglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + mpglCallList(eosdDispList); + } + if (draw_osd) { + mpglColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24)); + // draw OSD #ifndef FAST_OSD - mpglBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA); - mpglCallLists(osdtexCnt, GL_UNSIGNED_INT, osdaDispList); + mpglBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA); + mpglCallLists(osdtexCnt, GL_UNSIGNED_INT, osdaDispList); #endif - mpglBlendFunc(GL_SRC_ALPHA, GL_ONE); - mpglCallLists(osdtexCnt, GL_UNSIGNED_INT, osdDispList); - } - // set rendering parameters back to defaults - mpglDisable(GL_BLEND); - if (!scaled_osd) - mpglPopMatrix(); - mpglBindTexture(gl_target, 0); + mpglBlendFunc(GL_SRC_ALPHA, GL_ONE); + mpglCallLists(osdtexCnt, GL_UNSIGNED_INT, osdDispList); + } + // set rendering parameters back to defaults + mpglDisable(GL_BLEND); + if (!scaled_osd) + mpglPopMatrix(); + mpglBindTexture(gl_target, 0); } static void draw_osd(void)

1 0

r31887 - trunk/libvo/vo_gl.c
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 19:37:38 2010 New Revision: 31887 Log: Use early return instead of large if block. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sun Aug 1 19:36:15 2010 (r31886) +++ trunk/libvo/vo_gl.c Sun Aug 1 19:37:38 2010 (r31887) @@ -760,7 +760,8 @@ static void create_osd_texture(int x0, i static void do_render_osd(int type) { int draw_osd = (type & RENDER_OSD) && osdtexCnt > 0; int draw_eosd = (type & RENDER_EOSD) && eosdDispList; - if (draw_osd || draw_eosd) { + if (!draw_osd && !draw_eosd) + return; // set special rendering parameters if (!scaled_osd) { mpglMatrixMode(GL_PROJECTION); @@ -788,7 +789,6 @@ static void do_render_osd(int type) { if (!scaled_osd) mpglPopMatrix(); mpglBindTexture(gl_target, 0); - } } static void draw_osd(void)

1 0

r31886 - trunk/libvo/vo_gl.c
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 19:36:15 2010 New Revision: 31886 Log: More readable OSD rendering code. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sun Aug 1 15:58:35 2010 (r31885) +++ trunk/libvo/vo_gl.c Sun Aug 1 19:36:15 2010 (r31886) @@ -751,11 +751,16 @@ static void create_osd_texture(int x0, i osdtexCnt++; } +#define RENDER_OSD 1 +#define RENDER_EOSD 2 + /** * \param type bit 0: render OSD, bit 1: render EOSD */ static void do_render_osd(int type) { - if (((type & 1) && osdtexCnt > 0) || ((type & 2) && eosdDispList)) { + int draw_osd = (type & RENDER_OSD) && osdtexCnt > 0; + int draw_eosd = (type & RENDER_EOSD) && eosdDispList; + if (draw_osd || draw_eosd) { // set special rendering parameters if (!scaled_osd) { mpglMatrixMode(GL_PROJECTION); @@ -764,11 +769,11 @@ static void do_render_osd(int type) { mpglOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1); } mpglEnable(GL_BLEND); - if ((type & 2) && eosdDispList) { + if (draw_eosd) { mpglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); mpglCallList(eosdDispList); } - if ((type & 1) && osdtexCnt > 0) { + if (draw_osd) { mpglColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24)); // draw OSD #ifndef FAST_OSD @@ -797,7 +802,7 @@ static void draw_osd(void) vo_draw_text_ext(osd_w, osd_h, ass_border_x, ass_border_y, ass_border_x, ass_border_y, image_width, image_height, create_osd_texture); } - if (vo_doublebuffering) do_render_osd(1); + if (vo_doublebuffering) do_render_osd(RENDER_OSD); } static void do_render(void) { @@ -840,14 +845,14 @@ static void flip_page(void) { mpglClear(GL_COLOR_BUFFER_BIT); } else { do_render(); - do_render_osd(3); + do_render_osd(RENDER_OSD | RENDER_EOSD); if (use_glFinish) mpglFinish(); else mpglFlush(); } } static void redraw(void) { - if (vo_doublebuffering) { do_render(); do_render_osd(3); } + if (vo_doublebuffering) { do_render(); do_render_osd(RENDER_OSD | RENDER_EOSD); } flip_page(); } @@ -1314,7 +1319,7 @@ static int control(uint32_t request, voi if (!data) return VO_FALSE; genEOSD(data); - if (vo_doublebuffering) do_render_osd(2); + if (vo_doublebuffering) do_render_osd(RENDER_EOSD); return VO_TRUE; case VOCTRL_GET_EOSD_RES: {

1 0

r31885 - trunk/cfg-common.h
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 15:58:35 2010 New Revision: 31885 Log: Also allow setting msglevel for MSGT_FIXME. Modified: trunk/cfg-common.h Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h Sun Aug 1 15:53:04 2010 (r31884) +++ trunk/cfg-common.h Sun Aug 1 15:58:35 2010 (r31885) @@ -238,6 +238,7 @@ const m_option_t msgl_config[]={ { "identify", &mp_msg_levels[MSGT_IDENTIFY], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, { "ass", &mp_msg_levels[MSGT_ASS], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, { "statusline", &mp_msg_levels[MSGT_STATUSLINE], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, + { "fixme", &mp_msg_levels[MSGT_FIXME], CONF_TYPE_INT, CONF_RANGE, -1, 9, NULL }, {"help", "Available msg modules:\n" " global - common player errors/information\n" " cplayer - console player (mplayer.c)\n" @@ -283,6 +284,7 @@ const m_option_t msgl_config[]={ " identify - identify output\n" " ass - libass messages\n" " statusline - playback/encoding status line\n" + " fixme - messages not yet fixed to map to module\n" "\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL}

1 0

r31884 - trunk/libdvdcss/css.c
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 15:53:04 2010 New Revision: 31884 Log: Fix typo in documentation. Modified: trunk/libdvdcss/css.c Modified: trunk/libdvdcss/css.c ============================================================================== --- trunk/libdvdcss/css.c Sun Aug 1 15:52:17 2010 (r31883) +++ trunk/libdvdcss/css.c Sun Aug 1 15:53:04 2010 (r31884) @@ -90,7 +90,7 @@ static int AttackPadding ( uint8_t co /***************************************************************************** * _dvdcss_test: check if the disc is encrypted or not ***************************************************************************** - * Sets b_scrambled, b_ioctl + * Sets b_scrambled, b_ioctls *****************************************************************************/ void _dvdcss_test( dvdcss_t dvdcss ) {

1 0

r31882 - trunk/command.c
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 15:30:26 2010 New Revision: 31882 Log: Fix subtitle selection: make selecting -sid 0 work again by replacing the M_PROPERTY_STEP_UP hack by M_PROPERTY_SET and set the global sub pos also when we do not yet have a subtitle stream but do know the number of subs from out-of-band as e.g. for DVD. Modified: trunk/command.c Modified: trunk/command.c ============================================================================== --- trunk/command.c Sun Aug 1 14:48:38 2010 (r31881) +++ trunk/command.c Sun Aug 1 15:30:26 2010 (r31882) @@ -159,10 +159,16 @@ static void update_global_sub_size(MPCon mpctx->global_sub_size += mpctx->sub_counts[i]; // update global_sub_pos if we auto-detected a demuxer sub - if (mpctx->global_sub_pos == -1 && - mpctx->demuxer->sub && mpctx->demuxer->sub->id >= 0) - mpctx->global_sub_pos = sub_pos_by_source(mpctx, SUB_SOURCE_DEMUX) + - mpctx->demuxer->sub->id; + if (mpctx->global_sub_pos == -1) { + int sub_id = -1; + if (mpctx->demuxer->sub) + sub_id = mpctx->demuxer->sub->id; + if (sub_id < 0) + sub_id = dvdsub_id; + if (sub_id >= 0 && sub_id < mpctx->sub_counts[SUB_SOURCE_DEMUX]) + mpctx->global_sub_pos = sub_pos_by_source(mpctx, SUB_SOURCE_DEMUX) + + sub_id; + } } /** @@ -1666,7 +1672,7 @@ static int mp_property_sub_source(m_opti static int mp_property_sub_by_type(m_option_t *prop, int action, void *arg, MPContext *mpctx) { - int source, is_cur_source, offset; + int source, is_cur_source, offset, new_pos; update_global_sub_size(mpctx); if (!mpctx->sh_video || mpctx->global_sub_size <= 0) return M_PROPERTY_UNAVAILABLE; @@ -1685,6 +1691,7 @@ static int mp_property_sub_by_type(m_opt return M_PROPERTY_UNAVAILABLE; is_cur_source = sub_source(mpctx) == source; + new_pos = mpctx->global_sub_pos; switch (action) { case M_PROPERTY_GET: if (!arg) @@ -1713,14 +1720,14 @@ static int mp_property_sub_by_type(m_opt int index = *(int *)arg; if (source == SUB_SOURCE_VOBSUB) index = vobsub_get_index_by_id(vo_vobsub, index); - mpctx->global_sub_pos = offset + index; + new_pos = offset + index; if (index < 0 || index > mpctx->sub_counts[source]) { - mpctx->global_sub_pos = -1; + new_pos = -1; *(int *) arg = -1; } } else - mpctx->global_sub_pos = -1; + new_pos = -1; break; case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_DOWN: { @@ -1729,27 +1736,27 @@ static int mp_property_sub_by_type(m_opt int step = (step_all > 0) ? 1 : -1; int max_sub_pos_for_source = -1; if (!is_cur_source) - mpctx->global_sub_pos = -1; + new_pos = -1; while (step_all) { - if (mpctx->global_sub_pos == -1) { + if (new_pos == -1) { if (step > 0) - mpctx->global_sub_pos = offset; + new_pos = offset; else if (max_sub_pos_for_source == -1) { // Find max pos for specific source - mpctx->global_sub_pos = mpctx->global_sub_size - 1; - while (mpctx->global_sub_pos >= 0 + new_pos = mpctx->global_sub_size - 1; + while (new_pos >= 0 && sub_source(mpctx) != source) - --mpctx->global_sub_pos; + new_pos--; } else - mpctx->global_sub_pos = max_sub_pos_for_source; + new_pos = max_sub_pos_for_source; } else { - mpctx->global_sub_pos += step; - if (mpctx->global_sub_pos < offset || - mpctx->global_sub_pos >= mpctx->global_sub_size || + new_pos += step; + if (new_pos < offset || + new_pos >= mpctx->global_sub_size || sub_source(mpctx) != source) - mpctx->global_sub_pos = -1; + new_pos = -1; } step_all -= step; } @@ -1758,8 +1765,7 @@ static int mp_property_sub_by_type(m_opt default: return M_PROPERTY_NOT_IMPLEMENTED; } - --mpctx->global_sub_pos; - return mp_property_sub(prop, M_PROPERTY_STEP_UP, NULL, mpctx); + return mp_property_sub(prop, M_PROPERTY_SET, &new_pos, mpctx); } /// Subtitle delay (RW)

1 0

r31881 - trunk/libdvdcss/css.c
by reimar 01 Aug '10

01 Aug '10

Author: reimar Date: Sun Aug 1 14:48:38 2010 New Revision: 31881 Log: Fix DVD playback with region-free drives. Modified: trunk/libdvdcss/css.c Modified: trunk/libdvdcss/css.c ============================================================================== --- trunk/libdvdcss/css.c Sun Aug 1 00:15:49 2010 (r31880) +++ trunk/libdvdcss/css.c Sun Aug 1 14:48:38 2010 (r31881) @@ -94,7 +94,6 @@ static int AttackPadding ( uint8_t co * 1: DVD is scrambled but can be read * 0: DVD is not scrambled and can be read * -1: could not get "copyright" information - * -2: could not get RPC information (reading the disc might be possible) * -3: drive is RPC-II, region is not set, and DVD is scrambled: the RPC * scheme will prevent us from reading the scrambled data *****************************************************************************/ @@ -139,7 +138,9 @@ int _dvdcss_test( dvdcss_t dvdcss ) if( i_ret < 0 ) { print_error( dvdcss, "css error: could not get RPC status" ); - return -2; + // do not return an error, the drive might be a region-free one + // and we definitely should not just fail for that case. + return i_copyright ? 1 : 0; } switch( i_rpc )

1 0