October 2003 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libmpcodecs vf_spp.c,1.5,1.6
by Michael Niedermayer CVS 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv5201 Modified Files: vf_spp.c Log Message: change offsets (quality 2-4 looks better now) Index: vf_spp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- vf_spp.c 27 Oct 2003 21:12:29 -0000 1.5 +++ vf_spp.c 27 Oct 2003 22:25:28 -0000 1.6 @@ -58,7 +58,20 @@ { 42, 26, 38, 22, 41, 25, 37, 21, }, }; -const uint8_t offset[64][2]= { +const uint8_t offset[127][2]= { +{0,0}, +{0,0}, {4,4}, +{0,0}, {2,2}, {6,4}, {4,6}, +{0,0}, {5,1}, {2,2}, {7,3}, {4,4}, {1,5}, {6,6}, {3,7}, + +{0,0}, {4,0}, {1,1}, {5,1}, {3,2}, {7,2}, {2,3}, {6,3}, +{0,4}, {4,4}, {1,5}, {5,5}, {3,6}, {7,6}, {2,7}, {6,7}, + +{0,0}, {0,2}, {0,4}, {0,6}, {1,1}, {1,3}, {1,5}, {1,7}, +{2,0}, {2,2}, {2,4}, {2,6}, {3,1}, {3,3}, {3,5}, {3,7}, +{4,0}, {4,2}, {4,4}, {4,6}, {5,1}, {5,3}, {5,5}, {5,7}, +{6,0}, {6,2}, {6,4}, {6,6}, {7,1}, {7,3}, {7,5}, {7,7}, + {0,0}, {4,4}, {0,4}, {4,0}, {2,2}, {6,6}, {2,6}, {6,2}, {0,2}, {4,6}, {0,6}, {4,2}, {2,0}, {6,4}, {2,4}, {6,0}, {1,1}, {5,5}, {1,5}, {5,1}, {3,3}, {7,7}, {3,7}, {7,3}, @@ -151,8 +164,8 @@ if(p->mpeg2) qp>>=1; } for(i=0; i<count; i++){ - const int x1= x + offset[i][0]; - const int y1= y + offset[i][1]; + const int x1= x + offset[i+count-1][0]; + const int y1= y + offset[i+count-1][1]; const int index= x1 + y1*stride; p->dsp.get_pixels(block, p->src + index, stride); p->dsp.fdct(block); @@ -162,7 +175,7 @@ } } } - + #define STORE(pos) \ temp= ((p->temp[index + pos]<<log2_scale) + d[pos])>>6;\ if(temp & 0x100) temp= ~(temp>>31);\

1 0

CVS: main/libvo sub.c,1.72,1.73
by Jindrich Makovicka CVS 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv30159 Modified Files: sub.c Log Message: prevent lockups on words which do not fit on the screen - temporary fix Index: sub.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/sub.c,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- sub.c 21 Oct 2003 08:45:13 -0000 1.72 +++ sub.c 27 Oct 2003 21:36:29 -0000 1.73 @@ -467,10 +467,10 @@ otp = tmp_otp = (struct osd_text_p *) calloc(1, sizeof(struct osd_text_p)); tmp_otp->ott = osl; for (tmp_ott = tmp_otp->ott; exit == 0; ) { - while ((tmp_ott != NULL) && (value + tmp_ott->osd_kerning + tmp_ott->osd_length <= xlimit)) { + do { value += tmp_ott->osd_kerning + tmp_ott->osd_length; tmp_ott = tmp_ott->next; - } + } while ((tmp_ott != NULL) && (value + tmp_ott->osd_kerning + tmp_ott->osd_length <= xlimit)); if (tmp_ott != NULL) { struct osd_text_p *tmp = (struct osd_text_p *) calloc(1, sizeof(struct osd_text_p));

1 0

CVS: main/libmpcodecs vf_spp.c,1.4,1.5
by Michael Niedermayer CVS 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv27074 Modified Files: vf_spp.c Log Message: different / faster / simpler "quantization" filtered images look like with the old quantization (to me at least) if anyone notices a difference then tell me ASAP Index: vf_spp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vf_spp.c 27 Oct 2003 19:14:38 -0000 1.4 +++ vf_spp.c 27 Oct 2003 21:12:29 -0000 1.5 @@ -86,28 +86,20 @@ static inline void requantize(DCTELEM dst[64], DCTELEM src[64], int qp, uint8_t *permutation){ int i; const int qmul= qp<<1; - const int qadd= (qp-1)|1; - const int qinv= ((1<<(SHIFT-3)) + qmul/2)/ qmul; int bias= 0; //FIXME unsigned int threshold1, threshold2; - - threshold1= (1<<SHIFT) - bias - 1; + + threshold1= qmul*((1<<3) - bias) - 1; threshold2= (threshold1<<1); memset(dst, 0, 64*sizeof(DCTELEM)); - dst[0]= (src[0] + 4)>>3;; + dst[0]= (src[0] + 4)>>3; - for(i=1; i<64; i++){ - int level= qinv*src[i]; + for(i=1; i<64; i++){ + int level= src[i]; if(((unsigned)(level+threshold1))>threshold2){ const int j= permutation[i]; - if(level>0){ - level= (bias + level)>>SHIFT; - dst[j]= level*qmul + qadd; - }else{ - level= (bias - level)>>SHIFT; - dst[j]= -level*qmul - qadd; - } + dst[j]= (level + 4)>>3; } } }

1 0

CVS: main/libvo sub.c,1.70,1.71
by Jindrich Makovicka CVS 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv6760/libvo Modified Files: sub.c Log Message: Subtitle alignment & smart splitting by Salvatore Falco Index: sub.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/sub.c,v retrieving revision 1.70 retrieving revision 1.71 diff -u -r1.70 -r1.71 --- sub.c 9 Jun 2003 00:24:49 -0000 1.70 +++ sub.c 21 Sep 2003 13:20:06 -0000 1.71 @@ -14,6 +14,29 @@ #include "sub.h" #include "../spudec.h" +#define NEW_SPLITTING + + +// Structures needed for the new splitting algorithm. +// osd_text_t contains the single subtitle word. +// osd_text_p is used to mark the lines of subtitles +struct osd_text_t { + int osd_kerning, //kerning with the previous word + osd_length, //orizontal length inside the bbox + text_length, //number of characters + *text; //characters + struct osd_text_t *prev, + *next; +}; + +struct osd_text_p { + int value; + struct osd_text_t *ott; + struct osd_text_p *prev, + *next; +}; +//^ + char * __sub_osd_names[]={ "Seekbar", "Play", @@ -308,13 +331,14 @@ inline static void vo_update_text_sub(mp_osd_obj_t* obj,int dxs,int dys){ unsigned char *t; - int c,i,j,l,x,y,font,prevc; + int c,i,j,l,x,y,font,prevc,counter; int len; - int k,lastk; + int k; int lastStripPosition; - int xsize,lastxsize; + int xsize; int xmin=dxs,xmax=0; int h,lasth; + int xtblc, utblc; obj->flags|=OSDFLAG_CHANGED|OSDFLAG_VISIBLE; @@ -329,21 +353,30 @@ // too long lines divide into a smaller ones i=k=lasth=0; h=vo_font->height; - xsize=-vo_font->charspace; lastStripPosition=-1; l=vo_sub->lines; + { + struct osd_text_t *osl, *cp_ott, *tmp_ott, *tmp; + struct osd_text_p *otp_sub = NULL, *otp_sub_tmp, // these are used to store the whole sub text osd + *otp, *tmp_otp, *pmt; // these are used to manage sub text osd coming from a single sub line + int *char_seq, char_position, xlimit = dxs * sub_width_p / 100, counter; + while (l) { + xsize = -vo_font->charspace; l--; t=vo_sub->text[i++]; len=strlen(t)-1; - -// printf("sub(%d) '%s'\n",len,t); -// if(len<0) memy -=h; // according to max of vo_font->pic_a[font]->h -// else + char_position = 0; + char_seq = (int *) malloc((len + 1) * sizeof(int)); prevc = -1; + otp = NULL; + osl = NULL; + x = 1; + + // reading the subtitle words from vo_sub->text[] for (j=0;j<=len;j++){ if ((c=t[j])>=0x80){ if (sub_utf8){ @@ -362,78 +395,239 @@ } if (!c) c++; // avoid UCS 0 render_one_glyph(vo_font, c); - if (c==' '){ - lastk=k; - lastStripPosition=j; - lastxsize=xsize; - } else if ((!suboverlap_enabled) && ((font = vo_font->font[c]) >= 0)) { - /* - With overlapping subtitles, we need to comment this out, - beacuse that part of the code creates subtitles with the - last line blank (" "): in this case previous 'if' statement - is false an following 'if' is not executed. When, instead, - a subtitle with a non-blank last line arrives, the following - code is executed, and the result is a small 'jump' of the - subtiles. We can not simply delete the following, unless - having the last subtitle line partly drawn outside the - screen, so, some lines forward, we introduce an increment - which affects both blank and non-blank lines. - *sfalco* - */ - if (vo_font->pic_a[font]->h > h){ - h=vo_font->pic_a[font]->h; - } - } - obj->params.subtitle.utbl[k++]=c; - xsize+=vo_font->width[c]+vo_font->charspace+kerning(vo_font,prevc,c); - if (dxs*sub_width_p/100<xsize){ - prevc = -1; - if (lastStripPosition>0){ - j=lastStripPosition; - xsize=lastxsize; - k=lastk; - } else { - xsize -=vo_font->width[c]+vo_font->charspace+kerning(vo_font,prevc,c);; // go back - k--; // cut line here - while (t[j] && t[j]!=' ') j++; // jump to the nearest space - } - } else if (j<len) { - prevc = c; - continue; - } - if (h>obj->y){ // out of the screen so end parsing - obj->y -= lasth - vo_font->height; // correct the y position - l=0; - break; - } - obj->params.subtitle.utbl[k++]=0; - obj->params.subtitle.xtbl[obj->params.subtitle.lines++]=(dxs-xsize)/2; - if(xmin>(dxs-xsize)/2) xmin=(dxs-xsize)/2; - if(xmax<(dxs+xsize)/2) xmax=(dxs+xsize)/2; - if (obj->params.subtitle.lines==MAX_UCSLINES||k>MAX_UCS){ - l=0; len=j; // end parsing - } else if(l || j<len){ // not the last line or not the last char - lastStripPosition=-1; - xsize=-vo_font->charspace; - lasth=h; - h=vo_font->height; - } -// printf("h: %d -> %d \n",vo_font->height,h); - obj->y -=h; // according to max of vo_font->pic_a[font]->h - prevc = -1; - } - } - - /* - Here is the little increment we talked about before. '40' is the - ASCII code for '(', which, hopefully, is the highest char of the - font. - *sfalco* - */ - if(suboverlap_enabled && - vo_font->font[40]>=0 && vo_font->pic_a[vo_font->font[40]]) - obj->y -= vo_font->pic_a[vo_font->font[40]]->h - vo_font->height; + if (c == ' ') { + struct osd_text_t *tmp_ott = (struct osd_text_t *) calloc(1, sizeof(struct osd_text_t)); + + if (osl == NULL) { + osl = cp_ott = tmp_ott; + } else { + tmp_ott->prev = cp_ott; + cp_ott->next = tmp_ott; + tmp_ott->osd_kerning = + vo_font->charspace + vo_font->width[' ']; + cp_ott = tmp_ott; + } + tmp_ott->osd_length = xsize; + tmp_ott->text_length = char_position; + tmp_ott->text = (int *) malloc(char_position * sizeof(int)); + for (counter = 0; counter < char_position; ++counter) + tmp_ott->text[counter] = char_seq[counter]; + char_position = 0; + xsize = 0; + prevc = c; + } else { + int delta_xsize = vo_font->width[c] + vo_font->charspace + kerning(vo_font, prevc, c); + + if (xsize + delta_xsize <= dxs) { + if (!x) x = 1; + prevc = c; + char_seq[char_position++] = c; + xsize += delta_xsize; + if ((!suboverlap_enabled) && ((font = vo_font->font[c]) >= 0)) { + if (vo_font->pic_a[font]->h > h) { + h = vo_font->pic_a[font]->h; + } + } + } else { + if (x) { + mp_msg(MSGT_OSD, MSGL_WARN, "\nSubtitle word '%s' too long!\n", t); + x = 0; + } + } + } + }// for len (all words from subtitle line read) + + // osl holds an ordered (as they appear in the lines) chain of the subtitle words + { + struct osd_text_t *tmp_ott = (struct osd_text_t *) calloc(1, sizeof(struct osd_text_t)); + + if (osl == NULL) { + osl = cp_ott = tmp_ott; + } else { + tmp_ott->prev = cp_ott; + cp_ott->next = tmp_ott; + tmp_ott->osd_kerning = + vo_font->charspace + vo_font->width[' ']; + cp_ott = tmp_ott; + } + tmp_ott->osd_length = xsize; + tmp_ott->text_length = char_position; + tmp_ott->text = (int *) malloc(char_position * sizeof(int)); + for (counter = 0; counter < char_position; ++counter) + tmp_ott->text[counter] = char_seq[counter]; + char_position = 0; + xsize = -vo_font->charspace; + } + + if (osl != NULL) { + int value = 0, exit = 0, minimum = 0; + + // otp will contain the chain of the osd subtitle lines coming from the single vo_sub line. + otp = tmp_otp = (struct osd_text_p *) calloc(1, sizeof(struct osd_text_p)); + tmp_otp->ott = osl; + for (tmp_ott = tmp_otp->ott; exit == 0; ) { + while ((tmp_ott != NULL) && (value + tmp_ott->osd_kerning + tmp_ott->osd_length <= xlimit)) { + value += tmp_ott->osd_kerning + tmp_ott->osd_length; + tmp_ott = tmp_ott->next; + } + if (tmp_ott != NULL) { + struct osd_text_p *tmp = (struct osd_text_p *) calloc(1, sizeof(struct osd_text_p)); + + tmp_otp->value = value; + tmp_otp->next = tmp; + tmp->prev = tmp_otp; + tmp_otp = tmp; + tmp_otp->ott = tmp_ott; + value = -2 * vo_font->charspace - vo_font->width[' ']; + } else { + tmp_otp->value = value; + exit = 1; + } + } + + +#ifdef NEW_SPLITTING + // minimum holds the 'sum of the differences in lenght among the lines', + // a measure of the eveness of the lenghts of the lines + for (tmp_otp = otp; tmp_otp->next != NULL; tmp_otp = tmp_otp->next) { + pmt = tmp_otp->next; + while (pmt != NULL) { + minimum += abs(tmp_otp->value - pmt->value); + pmt = pmt->next; + } + } + + if (otp->next != NULL) { + int mem1, mem2; + struct osd_text_p *mem, *hold; + + exit = 0; + // until the last word of a line can be moved to the beginning of following line + // reducing the 'sum of the differences in lenght among the lines', it is done + while (exit == 0) { + hold = NULL; + exit = 1; + for (tmp_otp = otp; tmp_otp->next != NULL; tmp_otp = tmp_otp->next) { + pmt = tmp_otp->next; + for (tmp = tmp_otp->ott; tmp->next != pmt->ott; tmp = tmp->next); + if (pmt->value + tmp->osd_length + pmt->ott->osd_kerning <= xlimit) { + mem1 = tmp_otp->value; + mem2 = pmt->value; + tmp_otp->value = mem1 - tmp->osd_length - tmp->osd_kerning; + pmt->value = mem2 + tmp->osd_length + pmt->ott->osd_kerning; + + value = 0; + for (mem = otp; mem->next != NULL; mem = mem->next) { + pmt = mem->next; + while (pmt != NULL) { + value += abs(mem->value - pmt->value); + pmt = pmt->next; + } + } + if (value < minimum) { + minimum = value; + hold = tmp_otp; + exit = 0; + } + tmp_otp->value = mem1; + tmp_otp->next->value = mem2; + } + } + // merging + if (exit == 0) { + tmp_otp = hold; + pmt = tmp_otp->next; + for (tmp = tmp_otp->ott; tmp->next != pmt->ott; tmp = tmp->next); + mem1 = tmp_otp->value; + mem2 = pmt->value; + tmp_otp->value = mem1 - tmp->osd_length - tmp->osd_kerning; + pmt->value = mem2 + tmp->osd_length + pmt->ott->osd_kerning; + pmt->ott = tmp; + }//~merging + }//~while(exit == 0) + }//~if(otp->next!=NULL) +#endif + + // adding otp (containing splitted lines) to otp chain + if (otp_sub == NULL) { + otp_sub = otp; + for (otp_sub_tmp = otp_sub; otp_sub_tmp->next != NULL; otp_sub_tmp = otp_sub_tmp->next); + } else { + //updating ott chain + tmp = otp_sub->ott; + while (tmp->next != NULL) tmp = tmp->next; + tmp->next = otp->ott; + otp->ott->prev = tmp; + //attaching new subtitle line at the end + otp_sub_tmp->next = otp; + otp->prev = otp_sub_tmp; + do + otp_sub_tmp = otp_sub_tmp->next; + while (otp_sub_tmp->next != NULL); + } + }//~ if(osl != NULL) + } // while + + // write lines into utbl + xtblc = 0; + utblc = 0; + obj->y = dys; + obj->params.subtitle.lines = 0; + for (tmp_otp = otp_sub; tmp_otp != NULL; tmp_otp = tmp_otp->next) { + + if ((obj->params.subtitle.lines++) >= MAX_UCSLINES) + break; + + if (h > obj->y) { // out of the screen so end parsing + obj->y -= lasth - vo_font->height; // correct the y position + break; + } + xsize = tmp_otp->value; + obj->params.subtitle.xtbl[xtblc++] = (dxs - xsize) / 2; + if (xmin > (dxs - xsize) / 2) + xmin = (dxs - xsize) / 2; + if (xmax < (dxs + xsize) / 2) + xmax = (dxs + xsize) / 2; + + tmp = (tmp_otp->next == NULL) ? NULL : tmp_otp->next->ott; + for (tmp_ott = tmp_otp->ott; tmp_ott != tmp; tmp_ott = tmp_ott->next) { + for (counter = 0; counter < tmp_ott->text_length; ++counter) { + if (utblc > MAX_UCS) { + break; + } + c = tmp_ott->text[counter]; + render_one_glyph(vo_font, c); + obj->params.subtitle.utbl[utblc++] = c; + k++; + } + obj->params.subtitle.utbl[utblc++] = ' '; + } + obj->params.subtitle.utbl[utblc - 1] = 0; + obj->y -= vo_font->height; + } + if(obj->params.subtitle.lines) + obj->y = dys - ((obj->params.subtitle.lines - 1) * vo_font->height + vo_font->pic_a[vo_font->font[40]]->h); + + // free memory + if (otp_sub != NULL) { + for (tmp = otp_sub->ott; tmp->next != NULL; free(tmp->prev)) { + free(tmp->text); + tmp = tmp->next; + } + free(tmp->text); + free(tmp); + + for(pmt = otp_sub; pmt->next != NULL; free(pmt->prev)) { + pmt = pmt->next; + } + free(pmt); + } else { + mp_msg(MSGT_OSD, MSGL_WARN, "\nSubtitles requested but not found.\n"); + } + + } + /// vertical alignment h = dys - obj->y; if (sub_alignment == 2) obj->y = dys * sub_pos / 100 - h; @@ -461,10 +655,36 @@ y = obj->y; + switch(vo_sub->alignment) { + case SUB_ALIGNMENT_HLEFT: + obj->alignment |= 0x1; + break; + case SUB_ALIGNMENT_HCENTER: + obj->alignment |= 0x0; + break; + case SUB_ALIGNMENT_HRIGHT: + default: + obj->alignment |= 0x2; + } + i=j=0; - if ((l=obj->params.subtitle.lines)) for (;;) { - x=obj->params.subtitle.xtbl[i++]; - if (sub_justify) x = 10; + if ((l = obj->params.subtitle.lines)) { + for(counter = dxs; i < l; ++i) + if (obj->params.subtitle.xtbl[i] < counter) counter = obj->params.subtitle.xtbl[i]; + for (i = 0; i < l; ++i) { + switch (obj->alignment&0x3) { + case 1: + // left + x = counter; + break; + case 2: + // right + x = 2 * obj->params.subtitle.xtbl[i] - counter - ((obj->params.subtitle.xtbl[i] == counter) ? 0 : 1); + break; + default: + //center + x = obj->params.subtitle.xtbl[i]; + } prevc = -1; while ((c=obj->params.subtitle.utbl[j++])){ x += kerning(vo_font,prevc,c); @@ -477,9 +697,9 @@ vo_font->pic_a[font]->w); x+=vo_font->width[c]+vo_font->charspace; prevc = c; - } - if (!--l) break; + } y+=vo_font->height; + } } }

3 3

CVS: main/libmpcodecs vf_spp.c,1.3,1.4
by Michael Niedermayer CVS 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv1098 Modified Files: vf_spp.c Log Message: 10l Index: vf_spp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- vf_spp.c 27 Oct 2003 00:14:33 -0000 1.3 +++ vf_spp.c 27 Oct 2003 19:14:38 -0000 1.4 @@ -99,7 +99,6 @@ for(i=1; i<64; i++){ int level= qinv*src[i]; - if(((unsigned)(level+threshold1))>threshold2){ const int j= permutation[i]; if(level>0){ @@ -163,7 +162,6 @@ const int x1= x + offset[i][0]; const int y1= y + offset[i][1]; const int index= x1 + y1*stride; - p->dsp.get_pixels(block, p->src + index, stride); p->dsp.fdct(block); requantize(block2, block, qp, p->dsp.idct_permutation); @@ -173,20 +171,36 @@ } } +#define STORE(pos) \ + temp= ((p->temp[index + pos]<<log2_scale) + d[pos])>>6;\ + if(temp & 0x100) temp= ~(temp>>31);\ + dst[x + y*dst_stride + pos]= temp; + for(y=0; y<height; y++){ uint8_t *d= dither[y&7]; for(x=0; x<width; x+=8){ const int index= 8 + 8*stride + x + y*stride; - dst[x + y*src_stride + 0]= ((p->temp[index + 0]<<log2_scale) + d[0])>>6; - dst[x + y*src_stride + 1]= ((p->temp[index + 1]<<log2_scale) + d[1])>>6; - dst[x + y*src_stride + 2]= ((p->temp[index + 2]<<log2_scale) + d[2])>>6; - dst[x + y*src_stride + 3]= ((p->temp[index + 3]<<log2_scale) + d[3])>>6; - dst[x + y*src_stride + 4]= ((p->temp[index + 4]<<log2_scale) + d[4])>>6; - dst[x + y*src_stride + 5]= ((p->temp[index + 5]<<log2_scale) + d[5])>>6; - dst[x + y*src_stride + 6]= ((p->temp[index + 6]<<log2_scale) + d[6])>>6; - dst[x + y*src_stride + 7]= ((p->temp[index + 7]<<log2_scale) + d[7])>>6; + int temp; + STORE(0); + STORE(1); + STORE(2); + STORE(3); + STORE(4); + STORE(5); + STORE(6); + STORE(7); } } +#if 0 + for(y=0; y<height; y++){ + for(x=0; x<width; x++){ + if((((x>>6) ^ (y>>6)) & 1) == 0) + dst[x + y*dst_stride]= p->src[8 + 8*stride + x + y*stride]; + if((x&63) == 0 || (y&63)==0) + dst[x + y*dst_stride] += 128; + } + } +#endif //FIXME reorder for better caching }

1 0

CVS: main/libmpcodecs vf_spp.c,1.1,1.2
by Michael Niedermayer CVS 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv910 Modified Files: vf_spp.c Log Message: 10l and minor optimization Index: vf_spp.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vf_spp.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- vf_spp.c 26 Oct 2003 23:07:21 -0000 1.1 +++ vf_spp.c 26 Oct 2003 23:35:46 -0000 1.2 @@ -114,12 +114,13 @@ } static inline void add_block(int16_t *dst, int stride, DCTELEM block[64]){ - int x,y; + int y; for(y=0; y<8; y++){ - for(x=0; x<8; x++){ - dst[x + y*stride]+= block[x + y*8]; - } + *(uint32_t*)&dst[0 + y*stride]+= *(uint32_t*)&block[0 + y*8]; + *(uint32_t*)&dst[2 + y*stride]+= *(uint32_t*)&block[2 + y*8]; + *(uint32_t*)&dst[4 + y*stride]+= *(uint32_t*)&block[4 + y*8]; + *(uint32_t*)&dst[6 + y*stride]+= *(uint32_t*)&block[6 + y*8]; } } @@ -290,6 +291,9 @@ vf->uninit=uninit; vf->priv=malloc(sizeof(struct vf_priv_s)); memset(vf->priv, 0, sizeof(struct vf_priv_s)); + + avcodec_init(); + vf->priv->avctx= avcodec_alloc_context(); dsputil_init(&vf->priv->dsp, vf->priv->avctx);

4 6

CVS: main/libmpdemux demux_mkv.cpp,1.42,1.43
by Attila Kinali CVS 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var/tmp.root/cvs-serv6778 Modified Files: demux_mkv.cpp Log Message: * fix my 100l from before * SSA is also ASS * avoid multiple segfaults when there are more then SUB_MAX_TEXT-1 lines at the same time Index: demux_mkv.cpp =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- demux_mkv.cpp 26 Oct 2003 12:28:45 -0000 1.42 +++ demux_mkv.cpp 26 Oct 2003 21:09:37 -0000 1.43 @@ -491,6 +491,12 @@ line = 0; mkv_d->subs.lines++; + if (mkv_d->subs.lines> SUB_MAX_TEXT - 1 ) + { + mp_msg(MSGT_DEMUX, MSGL_WARN,"[mkv] Warning: too many sublines to render, skipping\n"); + mkv_d->subs.lines--; + return; + } s2 = mkv_d->subs.text[mkv_d->subs.lines - 1]; state = 0; @@ -2357,10 +2363,11 @@ sizeof(mkv_sh_sub_t)); demuxer->sub->id = track->xid; - } else if (!(strcmp(track->codec_id, MKV_S_TEXTASCII) && + } else if (strcmp(track->codec_id, MKV_S_TEXTASCII) && strcmp(track->codec_id, MKV_S_TEXTUTF8) && strcmp(track->codec_id, MKV_S_TEXTSSA) && - strcmp(track->codec_id, "S_SSA"))) + strcmp(track->codec_id, "S_SSA") && + strcmp(track->codec_id, "S_TEXT/ASS")) mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Subtitle type '%s' is not " "supported. Track will not be displayed.\n", track->codec_id); else { @@ -2374,7 +2381,8 @@ if (!strcmp(track->codec_id, MKV_S_TEXTUTF8)) sub_utf8 = 1; // Force UTF-8 conversion. if (!strcmp(track->codec_id, MKV_S_TEXTSSA) || - !strcmp(track->codec_id, "S_SSA")) { + !strcmp(track->codec_id, "S_SSA") || + !strcmp(track->codec_id, "S_TEXT/ASS")) { mkv_d->subtitle_type = MKV_SUBTYPE_SSA; sub_utf8 = 1; } else

3 4

CVS: main/DOCS/man/en mplayer.1,1.465,1.466
by Alex Beregszaszi 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main/DOCS/man/en In directory mail:/var/tmp.root/cvs-serv14406 Modified Files: mplayer.1 Log Message: loadidx and saveidx options based on Jasons patch Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v retrieving revision 1.465 retrieving revision 1.466 diff -u -r1.465 -r1.466 --- mplayer.1 22 Oct 2003 19:45:19 -0000 1.465 +++ mplayer.1 23 Oct 2003 12:16:00 -0000 1.466 @@ -784,6 +784,14 @@ Skip the proxy for IPv6 addresses. It will still be used for IPv4 connections. .TP +.B \-loadidx <filename> +The file name from which to read the video INDEX data. +MPlayer will read the index from filename and use this data for seeking. +This data will override any index data contained in the AVI itself. +Further, MPlayer won't prevent you from loading an index file generated +from a different AVI, but this is sure to cause unfavorable results. +NOTE: this option will be obsoleted once AVI gets ODML support! +.TP .B \-mc <seconds/frame> Maximum A-V sync correction per frame (in seconds). .TP @@ -889,6 +897,19 @@ packets be streamed over TCP (using the same TCP connection as RTSP). This option may be useful if you have a broken Internet connection that does not pass incoming UDP packets (see http://www.live.com/mplayer/) +.TP +.B \-saveidx <filename> +Force rebuilding of INDEX and output to a separate file specified by the +argument filename. Currently this only works with AVI files. +Although you can use MEncoder to fix files without indexes, MPlayer +does not support seeking in AVI files bigger than 2GB. +(This is a limitation of the AVI format, and although there exists an +extension to index beyond 2GB, MPlayer doesn't yet support this extension.) +After the index file is created, MPlayer will begin to play the video. +If you want to automate index file generation (after encoding a large file +off a TV capture card, for example), you can specify \-frames 0 to +prevent MPlayer from playing the video after generating the index. +NOTE: this option will be obsoleted once AVI gets ODML support! .TP .B \-sb <byte\ position> (see \-ss option too) Seek to byte position.

3 4

CVS: main/etc example.conf,1.52,1.53
by Diego Biurrun CVS 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv19090/etc Modified Files: example.conf Log Message: _ ---> - in -monitor* options Index: example.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/example.conf,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- example.conf 14 May 2003 22:49:02 -0000 1.52 +++ example.conf 27 Oct 2003 10:39:59 -0000 1.53 @@ -85,9 +85,9 @@ ## k, K : means multiply by 1000 ## m, M : means multiply by 1.000.000 ## -# monitor_hfreq = 31.5k-50k,70k # horizontal frequency range -# monitor_vfreq = 50-90 # vertical frequency range -# monitor_dotclock = 30M-300M # dotclock (or pixelclock) range +# monitor-hfreq = 31.5k-50k,70k # horizontal frequency range +# monitor-vfreq = 50-90 # vertical frequency range +# monitor-dotclock = 30M-300M # dotclock (or pixelclock) range ## ## SDL driver

1 0

CVS: main/DOCS/man/en mplayer.1,1.462,1.463
by Alex Beregszaszi 27 Oct '03

27 Oct '03

Update of /cvsroot/mplayer/main/DOCS/man/en In directory mail:/var/tmp.root/cvs-serv20502 Modified Files: mplayer.1 Log Message: colorkeying fixes Index: mplayer.1 =================================================================== RCS file: /cvsroot/mplayer/main/DOCS/man/en/mplayer.1,v retrieving revision 1.462 retrieving revision 1.463 diff -u -r1.462 -r1.463 --- mplayer.1 21 Oct 2003 10:16:12 -0000 1.462 +++ mplayer.1 22 Oct 2003 17:10:30 -0000 1.463 @@ -383,7 +383,8 @@ .B \-colorkey <number> Changes the colorkey to an RGB value of your choice. 0x000000 is black and 0xffffff is white. -Only supported by the xmga, xvidix and xover video out drivers. +Only supported by the cvidix, fbdev, svga, vesa, winvidix, xmga, xvidix and +xover video out drivers. .TP .B \-edl <filename> Enables edit decision list (EDL) actions during playback. @@ -482,6 +483,11 @@ .TP .B \-menu-root <value> (BETA CODE) Specify the main menu. +.TP +.B \-nocolorkey +Disables the colorkeying. +Only supported by the cvidix, fbdev, svga, vesa, winvidix, xvidix and xover +video out drivers. .TP .B \-nojoystick Turns off joystick support.

3 2