June 2007 - MPlayer-dev-eng - lists.mplayerhq.hu

[PATCH] stream_skip returns success on negative len in unseekable stream
by elupus 04 Jun '07

04 Jun '07

Hi, Currently stream_skip will return success on a negative len if underlying stream isn't seekable. This patch remedies this by not checking for seek-ability on negative len. Underlying cache system might still succeed in doing that backward seek if cache is enabled. /Joakim

1 1

[PATCH] GTK GUI, Correct use filenames on non-utf8 localized systems
by xeb＠mail.ru 04 Jun '07

04 Jun '07

Hello. There is trouble using gmplayer on non-utf8 localized systems, filenames are not handled correctly. This patch fixes it. --------------------- diff -ur mplayer.orig/Gui/mplayer/gtk/fs.c mplayer/Gui/mplayer/gtk/fs.c --- mplayer.orig/Gui/mplayer/gtk/fs.c 2007-03-21 08:15:03.000000000 +0300 +++ mplayer/Gui/mplayer/gtk/fs.c 2007-05-30 21:28:47.000000000 +0400 @@ -175,10 +175,11 @@ stat( gg.gl_pathv[i],&fs ); if( !S_ISDIR( fs.st_mode ) ) continue; - str[0][1]=gg.gl_pathv[i]; + str[0][1]=g_filename_to_utf8( gg.gl_pathv[i],-1,NULL,NULL,NULL ); pixmap=dpixmap; mask=dmask; gtk_clist_append( GTK_CLIST( list ),str[0] ); gtk_clist_set_pixmap( GTK_CLIST( list ),c++,0,pixmap,mask ); + g_free(str[0][1]); } globfree( &gg ); @@ -223,9 +224,10 @@ stat( gg.gl_pathv[i],&fs ); if( S_ISDIR( fs.st_mode ) ) continue; - str[0][1]=gg.gl_pathv[i]; + str[0][1]=g_filename_to_utf8( gg.gl_pathv[i],-1,NULL,NULL,NULL ); gtk_clist_append( GTK_CLIST( list ),str[0] ); gtk_clist_set_pixmap( GTK_CLIST( list ),c++,0,pixmap,mask ); + g_free(str[0][1]); } globfree( &gg ); @@ -321,21 +323,32 @@ free( dir ); } - if ( fsTopList_items ) g_list_free( fsTopList_items ); fsTopList_items=NULL; + if ( fsTopList_items ) + { + GList *item; + item=fsTopList_items; + while( item ) + { + g_free( item->data ); + item=item->next; + } + g_list_free( fsTopList_items ); + } + fsTopList_items=NULL; { int i, c = 1; if ( fsType == fsVideoSelector ) { for ( i=0;i < fsPersistant_MaxPos;i++ ) - if ( fsHistory[i] ) { fsTopList_items=g_list_append( fsTopList_items,fsHistory[i] ); c=0; } + if ( fsHistory[i] ) { fsTopList_items=g_list_append( fsTopList_items,g_filename_to_utf8( fsHistory[i],-1,NULL,NULL,NULL ) ); c=0; } } - if ( c ) fsTopList_items=g_list_append( fsTopList_items,(gchar *)get_current_dir_name() ); + if ( c ) {fsTopList_items=g_list_append( fsTopList_items,g_filename_to_utf8 ( get_current_dir_name(),-1,NULL,NULL,NULL ) ); } } - if ( getenv( "HOME" ) ) fsTopList_items=g_list_append( fsTopList_items,getenv( "HOME" ) ); - fsTopList_items=g_list_append( fsTopList_items,"/home" ); - fsTopList_items=g_list_append( fsTopList_items,"/mnt" ); - fsTopList_items=g_list_append( fsTopList_items,"/" ); + if ( getenv( "HOME" ) ) fsTopList_items=g_list_append( fsTopList_items,g_filename_to_utf8( getenv( "HOME" ),-1,NULL,NULL,NULL ) ); + fsTopList_items=g_list_append( fsTopList_items,g_filename_to_utf8 ("/home",-1,NULL,NULL,NULL) ); + fsTopList_items=g_list_append( fsTopList_items,g_filename_to_utf8 ("/mnt",-1,NULL,NULL,NULL) ); + fsTopList_items=g_list_append( fsTopList_items,g_filename_to_utf8 ("/",-1,NULL,NULL,NULL) ); gtk_combo_set_popdown_strings( GTK_COMBO( fsCombo4 ),fsTopList_items ); gtk_window_set_modal( GTK_WINDOW( fsFileSelect ),modal ); @@ -418,25 +431,36 @@ { unsigned char * str; - str=gtk_entry_get_text( GTK_ENTRY( user_data ) ); + str=g_filename_from_utf8( gtk_entry_get_text( GTK_ENTRY( user_data ) ),-1,NULL,NULL,NULL ); if ( chdir( str ) != -1 ) CheckDir( fsFNameList,get_current_dir_name() ); + g_free(str); } void fs_fsPathCombo_changed( GtkEditable * editable,gpointer user_data ) { unsigned char * str; - str=gtk_entry_get_text( GTK_ENTRY( user_data ) ); + str=g_filename_from_utf8( gtk_entry_get_text( GTK_ENTRY( user_data ) ),-1,NULL,NULL,NULL ); fsPressed=2; if ( chdir( str ) != -1 ) CheckDir( fsFNameList,get_current_dir_name() ); + g_free(str); +} + +static void set_selected_file(const gchar *str) +{ + if (fsSelectedFile) g_free(fsSelectedFile); + fsSelectedFile=g_filename_from_utf8(str,-1,NULL,NULL,NULL); } void fs_Up_released( GtkButton * button,gpointer user_data ) { + gchar *str; chdir( ".." ); - fsSelectedFile=fsThatDir; + set_selected_file(fsThatDir); CheckDir( fsFNameList,get_current_dir_name() ); - gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),(unsigned char *)get_current_dir_name() ); + str=g_filename_to_utf8( (unsigned char *)get_current_dir_name(),-1,NULL,NULL,NULL ); + gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),str ); + g_free(str); return; } @@ -459,9 +483,11 @@ if( S_ISDIR(fs.st_mode ) ) { chdir( fctedFile ); - fsSelectedFile=fsThatDir; + set_selected_file(fsThatDir); + str=g_filename_to_utf8( get_current_dir_name(),-1,NULL,NULL,NULL ); CheckDir( fsFNameList,get_current_dir_name() ); - gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),(unsigned char *)get_current_dir_name() ); + gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),str ); + g_free(str); return; } @@ -472,7 +498,7 @@ break; case 2: str=gtk_entry_get_text( GTK_ENTRY( fsPathCombo ) ); - fsSelectedFile=str; + set_selected_file(str); if ( !fsFileExist( fsSelectedFile ) ) { HideFileSelect(); return; } fsSelectedDirectory=fsSelectedFile; size=strlen( fsSelectedDirectory ); @@ -522,7 +548,8 @@ if ( !strcmp( item->data,fsSelectedDirectory ) ) i=0; item=item->next; } - if ( i ) fsTopList_items=g_list_prepend( fsTopList_items,(gchar *)get_current_dir_name() ); + if ( i ) fsTopList_items=g_list_prepend( fsTopList_items,g_filename_to_utf8( get_current_dir_name(),-1,NULL,NULL,NULL ) ); + if ( mplMainAutoPlay ) { mplMainAutoPlay=0; mplEventHandling( evPlay,0 ); } else guiGetEvent( guiCEvent,guiSetStop ); } @@ -535,7 +562,9 @@ void fs_fsFNameList_select_row( GtkWidget * widget,gint row,gint column,GdkEventButton *bevent,gpointer user_data ) { - gtk_clist_get_text( GTK_CLIST(widget ),row,1,&fsSelectedFile ); + gchar *str; + gtk_clist_get_text( GTK_CLIST(widget ),row,1,&str ); + set_selected_file(str); fsPressed=1; if( bevent && bevent->type == GDK_BUTTON_PRESS ) gtk_button_released( GTK_BUTTON( fsOk ) ); } diff -ur mplayer.orig/Gui/mplayer/gtk/pl.c mplayer/Gui/mplayer/gtk/pl.c --- mplayer.orig/Gui/mplayer/gtk/pl.c 2007-03-21 08:15:03.000000000 +0300 +++ mplayer/Gui/mplayer/gtk/pl.c 2007-05-30 18:54:22.000000000 +0400 @@ -160,9 +160,10 @@ while ( next || next->next ) { char * text[1][3]; text[0][2]=""; - text[0][0]=next->name; + text[0][0]=g_filename_to_utf8( next->name,-1,NULL,NULL,NULL ); text[0][1]=next->path; gtk_clist_append( GTK_CLIST( CLSelected ),text[0] ); + g_free(text[0][0]); NrOfSelected++; if ( next->next ) next=next->next; else break; } @@ -217,7 +218,7 @@ item=calloc( 1,sizeof( plItem ) ); gtk_clist_get_text( GTK_CLIST( CLSelected ),i,0,&text[0] ); gtk_clist_get_text( GTK_CLIST( CLSelected ),i,1,&text[1] ); - item->name=strdup( text[0] ); + item->name=g_filename_from_utf8( text[0],-1,NULL,NULL,NULL ); item->path=strdup( text[1] ); gtkSet( gtkAddPlItem,0,(void*)item ); } @@ -332,7 +333,7 @@ path=calloc( 1,strlen( DirNode->path ) + strlen( dirent->d_name ) + 2 ); if ( !strcmp( current_path,"/" ) ) sprintf( path,"/%s",dirent->d_name ); else sprintf( path,"%s/%s",current_path,dirent->d_name ); - text=dirent->d_name; + text=g_filename_to_utf8( dirent->d_name,-1,NULL,NULL,NULL ); if ( stat( path,&statbuf ) != -1 && S_ISDIR( statbuf.st_mode ) && dirent->d_name[0] != '.' ) { @@ -342,6 +343,7 @@ gtk_ctree_node_set_row_data_full( ctree,node,DirNode,NULL ); if ( subdir ) node=gtk_ctree_insert_node( ctree,node,NULL,&dummy,4,NULL,NULL,NULL,NULL,FALSE,FALSE ); } + g_free( text ); free( path ); path=NULL; } closedir( dir ); @@ -369,9 +371,10 @@ curr=calloc( 1,strlen( path ) + strlen( dirent->d_name ) + 3 ); sprintf( curr,"%s/%s",path,dirent->d_name ); if ( stat( curr,&statbuf ) != -1 && ( S_ISREG( statbuf.st_mode ) || S_ISLNK( statbuf.st_mode ) ) ) { - text[0][0]=dirent->d_name; + text[0][0]=g_filename_to_utf8( dirent->d_name,-1,NULL,NULL,NULL ); gtk_clist_append( GTK_CLIST( CLFiles ),text[0] ); NrOfEntrys++; + g_free(text[0][0]); } free( curr ); }

2 1

[PATCH] demuxer.h: use 'static inline' instead of 'inline static'
by Zuxy Meng 04 Jun '07

04 Jun '07

Hi, As pointed by Diego in mplayer-cvslog. -- Zuxy Beauty is truth, While truth is beauty. PGP KeyID: E8555ED6

2 2

VO_V4lw With MPlayer 1.0rc1
by Federico Lorenzi 04 Jun '07

04 Jun '07

Hello list! After browsing around for a bit about how I could get V4L loopback output, I came across the vo_v4lw module for mplayer. Being really outdated from 2001, I searched some more and came across a much more recent revision located at: http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2006-April/042586.html However, this version is for MPlayer0.9pre7try2, which doesn't compile cleanly on my current system. Not only that but it uses the old version of vloopback, which doesn't work on 2.6 kernels. Having absolutely no C knowledge at this stage, I decided to do some hacking up of the module, and I can get it to compile, and mplayer runs cleanly with it. The problem arises when i try and get something to listen to /dev/video1. This just crashes both running MPlayers into some unknown state in which killall -KILL fails to kill them. I have attached my vo_v4lw.c source file, and please remember I know NOTHING about C, if someone with knowledge could take a look at it and help fix it out, I would be most grateful. Most of the source code in here comes from the vloopback example files, so they would be a good place to look at. Thanks in advance, Federico -- vo_v4lw.c -- #include <unistd.h> #include <stdlib.h> #include <stdio.h> #include <fcntl.h> #include <string.h> #include <sys/ioctl.h> #include <sys/mman.h> #include <signal.h> #include <sys/wait.h> #include <linux/videodev.h> #include <errno.h> #include <sys/poll.h> #include <dirent.h> #include <sys/utsname.h> #include "config.h" #include "video_out.h" #include "video_out_internal.h" #include "fastmemcpy.h" #include "sub.h" #include "aspect.h" #include "mp_msg.h" static uint32_t image_width, image_height; static int devout; static uint8_t *image; static unsigned int image_format=0; static int bpp = 24; static int fmt; #define MAXIOCTL 1024 #define MAXWIDTH 1280 #define MAXHEIGHT 1024 int width; int height; char ioctlbuf[MAXIOCTL]; int v4ldev; char *image_out; int get_frame(void) { int i; char colour = 0; memset(image_out, 0x128, width*height*3); for (i=10; i<width-10; i++) { image_out[10*width*3+i*3]=colour++; image_out[10*width*3+i*3+1]=0; image_out[10*width*3+i*3+2]=-colour; } for (i=10; i<width-10; i++) { image_out[(height-10)*width*3+i*3]=colour; image_out[(height-10)*width*3+i*3+1]=0; image_out[(height-10)*width*3+i*3+2]=-colour++; } /* */ usleep(500); /* BIG XXX */ return 0; } int v4l_ioctl(unsigned long int cmd, void *arg) { int i; switch (cmd) { case VIDIOCGCAP: { struct video_capability *vidcap=arg; sprintf(vidcap->name, "Jeroen's dummy v4l driver"); vidcap->type= VID_TYPE_CAPTURE; vidcap->channels=1; vidcap->audios=0; vidcap->maxwidth=MAXWIDTH; vidcap->maxheight=MAXHEIGHT; vidcap->minwidth=20; vidcap->minheight=20; return 0; } case VIDIOCGCHAN: { struct video_channel *vidchan= (struct video_channel *)arg; printf("VIDIOCGCHAN called\n"); if (vidchan->channel!=0) ;//return 1; vidchan->channel=0; vidchan->flags=0; vidchan->tuners=0; vidchan->norm=0; vidchan->type=VIDEO_TYPE_CAMERA; strcpy(vidchan->name, "Loopback"); return 0; } case VIDIOCSCHAN: { int *v=arg; if (v[0]!=0) return 1; return 0; } case VIDIOCGTUNER: { struct video_tuner *v = arg; if(v->tuner) { printf("VIDIOCGTUNER: Invalid Tuner, was %d\n", v->tuner); //return -EINVAL; } v->tuner=0; strcpy(v->name, "Format"); v->rangelow=0; v->rangehigh=0; v->flags=0; v->mode=VIDEO_MODE_AUTO; return 1; } case VIDIOCGPICT: { struct video_picture *vidpic=arg; vidpic->colour=0x8000; vidpic->hue=0x8000; vidpic->brightness=0x8000; vidpic->contrast=0x8000; vidpic->whiteness=0x8000; vidpic->depth=0x8000; vidpic->palette=fmt; return 0; } case VIDIOCSPICT: { struct video_picture *vidpic=arg; if (vidpic->palette!=fmt) return 1; return 0; } case VIDIOCGWIN: { struct video_window *vidwin=arg; vidwin->x=0; vidwin->y=0; vidwin->width=width; vidwin->height=height; vidwin->chromakey=0; vidwin->flags=0; vidwin->clipcount=0; return 0; } case VIDIOCSWIN: { struct video_window *vidwin=arg; if (vidwin->width > MAXWIDTH || vidwin->height > MAXHEIGHT ) return 1; if (vidwin->flags) return 1; width=vidwin->width; height=vidwin->height; printf("new size: %dx%d\n", width, height); return 0; } case VIDIOCGMBUF: { struct video_mbuf *vidmbuf=arg; vidmbuf->size=width*height*3; vidmbuf->frames=1; for (i=0; i<vidmbuf->frames; i++) vidmbuf->offsets[i]=i*vidmbuf->size; return 0; } case VIDIOCMCAPTURE: { struct video_mmap *vidmmap=arg; //return 0; if (vidmmap->height>MAXHEIGHT || vidmmap->width>MAXWIDTH || vidmmap->format!=fmt ) return 1; if (vidmmap->height!=height || vidmmap->width!=width) { height=vidmmap->height; width=vidmmap->width; printf("new size: %dx%d\n", width, height); } // check if 'vidmmap->frame' is valid // initiate capture for 'vidmmap->frame' frames return 0; } case VIDIOCSYNC: { //struct video_mmap *vidmmap=arg; // check if frames are ready. // wait until ready. get_frame(); return 0; } default: { printf("unknown ioctl: %ld\n", cmd & 0xff); return 1; } } return 0; } #define VIDIOCSINVALID _IO('v',BASE_VIDIOCPRIVATE+1) static vo_info_t info = { "video4linux write output", "v4lw", "Tilmann Bitterberg <god at tibit.org>", "update 4/27/06 sfanzyshen <sfranzyshen at hotmail.com>" }; LIBVO_EXTERN(v4lw) int open_vidpipe(void) { int pipe_fd = -1; devout = open("/dev/video0", O_RDWR); pipe_fd = devout; if (pipe_fd >= 0) printf("INFO: Opened input of %i\n", pipe_fd); return 0; } /* copied from * vloopback-0.90/example/invert.c */ int start_pipe (int dev, int width, int height) { struct video_capability vid_caps; struct video_window vid_win; struct video_picture vid_pic; if (ioctl (dev, VIDIOCGCAP, &vid_caps) == -1) { printf ("ioctl (VIDIOCGCAP)\nError[%s]\n",strerror(errno)); return (1); } if (ioctl (dev, VIDIOCGPICT, &vid_pic)== -1) { printf ("ioctl VIDIOCGPICT\nError[%s]\n",strerror(errno)); return (1); } vid_pic.palette=fmt; if (ioctl (dev, VIDIOCSPICT, &vid_pic)== -1) { printf ("ioctl VIDIOCSPICT\nError[%s]\n",strerror(errno)); return (1); } if (ioctl (dev, VIDIOCGWIN, &vid_win)== -1) { printf ("ioctl VIDIOCGWIN\nError[%s]\n",strerror(errno)); return (1); } vid_win.width=width; vid_win.height=height; if (ioctl (dev, VIDIOCSWIN, &vid_win)== -1) { printf ("ioctl VIDIOCSWIN\nError[%s]\n",strerror(errno)); return (1); } return 0; } static int draw_slice(uint8_t *src[], int stride[], int w,int h,int x,int y) { uint8_t *s; uint8_t *d; int i; int dstride=image_width; int size = image_width*image_height; // copy Y d=image+dstride*y+x; s=src[0]; for(i=0;i<h;i++){ memcpy(d,s,w); s+=stride[0]; d+=dstride; } w/=2;h/=2;x/=2;y/=2; dstride/=2; // copy U d=image + size + dstride*y+x; s=src[1]; for(i=0;i<h;i++){ memcpy(d,s,w); s+=stride[1]; d+=dstride; } // copy V d=image + size + size/4 + dstride*y+x; s=src[2]; for(i=0;i<h;i++){ memcpy(d,s,w); s+=stride[2]; d+=dstride; } return 0; } static void draw_osd(void) { } static void put_image(void) { int size = image_width*image_height*3; printf("writing..."); if (write(devout, image_out, size) != size) { perror("ERROR: Error writing image to pipe!\n"); } } static void flip_page(void) { put_image(); } static int draw_frame(uint8_t *src[]) { printf("INFO: Started drawframe\n"); memcpy (image, src, image_width * image_height * 3); return 0; } static int query_format(uint32_t format) { switch(format){ case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_YUY2: case IMGFMT_RGB24: case IMGFMT_BGR24: return 1; } return 0; } static int config (uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format) { image_width = width; image_height = height; image_format = format; switch (image_format) { case IMGFMT_YV12: case IMGFMT_I420: fmt = VIDEO_PALETTE_YUV420P; break; case IMGFMT_RGB24: case IMGFMT_BGR24: fmt = VIDEO_PALETTE_RGB24; break; } open_vidpipe(); if (start_pipe(devout, width, height) != 0) { printf("ERROR: Could not start pipe\n"); return 1; } printf("INFO: width: %d; height: %d; format: %d\n", width, height, format); image = (int8_t *) malloc(width*height*3); printf("INFO: Image Created %d\n",image); if (!image) { printf("ERROR: Image could not be created properly!\n"); close (devout); return 1; } /* clear the buffer, grey */ memset(image,0x80,width*height*3); return 0; } static const vo_info_t* get_info(void) { return &info; } static void uninit(void) { if (image) free(image); printf("INFO: Device closed in exit\n"); close (devout); } static void check_events(void) { } static int preinit(const char *arg) { return 0; } static int control(uint32_t request, void *data, ...) { switch (request) { case VOCTRL_QUERY_FORMAT: return query_format(*((uint32_t*)data)); } return VO_NOTIMPL; } -- end --

1 0

[PATCH] real->short for mp3lib
by Zuxy Meng 04 Jun '07

04 Jun '07

Hi, These parameters are actually used as pointers to short integers (as operands of 'movw'), not floats. The declarations are therefore misleading. -- Zuxy Beauty is truth, While truth is beauty. PGP KeyID: E8555ED6

1 1

[PATCH 2/2] playback_speed limits: MP_CMD_SPEED_*
by Robert Juliano 03 Jun '07

03 Jun '07

Patch 2: prevent non-positive playback_speed While -speed and mp_property_playback_speed clamp playback_speed, MP_CMD_SPEED_* didn't. Ex. with input.conf "[ speed_incr -0.1", playback_speed could still become non-positive. Robert Index: command.c =================================================================== --- command.c (revision 23455) +++ command.c (working copy) @@ -1836,6 +1836,7 @@ case MP_CMD_SPEED_INCR:{ float v = cmd->args[0].v.f; playback_speed += v; + if (playback_speed <= 0) playback_speed = .01; build_afilter_chain(sh_audio, &ao_data); set_osd_msg(OSD_MSG_SPEED, 1, osd_duration, MSGTR_OSDSpeed, playback_speed); @@ -1844,6 +1845,7 @@ case MP_CMD_SPEED_MULT:{ float v = cmd->args[0].v.f; playback_speed *= v; + if (playback_speed <= 0) playback_speed = .01; build_afilter_chain(sh_audio, &ao_data); set_osd_msg(OSD_MSG_SPEED, 1, osd_duration, MSGTR_OSDSpeed, playback_speed); @@ -1852,6 +1854,7 @@ case MP_CMD_SPEED_SET:{ float v = cmd->args[0].v.f; playback_speed = v; + if (playback_speed <= 0) playback_speed = .01; build_afilter_chain(sh_audio, &ao_data); set_osd_msg(OSD_MSG_SPEED, 1, osd_duration, MSGTR_OSDSpeed, playback_speed);

2 2

[PATCH] Unused variables in demux_mov.c
by Carl Eugen Hoyos 03 Jun '07

03 Jun '07

Hi! Attached patch removes a few warnings about unused variables in libmpdemux/demux_mov.c that are seen when compiling with -Wall. I'll apply next week if nobody objects. Carl Eugen Index: libmpdemux/demux_mov.c =================================================================== --- libmpdemux/demux_mov.c (Revision 23457) +++ libmpdemux/demux_mov.c (Arbeitskopie) @@ -434,8 +434,8 @@ case MOV_FOURCC('r','m','d','a'): continue; case MOV_FOURCC('r','d','r','f'): { - int tmp=stream_read_dword(demuxer->stream); - int type=stream_read_dword_le(demuxer->stream); + int av_unused tmp=stream_read_dword(demuxer->stream); + int av_unused type=stream_read_dword_le(demuxer->stream); int slen=stream_read_dword(demuxer->stream); //char* s=malloc(slen+1); //stream_read(demuxer->stream,s,slen); @@ -455,7 +455,7 @@ len-=12+slen;i-=12+slen; break; } case MOV_FOURCC('r','m','d','r'): { - int flags=stream_read_dword(demuxer->stream); + int av_unused flags=stream_read_dword(demuxer->stream); int rate=stream_read_dword(demuxer->stream); mp_msg(MSGT_DEMUX,MSGL_V," min. data rate: %d bits/sec\n",rate); len-=8; i-=8; break; @@ -1638,12 +1638,12 @@ break; } case MOV_FOURCC('h','d','l','r'): { - unsigned int tmp = stream_read_dword(demuxer->stream); + unsigned int av_unused tmp = stream_read_dword(demuxer->stream); unsigned int type = stream_read_dword_le(demuxer->stream); unsigned int subtype = stream_read_dword_le(demuxer->stream); unsigned int manufact = stream_read_dword_le(demuxer->stream); - unsigned int comp_flags = stream_read_dword(demuxer->stream); - unsigned int comp_mask = stream_read_dword(demuxer->stream); + unsigned int av_unused comp_flags = stream_read_dword(demuxer->stream); + unsigned int av_unused comp_mask = stream_read_dword(demuxer->stream); int len = stream_read_char(demuxer->stream); char* str = malloc(len + 1); stream_read(demuxer->stream, str, len); @@ -1723,7 +1723,7 @@ break; } case MOV_FOURCC('s','t','t','s'): { - int temp = stream_read_dword(demuxer->stream); + int av_unused temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; unsigned int pts = 0; @@ -1782,7 +1782,7 @@ break; } case MOV_FOURCC('s','t','c','o'): { - int temp = stream_read_dword(demuxer->stream); + int av_unused temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; mp_msg(MSGT_DEMUX, MSGL_V, @@ -1799,7 +1799,7 @@ break; } case MOV_FOURCC('c','o','6','4'): { - int temp = stream_read_dword(demuxer->stream); + int av_unused temp = stream_read_dword(demuxer->stream); int len = stream_read_dword(demuxer->stream); int i; mp_msg(MSGT_DEMUX, MSGL_V,

3 2

[PATCH 1/2] playback_speed limits: new_srate
by Robert Juliano 03 Jun '07

03 Jun '07

Patch 1: remove incorrect limits on playback_speed The limits from resample are for *output* rates, but new_srate sets the input rate for the filter stream. Patches both mplayer and mencoder. Robert Index: mplayer.c =================================================================== --- mplayer.c (revision 23455) +++ mplayer.c (working copy) @@ -1198,7 +1198,6 @@ */ int build_afilter_chain(sh_audio_t *sh_audio, ao_data_t *ao_data) { - int new_srate; int result; if (!sh_audio) { @@ -1208,16 +1207,8 @@ mpctx->mixer.afilter = NULL; return 0; } - new_srate = sh_audio->samplerate * playback_speed; - if (new_srate != ao_data->samplerate) { - // limits are taken from libaf/af_resample.c - if (new_srate < 8000) - new_srate = 8000; - if (new_srate > 192000) - new_srate = 192000; - playback_speed = (float)new_srate / (float)sh_audio->samplerate; - } - result = init_audio_filters(sh_audio, new_srate, + result = init_audio_filters(sh_audio, + sh_audio->samplerate * playback_speed, sh_audio->channels, sh_audio->sample_format, &ao_data->samplerate, &ao_data->channels, &ao_data->format, ao_data->outburst * 4, ao_data->buffersize); Index: mencoder.c =================================================================== --- mencoder.c (revision 23455) +++ mencoder.c (working copy) @@ -643,14 +643,7 @@ } if (sh_audio) { - new_srate = sh_audio->samplerate; - if (playback_speed != 1.0) { - new_srate *= playback_speed; - // limits are taken from libaf/af_resample.c - if (new_srate < 8000) new_srate = 8000; - if (new_srate > 192000) new_srate = 192000; - playback_speed = (float)new_srate / (float)sh_audio->samplerate; - } + new_srate = sh_audio->samplerate * playback_speed; } // after reading video params we should load subtitles because

2 2

[PATCH] parse_es.c: remove unused parameter
by Zuxy Meng 03 Jun '07

03 Jun '07

Hi, 'skipped' isn't unused in the format string so isn't necessary. -- Zuxy Beauty is truth, While truth is beauty. PGP KeyID: E8555ED6

2 2

Re: [MPlayer-dev-eng] [FFmpeg-cvslog] r9172 - in trunk: configure libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/faad.c
by Guillaume POIRIER 02 Jun '07

02 Jun '07

Hi, On 6/2/07, diego <subversion(a)mplayerhq.hu> wrote: > Author: diego > Date: Sat Jun 2 13:44:44 2007 > New Revision: 9172 > > Log: > Rename aac_decoder to libfaad_decoder for consistency and to be able to > more easily add a possible future native decoder. This breaks compilation of MPlayer, but I don't know how to fix it: gcc -o mplayer mplayer.o m_property.o mp_fifo.o mp_msg.o mixer.o parser-mpcmd.o subopt-helper.o command.o asxparser.o codec-cfg.o cpudetect.o edl.o find_sub.o m_config.o m_option.o m_struct.o mpcommon.o parser-cfg.o playtree.o playtreeparser.o spudec.o sub_cc.o subreader.o vobsub.o unrarlib.o libvo/libvo.a libao2/libao2.a input/libinput.a vidix/libvidix.a libmpcodecs/libmpcodecs.a libaf/libaf.a libmpdemux/libmpdemux.a stream/stream.a libswscale/libswscale.a libvo/libosd.a libavformat/libavformat.a libavcodec/libavcodec.a libavutil/libavutil.a libpostproc/libpostproc.a mp3lib/libmp3.a liba52/liba52.a libmpeg2/libmpeg2.a libfaad2/libfaad2.a tremor/libvorbisidec.a dvdread/libdvdread.a libdvdcss/libdvdcss.a libass/libass.a osdep/libosdep.a -lXext -lX11 -lpthread -lXv -lGL -ldl -laa -lSDL -lpthread -laudio -lXt -ldl -lartsc -lpthread -lgmodule-2.0 -ldl -lgthread-2.0 -lglib-2.0 -lesd -laudiofile -lm -lx264 -lpthread -L/usr/lib -L/usr/lib -L/usr/lib -Wl,-z,noexecstack -lncurses -lasound -ldl -lpthread -lfreetype -lz -lz -lmpcdec -lpthread -ldl -rdynamic -lm libavcodec/libavcodec.a(allcodecs.o): In function `avcodec_register_all':allcodecs.c:(.text+0x5d2): undefined reference to `libfaad_decoder' collect2: ld returned 1 exit status make[1]: *** [mplayer] Erreur 1 Guillaume -- Y'a pas de gonzesse hooligan, Imbécile et meurtrière Y'en a pas même en grande Bretagne A part bien sûr Madame Thatcher -- Renaud (sur "Miss Maggie")

2 2