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

r35251 - trunk/etc/codecs.conf
by cehoyos 01 Nov '12

01 Nov '12

Author: cehoyos Date: Wed Oct 17 22:14:28 2012 New Revision: 35251 Log: Do not allow 'black' decoder to be prefered over real decoders. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue Oct 16 00:04:14 2012 (r35250) +++ trunk/etc/codecs.conf Wed Oct 17 22:14:28 2012 (r35251) @@ -4219,7 +4219,7 @@ videocodec null videocodec black info "black codec (no decoding just output black frames!)" - status working + status buggy comment "for unknown/unsupported codecs or testing" driver black out YV12

3 3

r35143 - in trunk/sub: osd.c osd.h
by reimar 01 Nov '12

01 Nov '12

Author: reimar Date: Sun Sep 2 23:17:03 2012 New Revision: 35143 Log: Add helper function to reduce code duplication for selecting correct OSD drawing function. Modified: trunk/sub/osd.c trunk/sub/osd.h Modified: trunk/sub/osd.c ============================================================================== --- trunk/sub/osd.c Sat Sep 1 18:54:53 2012 (r35142) +++ trunk/sub/osd.c Sun Sep 2 23:17:03 2012 (r35143) @@ -27,6 +27,8 @@ #include "osd.h" #include "mp_msg.h" #include <inttypes.h> +#include <stdlib.h> +#include "libmpcodecs/img_format.h" #include "cpudetect.h" #if ARCH_X86 @@ -426,3 +428,34 @@ void vo_draw_alpha_rgb16(int w,int h, un } return; } + +vo_draw_alpha_func vo_get_draw_alpha(unsigned fmt) { + if (IMGFMT_IS_RGB(fmt) || IMGFMT_IS_BGR(fmt)) { + switch (IMGFMT_RGB_DEPTH(fmt)) + { + case 12: + return vo_draw_alpha_rgb12; + case 15: + return vo_draw_alpha_rgb15; + case 16: + return vo_draw_alpha_rgb16; + case 24: + return vo_draw_alpha_rgb24; + case 32: + return vo_draw_alpha_rgb32; + } + return NULL; + } + switch (fmt) { + case IMGFMT_YV12: + case IMGFMT_I420: + case IMGFMT_IYUV: + return vo_draw_alpha_yv12; + case IMGFMT_YUY2: + case IMGFMT_YVYU: + return vo_draw_alpha_yuy2; + case IMGFMT_UYVY: + return vo_draw_alpha_uyvy; + } + return NULL; +} Modified: trunk/sub/osd.h ============================================================================== --- trunk/sub/osd.h Sat Sep 1 18:54:53 2012 (r35142) +++ trunk/sub/osd.h Sun Sep 2 23:17:03 2012 (r35143) @@ -24,6 +24,9 @@ void vo_draw_alpha_init(void); // build tables +typedef void (*vo_draw_alpha_func)(int, int, unsigned char *, unsigned char *, int, unsigned char *, int); +vo_draw_alpha_func vo_get_draw_alpha(unsigned fmt); + void vo_draw_alpha_yv12(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride); void vo_draw_alpha_yuy2(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride); void vo_draw_alpha_uyvy(int w, int h, unsigned char* src, unsigned char *srca, int srcstride, unsigned char* dstbase, int dststride);

3 4

r35319 - trunk/libmpdemux/muxer.c
by reimar 31 Oct '12

31 Oct '12

Author: reimar Date: Wed Oct 31 21:58:39 2012 New Revision: 35319 Log: Remove another incorrect use of realloc_struct. Modified: trunk/libmpdemux/muxer.c Modified: trunk/libmpdemux/muxer.c ============================================================================== --- trunk/libmpdemux/muxer.c Wed Oct 31 21:56:41 2012 (r35318) +++ trunk/libmpdemux/muxer.c Wed Oct 31 21:58:39 2012 (r35319) @@ -132,14 +132,14 @@ void muxer_write_chunk(muxer_stream_t *s } else { int num = s->muxer->muxbuf_num++; - muxbuf_t *buf, *tmp; + muxbuf_t *buf; - tmp = realloc_struct(s->muxer->muxbuf, (num+1), sizeof(muxbuf_t)); - if(!tmp) { + s->muxer->muxbuf = realloc_struct(s->muxer->muxbuf, (num+1), sizeof(muxbuf_t)); + if(!s->muxer->muxbuf) { + s->muxer->muxbuf_num = 0; mp_msg(MSGT_MUXER, MSGL_FATAL, MSGTR_MuxbufReallocErr); return; } - s->muxer->muxbuf = tmp; buf = s->muxer->muxbuf + num; /* buffer this frame */

1 0

r35318 - trunk/libmpdemux/demux_ts.c
by reimar 31 Oct '12

31 Oct '12

Author: reimar Date: Wed Oct 31 21:56:41 2012 New Revision: 35318 Log: Remove some incorrect usages of realloc_struct. Modified: trunk/libmpdemux/demux_ts.c Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c Wed Oct 31 21:44:16 2012 (r35317) +++ trunk/libmpdemux/demux_ts.c Wed Oct 31 21:56:41 2012 (r35318) @@ -1754,7 +1754,6 @@ static int parse_pat(ts_priv_t * priv, i unsigned char *base; int entries, i; uint16_t progid; - struct pat_progs_t *tmp; ts_section_t *section; section = &(priv->pat.section); @@ -1788,14 +1787,14 @@ static int parse_pat(ts_priv_t * priv, i if((idx = prog_idx_in_pat(priv, progid)) == -1) { - int sz = sizeof(struct pat_progs_t) * (priv->pat.progs_cnt+1); - tmp = realloc_struct(priv->pat.progs, priv->pat.progs_cnt+1, sizeof(struct pat_progs_t)); - if(tmp == NULL) + priv->pat.progs = realloc_struct(priv->pat.progs, priv->pat.progs_cnt+1, sizeof(struct pat_progs_t)); + if(!priv->pat.progs) { + int sz = sizeof(struct pat_progs_t) * (priv->pat.progs_cnt+1); + priv->pat.progs_cnt = 0; mp_msg(MSGT_DEMUX, MSGL_ERR, "PARSE_PAT: COULDN'T REALLOC %d bytes, NEXT\n", sz); break; } - priv->pat.progs = tmp; idx = priv->pat.progs_cnt; priv->pat.progs_cnt++; } @@ -2047,7 +2046,7 @@ static uint16_t parse_mp4_es_descriptor( { int i = 0, j = 0, k, found; uint8_t flag; - mp4_es_descr_t es, *target_es = NULL, *tmp; + mp4_es_descr_t es, *target_es = NULL; mp_msg(MSGT_DEMUX, MSGL_V, "PARSE_MP4ES: len=%d\n", len); memset(&es, 0, sizeof(mp4_es_descr_t)); @@ -2082,13 +2081,13 @@ static uint16_t parse_mp4_es_descriptor( if(! found) { - tmp = realloc_struct(pmt->mp4es, pmt->mp4es_cnt+1, sizeof(mp4_es_descr_t)); - if(tmp == NULL) + pmt->mp4es = realloc_struct(pmt->mp4es, pmt->mp4es_cnt+1, sizeof(mp4_es_descr_t)); + if(!pmt->mp4es) { + pmt->mp4es_cnt = 0; fprintf(stderr, "CAN'T REALLOC MP4_ES_DESCR\n"); continue; } - pmt->mp4es = tmp; target_es = &(pmt->mp4es[pmt->mp4es_cnt]); pmt->mp4es_cnt++; } @@ -2423,8 +2422,6 @@ static int parse_pmt(ts_priv_t * priv, u int32_t idx, es_count, section_bytes; uint8_t m=0; int skip; - pmt_t *tmp; - struct pmt_es_t *tmp_es; ts_section_t *section; ES_stream_t *tss; int i; @@ -2433,14 +2430,14 @@ static int parse_pmt(ts_priv_t * priv, u if(idx == -1) { - int sz = (priv->pmt_cnt + 1) * sizeof(pmt_t); - tmp = realloc_struct(priv->pmt, priv->pmt_cnt + 1, sizeof(pmt_t)); - if(tmp == NULL) + priv->pmt = realloc_struct(priv->pmt, priv->pmt_cnt + 1, sizeof(pmt_t)); + if(!priv->pmt) { + int sz = (priv->pmt_cnt + 1) * sizeof(pmt_t); + priv->pmt_cnt = 0; mp_msg(MSGT_DEMUX, MSGL_ERR, "PARSE_PMT: COULDN'T REALLOC %d bytes, NEXT\n", sz); return 0; } - priv->pmt = tmp; idx = priv->pmt_cnt; memset(&(priv->pmt[idx]), 0, sizeof(pmt_t)); priv->pmt_cnt++; @@ -2494,14 +2491,14 @@ static int parse_pmt(ts_priv_t * priv, u idx = es_pid_in_pmt(pmt, es_pid); if(idx == -1) { - int sz = sizeof(struct pmt_es_t) * (pmt->es_cnt + 1); - tmp_es = realloc_struct(pmt->es, pmt->es_cnt + 1, sizeof(struct pmt_es_t)); - if(tmp_es == NULL) + pmt->es = realloc_struct(pmt->es, pmt->es_cnt + 1, sizeof(struct pmt_es_t)); + if(!pmt->es) { + int sz = sizeof(struct pmt_es_t) * (pmt->es_cnt + 1); + pmt->es_cnt = 0; mp_msg(MSGT_DEMUX, MSGL_ERR, "PARSE_PMT, COULDN'T ALLOCATE %d bytes for PMT_ES\n", sz); continue; } - pmt->es = tmp_es; idx = pmt->es_cnt; memset(&(pmt->es[idx]), 0, sizeof(struct pmt_es_t)); pmt->es_cnt++;

1 0

r35317 - trunk/libmpdemux/demux_mov.c
by reimar 31 Oct '12

31 Oct '12

Author: reimar Date: Wed Oct 31 21:44:16 2012 New Revision: 35317 Log: Fix off-by-one error in range check. Modified: trunk/libmpdemux/demux_mov.c Modified: trunk/libmpdemux/demux_mov.c ============================================================================== --- trunk/libmpdemux/demux_mov.c Wed Oct 31 21:41:07 2012 (r35316) +++ trunk/libmpdemux/demux_mov.c Wed Oct 31 21:44:16 2012 (r35317) @@ -1224,7 +1224,7 @@ static int gen_sh_video(sh_video_t* sh, if (count_flag & 0x8000) entry = i; // only care about top 8 bits of 16-bit R, G, or B value - if (entry <= palette_count && entry >= 0) + if (entry < palette_count && entry >= 0) { palette_map[entry * 4 + 2] = trak->stdata[hdr_ptr + 0]; palette_map[entry * 4 + 1] = trak->stdata[hdr_ptr + 2];

1 0

r35316 - trunk/libmpdemux/demux_ty_osd.c
by reimar 31 Oct '12

31 Oct '12

Author: reimar Date: Wed Oct 31 21:41:07 2012 New Revision: 35316 Log: Actually bail out when we detect that we would run outside the array, instead of going a ahead and doing it anyway. Modified: trunk/libmpdemux/demux_ty_osd.c Modified: trunk/libmpdemux/demux_ty_osd.c ============================================================================== --- trunk/libmpdemux/demux_ty_osd.c Wed Oct 31 21:29:28 2012 (r35315) +++ trunk/libmpdemux/demux_ty_osd.c Wed Oct 31 21:41:07 2012 (r35316) @@ -500,6 +500,7 @@ static void ty_AddXDSToDisplay( const ch if ( ty_XDSAddLine == XDS_BUFFER_LENGTH ) { mp_msg( MSGT_DEMUX, MSGL_ERR, "XDS Buffer would have been blown\n" ); + return; } if ( ty_XDS_Display[ ty_XDSAddLine ] != 0 )

1 0

r35315 - trunk/libmpdemux/muxer_avi.c
by reimar 31 Oct '12

31 Oct '12

Author: reimar Date: Wed Oct 31 21:29:28 2012 New Revision: 35315 Log: Do range check before using the variable for array indexing. The other way round makes little sense... Modified: trunk/libmpdemux/muxer_avi.c Modified: trunk/libmpdemux/muxer_avi.c ============================================================================== --- trunk/libmpdemux/muxer_avi.c Wed Oct 31 21:11:49 2012 (r35314) +++ trunk/libmpdemux/muxer_avi.c Wed Oct 31 21:29:28 2012 (r35315) @@ -228,7 +228,7 @@ static void avifile_write_header(muxer_t } /* deal with stream delays */ - for (i = 0; muxer->streams[i] && i < MUXER_MAX_STREAMS; ++i) { + for (i = 0; i < MUXER_MAX_STREAMS && muxer->streams[i]; ++i) { muxer_stream_t *s = muxer->streams[i]; if (s->type == MUXER_TYPE_AUDIO && muxer->audio_delay_fix > 0.0) { s->h.dwStart = muxer->audio_delay_fix * s->h.dwRate/s->h.dwScale + 0.5;

1 0

r35314 - trunk/sub/sub.c
by reimar 31 Oct '12

31 Oct '12

Author: reimar Date: Wed Oct 31 21:11:49 2012 New Revision: 35314 Log: Fix potential out-of-bounds write due to breaking out only of the inner loop when reaching the limit. Modified: trunk/sub/sub.c Modified: trunk/sub/sub.c ============================================================================== --- trunk/sub/sub.c Wed Oct 31 21:05:31 2012 (r35313) +++ trunk/sub/sub.c Wed Oct 31 21:11:49 2012 (r35314) @@ -942,6 +942,8 @@ static inline void vo_update_text_sub(mp obj->params.subtitle.utbl[utblc++] = c; k++; } + if (utblc > MAX_UCS) + break; obj->params.subtitle.utbl[utblc++] = ' '; } obj->params.subtitle.utbl[utblc - 1] = 0;

1 0

r35313 - trunk/sub/subreader.c
by reimar 31 Oct '12

31 Oct '12

Author: reimar Date: Wed Oct 31 21:05:31 2012 New Revision: 35313 Log: Extra checks to ensure we really do not write outside array bounds. Modified: trunk/sub/subreader.c Modified: trunk/sub/subreader.c ============================================================================== --- trunk/sub/subreader.c Wed Oct 31 20:50:11 2012 (r35312) +++ trunk/sub/subreader.c Wed Oct 31 21:05:31 2012 (r35313) @@ -1097,9 +1097,11 @@ static subtitle *sub_read_line_jacosub(s } //-- switch } //-- for *q = '\0'; - current->text[current->lines] = strdup(line1); + if (current->lines < SUB_MAX_TEXT) + current->text[current->lines] = strdup(line1); } //-- while - current->lines++; + if (current->lines < SUB_MAX_TEXT) + current->lines++; return current; }

1 0

r35312 - trunk/vidix/sysdep/pci_linux.c
by reimar 31 Oct '12

31 Oct '12

Author: reimar Date: Wed Oct 31 20:50:11 2012 New Revision: 35312 Log: Fix more places that incorrectly assume that 0 can never be a valid file descriptor. Modified: trunk/vidix/sysdep/pci_linux.c Modified: trunk/vidix/sysdep/pci_linux.c ============================================================================== --- trunk/vidix/sysdep/pci_linux.c Wed Oct 31 20:47:15 2012 (r35311) +++ trunk/vidix/sysdep/pci_linux.c Wed Oct 31 20:50:11 2012 (r35312) @@ -43,7 +43,7 @@ int iopl(int level); #ifdef CONFIG_DHAHELPER #include <fcntl.h> int dhahelper_initialized = 0; -int dhahelper_fd = 0; +int dhahelper_fd = -1; #endif #ifdef CONFIG_SVGAHELPER @@ -55,7 +55,7 @@ int dhahelper_fd = 0; #define SVGALIB_HELPER_IOCGPCIINL SVGAHELPER_PCIINL #endif int svgahelper_initialized = 0; -int svgahelper_fd = 0; +int svgahelper_fd = -1; static int pci_config_type(void) { @@ -92,7 +92,7 @@ static inline int enable_os_io(void) { #ifdef CONFIG_SVGAHELPER svgahelper_fd = open(DEV_SVGA, O_RDWR); - if (svgahelper_fd > 0) + if (svgahelper_fd != -1) { svgahelper_initialized = 1; return 0; @@ -102,7 +102,7 @@ static inline int enable_os_io(void) #ifdef CONFIG_DHAHELPER dhahelper_fd = open("/dev/dhahelper", O_RDWR); - if (dhahelper_fd > 0) + if (dhahelper_fd != -1) { dhahelper_initialized = 1; return 0; @@ -205,7 +205,7 @@ static long pci_config_read_long( } else { retval = 0; } - if (fd > 0) { + if (fd != -1) { close(fd); } return retval;

1 0