May 2012 - MPlayer-cvslog - lists.mplayerhq.hu

r34928 - trunk/libvo/vo_gl.c
by reimar 20 May '12

20 May '12

Author: reimar Date: Sun May 20 17:33:58 2012 New Revision: 34928 Log: Remove commented-out nonsense code. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sun May 20 17:30:01 2012 (r34927) +++ trunk/libvo/vo_gl.c Sun May 20 17:33:58 2012 (r34928) @@ -846,9 +846,6 @@ static void draw_osd(void) } static void do_render(void) { -// Enable(GL_TEXTURE_2D); -// BindTexture(GL_TEXTURE_2D, texture_id); - mpglColor4f(1,1,1,1); if (is_yuv || custom_prog) glEnableYUVConversion(gl_target, yuvconvtype);

1 0

r34927 - in trunk/libvo: vo_gl.c vo_gl2.c
by reimar 20 May '12

20 May '12

Author: reimar Date: Sun May 20 17:30:01 2012 New Revision: 34927 Log: Do not needlessly modulate the texture color with the vertex color. Might give some speedup on not-so-intelligent GL implementations that also have very little compute power. Modified: trunk/libvo/vo_gl.c trunk/libvo/vo_gl2.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Sun May 20 11:01:01 2012 (r34926) +++ trunk/libvo/vo_gl.c Sun May 20 17:30:01 2012 (r34927) @@ -552,7 +552,7 @@ static int initGl(uint32_t d_width, uint mpglEnable(gl_target); if (mpglDrawBuffer) mpglDrawBuffer(vo_doublebuffering?GL_BACK:GL_FRONT); - mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); mp_msg(MSGT_VO, MSGL_V, "[gl] Creating %dx%d texture...\n", texture_width, texture_height); @@ -805,6 +805,8 @@ static void do_render_osd(int type) { mpglPushMatrix(); mpglLoadMatrixf(matrix); } + if (osd_color != 0xffffff) + mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); mpglEnable(GL_BLEND); if (draw_eosd) { mpglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); @@ -822,6 +824,8 @@ static void do_render_osd(int type) { } // set rendering parameters back to defaults mpglDisable(GL_BLEND); + if (osd_color != 0xffffff) + mpglTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); if (!scaled_osd) mpglPopMatrix(); mpglBindTexture(gl_target, 0); Modified: trunk/libvo/vo_gl2.c ============================================================================== --- trunk/libvo/vo_gl2.c Sun May 20 11:01:01 2012 (r34926) +++ trunk/libvo/vo_gl2.c Sun May 20 17:30:01 2012 (r34927) @@ -272,7 +272,7 @@ static int initTextures(void) glCreateClearTex(GL_TEXTURE_2D, gl_internal_format, gl_bitmap_format, gl_bitmap_type, GL_LINEAR, texture_width, texture_height, 0); - glTexEnvf (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); if (is_yuv) { int xs, ys, depth; int chroma_clear_val = 128;

1 0

r34926 - trunk/gui/ui/gtk/fileselect.c
by ib 20 May '12

20 May '12

Author: ib Date: Sun May 20 11:01:01 2012 New Revision: 34926 Log: Use unsigned int instead of type casting. Modified: trunk/gui/ui/gtk/fileselect.c Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Sun May 20 10:57:43 2012 (r34925) +++ trunk/gui/ui/gtk/fileselect.c Sun May 20 11:01:01 2012 (r34926) @@ -187,7 +187,7 @@ static void clist_append_fname(GtkWidget static void CheckDir( GtkWidget * list ) { struct stat fs; - int i, j, fn; + unsigned int i, j, fn; glob_t gg; gchar *filter, **fext; @@ -200,7 +200,7 @@ static void CheckDir( GtkWidget * list ) clist_append_fname(list, "..", dpixmap, dmask); glob( "*",0,NULL,&gg ); - for( i=0;(unsigned)i<gg.gl_pathc;i++ ) + for( i=0;i<gg.gl_pathc;i++ ) { stat( gg.gl_pathv[i],&fs ); if( !S_ISDIR( fs.st_mode ) ) continue; @@ -226,7 +226,7 @@ static void CheckDir( GtkWidget * list ) } } - for( i=0;(unsigned)i<gg.gl_pathc;i++ ) + for( i=0;i<gg.gl_pathc;i++ ) { char *ext;

1 0

r34925 - trunk/gui/ui/gtk/fileselect.c
by ib 20 May '12

20 May '12

Author: ib Date: Sun May 20 10:57:43 2012 New Revision: 34925 Log: Cosmetic: Adjust indent. Modified: trunk/gui/ui/gtk/fileselect.c Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Sun May 20 10:54:50 2012 (r34924) +++ trunk/gui/ui/gtk/fileselect.c Sun May 20 10:57:43 2012 (r34925) @@ -226,12 +226,12 @@ static void CheckDir( GtkWidget * list ) } } - for( i=0;(unsigned)i<gg.gl_pathc;i++ ) - { + for( i=0;(unsigned)i<gg.gl_pathc;i++ ) + { char *ext; - stat( gg.gl_pathv[i],&fs ); - if( S_ISDIR( fs.st_mode ) ) continue; + stat( gg.gl_pathv[i],&fs ); + if( S_ISDIR( fs.st_mode ) ) continue; ext = strrchr(gg.gl_pathv[i], '.'); @@ -241,12 +241,12 @@ static void CheckDir( GtkWidget * list ) { if (fext[j] == NULL || strcasecmp(fext[j], ext) == 0) { - clist_append_fname(list, gg.gl_pathv[i], fpixmap, fmask); + clist_append_fname(list, gg.gl_pathv[i], fpixmap, fmask); break; } } } - } + } } free(fext);

1 0

r34924 - trunk/gui/ui/gtk/fileselect.c
by ib 20 May '12

20 May '12

Author: ib Date: Sun May 20 10:54:50 2012 New Revision: 34924 Log: Improve filter on file selector's file list. Sort the files globally, don't sort each block of files with the same extension separately. This is achieved by not using the glob() function for each extension separately, but only once and filtering in one pass which should improve the speed as well. Modified: trunk/gui/ui/gtk/fileselect.c Modified: trunk/gui/ui/gtk/fileselect.c ============================================================================== --- trunk/gui/ui/gtk/fileselect.c Fri May 18 22:52:12 2012 (r34923) +++ trunk/gui/ui/gtk/fileselect.c Sun May 20 10:54:50 2012 (r34924) @@ -172,19 +172,6 @@ static char * get_current_dir_name_utf8( return utf8dir; } -static char * Filter( const char * name ) -{ - static char tmp[32]; - unsigned int i,c; - for ( i=0,c=0;i < strlen( name );i++ ) - { - if ( ( name[i] >='a' )&&( name[i] <= 'z' ) ) { tmp[c++]='['; tmp[c++]=name[i]; tmp[c++]=name[i] - 32; tmp[c++]=']'; } - else tmp[c++]=name[i]; - } - tmp[c]=0; - return tmp; -} - static void clist_append_fname(GtkWidget * list, char *fname, GdkPixmap *pixmap, GdkPixmap *mask) { gint pos; @@ -200,8 +187,9 @@ static void clist_append_fname(GtkWidget static void CheckDir( GtkWidget * list ) { struct stat fs; - int i; + int i, j, fn; glob_t gg; + gchar *filter, **fext; if ( !fsFilter[0] ) return; @@ -218,30 +206,51 @@ static void CheckDir( GtkWidget * list ) if( !S_ISDIR( fs.st_mode ) ) continue; clist_append_fname(list, gg.gl_pathv[i], dpixmap, dmask); } - globfree( &gg ); - if ( strchr( fsFilter,',' ) ) - { - char tmp[8]; - int i,c,glob_param = 0; - for ( i=0,c=0;i<(int)strlen( fsFilter ) + 1;i++,c++ ) - { - tmp[c]=fsFilter[i]; - if ( ( tmp[c] == ',' )||( tmp[c] == '\0' ) ) - { - tmp[c]=0; c=-1; - glob( Filter( tmp ),glob_param,NULL,&gg ); - glob_param=GLOB_APPEND; - } - } - } else glob( Filter( fsFilter ),0,NULL,&gg ); + for (fn = 1, i = 0; fsFilter[i]; i++) + if (fsFilter[i] == ',') fn++; + + filter = g_strdup(fsFilter); + fext = calloc(fn, sizeof(gchar *)); + + if (filter && fext) + { + for (j = 0, i = 0; filter[i]; i++) + { + if (filter[i] == '.') fext[j] = filter + i; + + if (filter[i] == ',') + { + filter[i] = 0; + j++; + } + } for( i=0;(unsigned)i<gg.gl_pathc;i++ ) { + char *ext; + stat( gg.gl_pathv[i],&fs ); if( S_ISDIR( fs.st_mode ) ) continue; + + ext = strrchr(gg.gl_pathv[i], '.'); + + if (ext || !fext[0]) + { + for (j = 0; j < fn; j++) + { + if (fext[j] == NULL || strcasecmp(fext[j], ext) == 0) + { clist_append_fname(list, gg.gl_pathv[i], fpixmap, fmask); + break; + } + } + } } + } + + free(fext); + g_free(filter); globfree( &gg ); gtk_clist_set_column_width( GTK_CLIST( list ),0,17 );

1 0

r34897 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 18 May '12

18 May '12

Author: reimar Date: Mon May 14 20:11:24 2012 New Revision: 34897 Log: Allow direct rendering for non-reference frames in H.264. This might work for other codecs that currently have DR disabled, but H.264 is the only one tested so far. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sun May 13 21:55:27 2012 (r34896) +++ trunk/libmpcodecs/vd_ffmpeg.c Mon May 14 20:11:24 2012 (r34897) @@ -61,6 +61,7 @@ typedef struct { enum PixelFormat pix_fmt; int do_slices; int do_dr1; + int nonref_dr; ///< allow dr only for non-reference frames int vo_initialized; int best_csp; int qp_stat[32]; @@ -243,8 +244,9 @@ static int init(sh_video_t *sh){ if(use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug) ctx->do_slices=1; - if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_H264 && lavc_codec->id != CODEC_ID_INTERPLAY_VIDEO && lavc_codec->id != CODEC_ID_VP8 && lavc_codec->id != CODEC_ID_LAGARITH) + if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_INTERPLAY_VIDEO && lavc_codec->id != CODEC_ID_VP8 && lavc_codec->id != CODEC_ID_LAGARITH) ctx->do_dr1=1; + ctx->nonref_dr = lavc_codec->id == CODEC_ID_H264; ctx->ip_count= ctx->b_count= 0; ctx->pic = avcodec_alloc_frame(); @@ -560,6 +562,12 @@ static int get_buffer(AVCodecContext *av } } + if (ctx->nonref_dr) { + if (flags & MP_IMGFLAG_PRESERVE) + return avcodec_default_get_buffer(avctx, pic); + type = MP_IMGTYPE_TEMP; + } + if(init_vo(sh, avctx->pix_fmt) < 0){ avctx->release_buffer= avcodec_default_release_buffer; avctx->get_buffer= avcodec_default_get_buffer; @@ -677,6 +685,8 @@ static void release_buffer(struct AVCode sh_video_t *sh = avctx->opaque; vd_ffmpeg_ctx *ctx = sh->context; int i; + if (pic->type != FF_BUFFER_TYPE_USER) + return avcodec_default_release_buffer(avctx, pic); //printf("release buffer %d %d %d\n", mpi ? mpi->flags&MP_IMGFLAG_PRESERVE : -99, ctx->ip_count, ctx->b_count);

4 4

r34923 - trunk/libmpdemux/mp3_hdr.c
by reimar 18 May '12

18 May '12

Author: reimar Date: Fri May 18 22:52:12 2012 New Revision: 34923 Log: Remove unused code from mp_get_mp3_header. Modified: trunk/libmpdemux/mp3_hdr.c Modified: trunk/libmpdemux/mp3_hdr.c ============================================================================== --- trunk/libmpdemux/mp3_hdr.c Fri May 18 20:34:26 2012 (r34922) +++ trunk/libmpdemux/mp3_hdr.c Fri May 18 22:52:12 2012 (r34923) @@ -43,7 +43,7 @@ static const int freqs[9] = { 44100, 480 * return frame size or -1 (bad frame) */ int mp_get_mp3_header(unsigned char* hbuf,int* chans, int* srate, int* spf, int* mpa_layer, int* br){ - int stereo,ssize,lsf,framesize,padding,bitrate_index,sampling_frequency, divisor; + int stereo,lsf,framesize,padding,bitrate_index,sampling_frequency, divisor; int bitrate; int layer; static const int mult[3] = { 12000, 144000, 144000 }; @@ -53,8 +53,6 @@ int mp_get_mp3_header(unsigned char* hbu hbuf[2] << 8 | hbuf[3]; -// printf("head=0x%08X\n",newhead); - // head_check: if( (newhead & 0xffe00000) != 0xffe00000 ){ mp_msg(MSGT_DEMUXER,MSGL_DBG2,"head_check failed\n"); @@ -83,30 +81,11 @@ int mp_get_mp3_header(unsigned char* hbu sampling_frequency += 6; } -// crc = ((newhead>>16)&0x1)^0x1; bitrate_index = (newhead>>12)&0xf; // valid: 1..14 padding = (newhead>>9)&0x1; -// fr->extension = (newhead>>8)&0x1; -// fr->mode = (newhead>>6)&0x3; -// fr->mode_ext = (newhead>>4)&0x3; -// fr->copyright = (newhead>>3)&0x1; -// fr->original = (newhead>>2)&0x1; -// fr->emphasis = newhead & 0x3; stereo = ( ((newhead>>6)&0x3) == 3) ? 1 : 2; -// !checked later through tabsel_123[]! -// if(!bitrate_index || bitrate_index==15){ -// mp_msg(MSGT_DEMUXER,MSGL_DBG2,"Free format not supported.\n"); -// return -1; -// } - - if(lsf) - ssize = (stereo == 1) ? 9 : 17; - else - ssize = (stereo == 1) ? 17 : 32; - if(!(newhead & (1 << 16))) ssize += 2; // CRC - bitrate = tabsel_123[lsf][layer-1][bitrate_index]; framesize = bitrate * mult[layer-1]; @@ -123,7 +102,6 @@ int mp_get_mp3_header(unsigned char* hbu if(layer==1) framesize *= 4; -// if(framesize<=0 || framesize>MAXFRAMESIZE) return FALSE; if(srate) *srate = freqs[sampling_frequency]; if(spf) {

1 0

r34922 - trunk/configure
by reimar 18 May '12

18 May '12

Author: reimar Date: Fri May 18 20:34:26 2012 New Revision: 34922 Log: Only try to build vo gl with X11/win32 backends if these were detected. Fixes compilation with --disable-x11 or when X11 headers are available but not the libraries. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri May 18 20:30:35 2012 (r34921) +++ trunk/configure Fri May 18 20:34:26 2012 (r34922) @@ -5147,19 +5147,19 @@ int main(int argc, char *argv[]) { EOF _gl=no for ld_tmp in "" -lGL "-lGL -lXdamage" "-lGL $ld_pthread" ; do - if cc_check $ld_tmp ; then + if test "$_x11" = yes && cc_check $ld_tmp ; then _gl=yes _gl_x11=yes libs_mplayer="$libs_mplayer $ld_tmp $ld_dl" break fi done - if cc_check -DGL_EGL_X11 -lEGL ; then + if test "$_x11" = yes && cc_check -DGL_EGL_X11 -lEGL ; then _gl=yes _gl_egl_x11=yes libs_mplayer="$libs_mplayer -lEGL $ld_dl" fi - if cc_check -DGL_WIN32 -lopengl32 ; then + if win32 && cc_check -DGL_WIN32 -lopengl32 ; then _gl=yes _gl_win32=yes libs_mplayer="$libs_mplayer -lopengl32 -lgdi32"

1 0

r34921 - trunk/configure
by reimar 18 May '12

18 May '12

Author: reimar Date: Fri May 18 20:30:35 2012 New Revision: 34921 Log: More robust detection of SPARC CPUs. Should also make it possible to cross-compile e.g. a 32-bit SPARC build on SPARC64 by using -m32. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri May 18 19:26:05 2012 (r34920) +++ trunk/configure Fri May 18 20:30:35 2012 (r34921) @@ -270,6 +270,13 @@ ppc() { esac } +sparc() { + case "$host_arch" in + sparc*) return 0;; + *) return 1;; + esac +} + alpha() { case "$host_arch" in alpha*) return 0;; @@ -1510,8 +1517,7 @@ if test -z "$_target" ; then ia64) host_arch=ia64 ;; macppc|ppc*|Power*) host_arch=ppc ;; alpha) host_arch=alpha ;; - sparc) host_arch=sparc ;; - sparc64) host_arch=sparc64 ;; + sun4*|sparc*) host_arch=sparc ;; parisc*|hppa*|9000*) host_arch=hppa ;; arm*|zaurus|cats) host_arch=arm ;; sh3|sh4|sh4a) host_arch=sh ;; @@ -1720,6 +1726,9 @@ fi if ppc ; then cc_check && host_arch=ppc64 || host_arch=ppc fi +if sparc ; then + cc_check && host_arch=sparc64 || host_arch=sparc +fi fi echo "Detected operating system: $system_name"

1 0

r34920 - trunk/libmpdemux/mp3_hdr.c
by reimar 18 May '12

18 May '12

Author: reimar Date: Fri May 18 19:26:05 2012 New Revision: 34920 Log: Cosmetics: fix up indentations, get rid of a few lost tabs. Modified: trunk/libmpdemux/mp3_hdr.c Modified: trunk/libmpdemux/mp3_hdr.c ============================================================================== --- trunk/libmpdemux/mp3_hdr.c Fri May 18 19:23:44 2012 (r34919) +++ trunk/libmpdemux/mp3_hdr.c Fri May 18 19:26:05 2012 (r34920) @@ -35,9 +35,9 @@ static const uint16_t tabsel_123[2][3][1 {0,8,16,24,32,40,48,56,64,80,96,112,128,144,160,0} } }; -static const int freqs[9] = { 44100, 48000, 32000, // MPEG 1.0 - 22050, 24000, 16000, // MPEG 2.0 - 11025, 12000, 8000}; // MPEG 2.5 +static const int freqs[9] = { 44100, 48000, 32000, // MPEG 1.0 + 22050, 24000, 16000, // MPEG 2.0 + 11025, 12000, 8000}; // MPEG 2.5 /* * return frame size or -1 (bad frame) @@ -57,8 +57,8 @@ int mp_get_mp3_header(unsigned char* hbu // head_check: if( (newhead & 0xffe00000) != 0xffe00000 ){ - mp_msg(MSGT_DEMUXER,MSGL_DBG2,"head_check failed\n"); - return -1; + mp_msg(MSGT_DEMUXER,MSGL_DBG2,"head_check failed\n"); + return -1; } layer = 4-((newhead>>17)&3); @@ -69,8 +69,8 @@ int mp_get_mp3_header(unsigned char* hbu sampling_frequency = (newhead>>10)&0x3; // valid: 0..2 if(sampling_frequency==3){ - mp_msg(MSGT_DEMUXER,MSGL_DBG2,"invalid sampling_frequency\n"); - return -1; + mp_msg(MSGT_DEMUXER,MSGL_DBG2,"invalid sampling_frequency\n"); + return -1; } if( newhead & (1<<20) ) { @@ -111,10 +111,10 @@ int mp_get_mp3_header(unsigned char* hbu framesize = bitrate * mult[layer-1]; mp_msg(MSGT_DEMUXER,MSGL_DBG2,"FRAMESIZE: %d, layer: %d, bitrate: %d, mult: %d\n", - framesize, layer, tabsel_123[lsf][layer-1][bitrate_index], mult[layer-1]); + framesize, layer, tabsel_123[lsf][layer-1][bitrate_index], mult[layer-1]); if(!framesize){ - mp_msg(MSGT_DEMUXER,MSGL_DBG2,"invalid framesize/bitrate_index\n"); - return -1; + mp_msg(MSGT_DEMUXER,MSGL_DBG2,"invalid framesize/bitrate_index\n"); + return -1; } divisor = layer == 3 ? (freqs[sampling_frequency] << lsf) : freqs[sampling_frequency]; @@ -126,16 +126,16 @@ int mp_get_mp3_header(unsigned char* hbu // if(framesize<=0 || framesize>MAXFRAMESIZE) return FALSE; if(srate) *srate = freqs[sampling_frequency]; - if(spf) { - if(layer == 1) - *spf = 384; - else if(layer == 2) - *spf = 1152; - else if(sampling_frequency > 2) // not 1.0 - *spf = 576; - else - *spf = 1152; - } + if(spf) { + if(layer == 1) + *spf = 384; + else if(layer == 2) + *spf = 1152; + else if(sampling_frequency > 2) // not 1.0 + *spf = 576; + else + *spf = 1152; + } if(mpa_layer) *mpa_layer = layer; if(chans) *chans = stereo; if(br) *br = bitrate;

1 0