January 2014 - MPlayer-cvslog - lists.mplayerhq.hu

r36625 - trunk/libmpdemux/demux_rawdv.c
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 12:13:02 2014 New Revision: 36625 Log: rawdv: remove pointless casts. Modified: trunk/libmpdemux/demux_rawdv.c Modified: trunk/libmpdemux/demux_rawdv.c ============================================================================== --- trunk/libmpdemux/demux_rawdv.c Sun Jan 19 12:13:01 2014 (r36624) +++ trunk/libmpdemux/demux_rawdv.c Sun Jan 19 12:13:02 2014 (r36625) @@ -50,7 +50,7 @@ typedef struct static void demux_seek_rawdv(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags) { - rawdv_frames_t *frames = (rawdv_frames_t *)demuxer->priv; + rawdv_frames_t *frames = demuxer->priv; sh_video_t *sh_video = demuxer->video->sh; off_t newpos=(flags&SEEK_ABSOLUTE)?0:frames->current_frame; if(flags&SEEK_FACTOR) @@ -109,7 +109,7 @@ static int rawdv_check_file(demuxer_t *d // 1 = successfully read a packet static int demux_rawdv_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) { - rawdv_frames_t *frames = (rawdv_frames_t *)demuxer->priv; + rawdv_frames_t *frames = demuxer->priv; demux_packet_t* dp_video=NULL; sh_video_t *sh_video = demuxer->video->sh; int bytes_read=0; @@ -237,7 +237,7 @@ static demuxer_t* demux_open_rawdv(demux static void demux_close_rawdv(demuxer_t* demuxer) { - rawdv_frames_t *frames = (rawdv_frames_t *)demuxer->priv; + rawdv_frames_t *frames = demuxer->priv; if(frames==0) return; @@ -245,7 +245,7 @@ static void demux_close_rawdv(demuxer_t* } static int demux_rawdv_control(demuxer_t *demuxer,int cmd, void *arg) { - rawdv_frames_t *frames = (rawdv_frames_t *)demuxer->priv; + rawdv_frames_t *frames = demuxer->priv; sh_video_t *sh_video=demuxer->video->sh; switch(cmd) {

1 0

r36624 - trunk/libmpdemux/demux_rawdv.c
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 12:13:01 2014 New Revision: 36624 Log: rawdv: Fix memory leak in error case. Modified: trunk/libmpdemux/demux_rawdv.c Modified: trunk/libmpdemux/demux_rawdv.c ============================================================================== --- trunk/libmpdemux/demux_rawdv.c Sun Jan 19 11:53:03 2014 (r36623) +++ trunk/libmpdemux/demux_rawdv.c Sun Jan 19 12:13:01 2014 (r36624) @@ -121,8 +121,10 @@ static int demux_rawdv_fill_buffer(demux dp_video=new_demux_packet(frames->frame_size); bytes_read=stream_read(demuxer->stream,dp_video->buffer,frames->frame_size); - if (bytes_read<frames->frame_size) + if (bytes_read<frames->frame_size) { + free_demux_packet(dp_video); return 0; + } dp_video->pts=frames->current_frame/sh_video->fps; dp_video->pos=frames->current_filepos; dp_video->flags=0;

1 0

r36623 - trunk/stream/cookies.c
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 11:53:03 2014 New Revision: 36623 Log: cookies.c: cols must (and does) have 7 elements. Doesn't affect the generated code, but avoids confusion in both humans and newer Coverity versions. Modified: trunk/stream/cookies.c Modified: trunk/stream/cookies.c ============================================================================== --- trunk/stream/cookies.c Sun Jan 19 11:48:02 2014 (r36622) +++ trunk/stream/cookies.c Sun Jan 19 11:53:03 2014 (r36623) @@ -89,7 +89,7 @@ static int left_hand_strcmp(const char * } /* Finds the start of all the columns */ -static int parse_line(char **ptr, char *cols[6]) +static int parse_line(char **ptr, char *cols[7]) { int col; cols[0] = *ptr;

1 0

r36622 - trunk/stream/vcd_read.h
by reimar 19 Jan '14

19 Jan '14

Author: reimar Date: Sun Jan 19 11:48:02 2014 New Revision: 36622 Log: vcd_read: Fix sizeof argument. The struct we need to copy is actually a cdrom_msf0, not cdrom_msf. Even though the kernel for no good reason reads it in as a cdrom_msf struct, but only uses the part shared with cdrom_msf0 - this is probably a kernel bug. Modified: trunk/stream/vcd_read.h Modified: trunk/stream/vcd_read.h ============================================================================== --- trunk/stream/vcd_read.h Sun Jan 19 01:01:21 2014 (r36621) +++ trunk/stream/vcd_read.h Sun Jan 19 11:48:02 2014 (r36622) @@ -152,7 +152,7 @@ static int vcd_end_track(mp_vcd_priv_t* static int vcd_read(mp_vcd_priv_t* vcd,char *mem){ #ifndef sun - memcpy(vcd->buf,&vcd->entry.cdte_addr.msf,sizeof(struct cdrom_msf)); + memcpy(vcd->buf,&vcd->entry.cdte_addr.msf,sizeof(vcd->entry.cdte_addr.msf)); if(ioctl(vcd->fd,CDROMREADRAW,vcd->buf)==-1) return 0; // EOF? memcpy(mem,&vcd->buf[VCD_SECTOR_OFFS],VCD_SECTOR_DATA); #else

1 0

r36621 - trunk/gui/dialog/preferences.c
by ib 18 Jan '14

18 Jan '14

Author: ib Date: Sun Jan 19 01:01:21 2014 New Revision: 36621 Log: Add #ifdef to avoid warnings. This is related to r36585 and hasn't been fixed there properly. Additionally, combine the definitions of conditional variables. Modified: trunk/gui/dialog/preferences.c Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Sun Jan 19 00:38:50 2014 (r36620) +++ trunk/gui/dialog/preferences.c Sun Jan 19 01:01:21 2014 (r36621) @@ -550,8 +550,12 @@ static GtkWidget * CreatePreferences( vo GtkWidget * vbox6; GtkWidget * vbox600; GSList * OSD_group = NULL; +#ifdef CONFIG_FREETYPE GSList * Font_group = NULL; GList * CBFontEncoding_items = NULL; +#else + GtkWidget * hbox7; +#endif #ifdef CONFIG_ICONV GList * CBSubEncoding_items = NULL; #endif @@ -562,9 +566,6 @@ static GtkWidget * CreatePreferences( vo GtkWidget * vbox603; GtkWidget * hbox6; GtkWidget * hbuttonbox5; -#ifndef CONFIG_FREETYPE - GtkWidget * hbox7; -#endif GtkWidget * vbox601; GtkWidget * vbox602; GtkWidget * hbox5;

1 0

r36620 - trunk/gui/dialog/preferences.c
by ib 18 Jan '14

18 Jan '14

Author: ib Date: Sun Jan 19 00:38:50 2014 New Revision: 36620 Log: Remove pointless declaration of static function. Modified: trunk/gui/dialog/preferences.c Modified: trunk/gui/dialog/preferences.c ============================================================================== --- trunk/gui/dialog/preferences.c Sun Jan 19 00:08:34 2014 (r36619) +++ trunk/gui/dialog/preferences.c Sun Jan 19 00:38:50 2014 (r36620) @@ -210,9 +210,6 @@ static GtkWidget *DXR3Config; static gboolean prHScaler( GtkWidget * widget,GdkEvent * event,gpointer user_data ); static void prToggled( GtkToggleButton * togglebutton,gpointer user_data ); static void prCListRow( GtkCList * clist,gint row,gint column,GdkEvent * event,gpointer user_data ); -#if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV) -static void prEntry( GtkEditable * editable,gpointer user_data ); -#endif #if defined(CONFIG_FREETYPE) || defined(CONFIG_ICONV) static void prEntry( GtkEditable * editable,gpointer user_data )

1 0

r36619 - trunk/libvo/vo_sdl.c
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sun Jan 19 00:08:34 2014 New Revision: 36619 Log: vo_sdl: some minor code simplifications. Modified: trunk/libvo/vo_sdl.c Modified: trunk/libvo/vo_sdl.c ============================================================================== --- trunk/libvo/vo_sdl.c Sun Jan 19 00:08:33 2014 (r36618) +++ trunk/libvo/vo_sdl.c Sun Jan 19 00:08:34 2014 (r36619) @@ -98,11 +98,9 @@ const LIBVO_EXTERN(sdl) } #define SDL_OVR_UNLOCK SDL_UnlockYUVOverlay (priv->overlay); -#define SDL_SRF_LOCK(srf, x) if(SDL_MUSTLOCK(srf)) { \ - if(SDL_LockSurface (srf)) { \ +#define SDL_SRF_LOCK(srf, x) if(SDL_MUSTLOCK(srf) && SDL_LockSurface (srf)) { \ mp_msg(MSGT_VO,MSGL_V, "SDL: Couldn't lock RGB surface\n"); \ return x; \ - } \ } #define SDL_SRF_UNLOCK(srf) if(SDL_MUSTLOCK(srf)) \ @@ -241,25 +239,18 @@ static void draw_alpha(int x0,int y0, in /* OSD did change. Store a bounding box of everything drawn into the OSD */ if(priv->y >= y0) { /* Make sure we don't mark part of the frame area dirty */ - if(h + y0 > priv->y) - expand_rect(&priv->dirty_off_frame[0], x0, y0, w, priv->y - y0); - else - expand_rect(&priv->dirty_off_frame[0], x0, y0, w, h); + expand_rect(&priv->dirty_off_frame[0], x0, y0, w, FFMIN(priv->y - y0, h)); } else if(priv->y + priv->height <= y0 + h) { /* Make sure we don't mark part of the frame area dirty */ - if(y0 < priv->y + priv->height) - expand_rect(&priv->dirty_off_frame[1], x0, - priv->y + priv->height, - w, h - ((priv->y + priv->height) - y0)); - else - expand_rect(&priv->dirty_off_frame[1], x0, y0, w, h); + int offset = FFMAX(0, priv->y + priv->height - y0); + expand_rect(&priv->dirty_off_frame[1], x0, y0 + offset, w, h - offset); } } else { /* OSD contents didn't change only draw parts that was erased by the frame */ if(priv->y >= y0) { - src = src + (priv->y - y0) * stride; - srca = srca + (priv->y - y0) * stride; + src += (priv->y - y0) * stride; + srca += (priv->y - y0) * stride; h -= priv->y - y0; y0 = priv->y; } @@ -283,11 +274,9 @@ static void draw_alpha(int x0,int y0, in break; default: - if(priv->dblit) { - draw(w,h,src,srca,stride,((uint8_t *) priv->surface->pixels)+y0*priv->surface->pitch+x0,priv->surface->pitch); - } - else { - draw(w,h,src,srca,stride,((uint8_t *) priv->rgbsurface->pixels)+y0*priv->rgbsurface->pitch+x0,priv->rgbsurface->pitch); + { + SDL_Surface *sf = priv->dblit ? priv->surface : priv->rgbsurface; + draw(w,h,src,srca,stride,((uint8_t *)sf->pixels)+y0*sf->pitch+x0,sf->pitch); } } } @@ -520,10 +509,8 @@ static void set_fullmode (int mode) { aspect_save_screenres(screen_surface_w, screen_surface_h); /* calculate new video size/aspect */ - if(priv->mode == YUV) { - if(priv->fulltype&VOFLAG_FULLSCREEN) + if(priv->mode == YUV && priv->fulltype&VOFLAG_FULLSCREEN) aspect(&priv->dstwidth, &priv->dstheight, A_ZOOM); - } /* try to change to given fullscreenmode */ vo_dwidth = priv->dstwidth; @@ -853,26 +840,17 @@ static int draw_frame(uint8_t *src[]) case IMGFMT_BGR24: case IMGFMT_RGB32: case IMGFMT_BGR32: - if(priv->dblit) { - SDL_SRF_LOCK(priv->surface, -1) - dst = (uint8_t *) priv->surface->pixels + priv->y*priv->surface->pitch; - if (priv->flip) { - mysrc += (priv->height - 1) * srcstride; - srcstride = -srcstride; - } - memcpy_pic(dst, mysrc, priv->stridePlaneRGB, priv->height, - priv->surface->pitch, srcstride); - SDL_SRF_UNLOCK(priv->surface) - } else { - SDL_SRF_LOCK(priv->rgbsurface, -1) - dst = (uint8_t *) priv->rgbsurface->pixels + priv->y*priv->rgbsurface->pitch; + { + SDL_Surface *sf = priv->dblit ? priv->surface : priv->rgbsurface; + SDL_SRF_LOCK(sf, -1) + dst = (uint8_t *)sf->pixels + priv->y*sf->pitch; if (priv->flip) { mysrc += (priv->height - 1) * srcstride; srcstride = -srcstride; } memcpy_pic(dst, mysrc, priv->stridePlaneRGB, priv->height, - priv->rgbsurface->pitch, srcstride); - SDL_SRF_UNLOCK(priv->rgbsurface) + sf->pitch, srcstride); + SDL_SRF_UNLOCK(sf) } break; @@ -1081,20 +1059,14 @@ static void erase_rectangle(int x, int y case IMGFMT_RGB32: case IMGFMT_BGR32: { + SDL_Surface *sf = priv->dblit ? priv->surface : priv->rgbsurface; SDL_Rect rect; rect.w = w; rect.h = h; rect.x = x; rect.y = y; - if(priv->dblit) { - SDL_SRF_LOCK(priv->surface, (void) 0) - SDL_FillRect(priv->surface, &rect, 0); - SDL_SRF_UNLOCK(priv->surface) - } - else { - SDL_SRF_LOCK(priv->rgbsurface, (void) 0) - SDL_FillRect(priv->rgbsurface, &rect, 0); - SDL_SRF_UNLOCK(priv->rgbsurface) - } + SDL_SRF_LOCK(sf, (void) 0) + SDL_FillRect(sf, &rect, 0); + SDL_SRF_UNLOCK(sf) break; } } @@ -1125,10 +1097,8 @@ static void draw_osd(void) if(priv->mode == YUV) vo_draw_text(priv->overlay->w, priv->overlay->h, draw_alpha); else { - if(priv->dblit) - vo_draw_text(priv->surface->w, priv->surface->h, draw_alpha); - else - vo_draw_text(priv->rgbsurface->w, priv->rgbsurface->h, draw_alpha); + SDL_Surface *sf = priv->dblit ? priv->surface : priv->rgbsurface; + vo_draw_text(sf->w, sf->h, draw_alpha); } } @@ -1338,17 +1308,12 @@ static uint32_t get_image(mp_image_t *mp } } else if(IMGFMT_IS_RGB(priv->format) || IMGFMT_IS_BGR(priv->format)) { - if(priv->dblit) { - if(mpi->type == MP_IMGTYPE_STATIC && (priv->surface->flags & SDL_DOUBLEBUF)) + SDL_Surface *sf = priv->dblit ? priv->surface : priv->rgbsurface; + if(priv->dblit && mpi->type == MP_IMGTYPE_STATIC && (priv->surface->flags & SDL_DOUBLEBUF)) return VO_FALSE; - mpi->planes[0] = (uint8_t *)priv->surface->pixels + priv->y*priv->surface->pitch; - mpi->stride[0] = priv->surface->pitch; - } - else { - mpi->planes[0] = (uint8_t *)priv->rgbsurface->pixels + priv->y*priv->rgbsurface->pitch; - mpi->stride[0] = priv->rgbsurface->pitch; - } + mpi->planes[0] = (uint8_t *)sf->pixels + priv->y*sf->pitch; + mpi->stride[0] = sf->pitch; } else { mpi->planes[0] = priv->overlay->pixels[0] + priv->y*priv->overlay->pitches[0];

1 0

r36618 - trunk/libvo/vo_sdl.c
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sun Jan 19 00:08:33 2014 New Revision: 36618 Log: vo_sdl: Avoid code duplication in DR code. Modified: trunk/libvo/vo_sdl.c Modified: trunk/libvo/vo_sdl.c ============================================================================== --- trunk/libvo/vo_sdl.c Sun Jan 19 00:08:32 2014 (r36617) +++ trunk/libvo/vo_sdl.c Sun Jan 19 00:08:33 2014 (r36618) @@ -1327,16 +1327,14 @@ static uint32_t get_image(mp_image_t *mp if(mpi->flags&MP_IMGFLAG_PLANAR) { mpi->planes[0] = priv->overlay->pixels[0] + priv->y*priv->overlay->pitches[0]; mpi->stride[0] = priv->overlay->pitches[0]; - if(mpi->flags&MP_IMGFLAG_SWAPPED) { - mpi->planes[1] = priv->overlay->pixels[1] + priv->y*priv->overlay->pitches[1]/2; - mpi->stride[1] = priv->overlay->pitches[1]; - mpi->planes[2] = priv->overlay->pixels[2] + priv->y*priv->overlay->pitches[2]/2; - mpi->stride[2] = priv->overlay->pitches[2]; - } else { - mpi->planes[2] = priv->overlay->pixels[1] + priv->y*priv->overlay->pitches[1]/2; - mpi->stride[2] = priv->overlay->pitches[1]; - mpi->planes[1] = priv->overlay->pixels[2] + priv->y*priv->overlay->pitches[2]/2; - mpi->stride[1] = priv->overlay->pitches[2]; + mpi->planes[1] = priv->overlay->pixels[1] + priv->y*priv->overlay->pitches[1]/2; + mpi->stride[1] = priv->overlay->pitches[1]; + mpi->planes[2] = priv->overlay->pixels[2] + priv->y*priv->overlay->pitches[2]/2; + mpi->stride[2] = priv->overlay->pitches[2]; + // SDL order is considered swapped by MPlayer + if(!(mpi->flags&MP_IMGFLAG_SWAPPED)) { + FFSWAP(void *, mpi->planes[1], mpi->planes[2]); + FFSWAP(int, mpi->stride[1], mpi->stride[2]); } } else if(IMGFMT_IS_RGB(priv->format) || IMGFMT_IS_BGR(priv->format)) {

1 0

r36617 - trunk/libvo/vo_sdl.c
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sun Jan 19 00:08:32 2014 New Revision: 36617 Log: vo_sdl: remove some commented-out code, reduce code duplication. Modified: trunk/libvo/vo_sdl.c Modified: trunk/libvo/vo_sdl.c ============================================================================== --- trunk/libvo/vo_sdl.c Sun Jan 19 00:08:31 2014 (r36616) +++ trunk/libvo/vo_sdl.c Sun Jan 19 00:08:32 2014 (r36617) @@ -1189,7 +1189,6 @@ static void flip_page (void) } /* update screen */ - //SDL_UpdateRect(priv->surface, 0, 0, priv->surface->clip_rect.w, priv->surface->clip_rect.h); if(priv->osd_has_changed) { priv->osd_has_changed = 0; SDL_UpdateRects(priv->surface, 1, &priv->surface->clip_rect); @@ -1198,21 +1197,14 @@ static void flip_page (void) SDL_UpdateRect(priv->surface, 0, priv->y_screen_top, priv->surface->clip_rect.w, priv->y_screen_bottom); - /* check if we have a double buffered surface and flip() if we do. */ - if ( priv->surface->flags & SDL_DOUBLEBUF ) - SDL_Flip(priv->surface); - break; default: /* blit to the YUV overlay */ SDL_DisplayYUVOverlay (priv->overlay, &priv->surface->clip_rect); - - /* check if we have a double buffered surface and flip() if we do. */ - if ( priv->surface->flags & SDL_DOUBLEBUF ) - SDL_Flip(priv->surface); - - //SDL_LockYUVOverlay (priv->overlay); // removed because unused!? } + /* check if we have a double buffered surface and flip() if we do. */ + if ( priv->surface->flags & SDL_DOUBLEBUF ) + SDL_Flip(priv->surface); } static int

1 0

r36616 - trunk/libvo/vo_sdl.c
by reimar 18 Jan '14

18 Jan '14

Author: reimar Date: Sun Jan 19 00:08:31 2014 New Revision: 36616 Log: vo_sdl: Avoid setenv code duplication. Modified: trunk/libvo/vo_sdl.c Modified: trunk/libvo/vo_sdl.c ============================================================================== --- trunk/libvo/vo_sdl.c Sun Jan 19 00:08:29 2014 (r36615) +++ trunk/libvo/vo_sdl.c Sun Jan 19 00:08:31 2014 (r36616) @@ -1293,12 +1293,10 @@ static int preinit(const char *arg) } /* does the user want SDL to try and force Xv */ - if(sdl_forcexv) setenv("SDL_VIDEO_X11_NODIRECTCOLOR", "1", 1); - else setenv("SDL_VIDEO_X11_NODIRECTCOLOR", "0", 1); + setenv("SDL_VIDEO_X11_NODIRECTCOLOR", sdl_forcexv ? "1" : "0", 1); /* does the user want to disable Xv and use software scaling instead */ - if(sdl_hwaccel) setenv("SDL_VIDEO_YUV_HWACCEL", "1", 1); - else setenv("SDL_VIDEO_YUV_HWACCEL", "0", 1); + setenv("SDL_VIDEO_YUV_HWACCEL", sdl_hwaccel ? "1" : "0", 1); /* default to no fullscreen mode, we'll set this as soon we have the avail. modes */ priv->fullmode = -2;

1 0