February 2016 - MPlayer-cvslog - lists.mplayerhq.hu

r37801 - trunk/etc/codecs.conf
by reimar 21 Jul '16

21 Jul '16

Author: reimar Date: Thu Feb 25 22:34:45 2016 New Revision: 37801 Log: codecs.conf: Prefer FFmpeg raw decoder for paletted. It is more likely to give the correct results, it seems even when combined with our native e.g. AVI demuxer, and it has more feature like supporting paletted 1-bit formats. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Thu Feb 25 22:34:43 2016 (r37800) +++ trunk/etc/codecs.conf Thu Feb 25 22:34:45 2016 (r37801) @@ -4258,6 +4258,20 @@ videocodec rawbgr15 format 0x4247520F out BGR15 +videocodec ffrawpal + info "RAW PAL8" + comment "For decoding paletted 1, 2, 4 and 8 bit formats" + status working + driver ffmpeg + dll rawvideo + format 0x0 + format 0x20776172 0x42475208 + format 0x42475208 + format 0x42475204 + format 0x42475202 + format 0x42475201 + out BGR8,BGR1,RGB1 + videocodec rawbgr8 info "RAW BGR8" status working @@ -4276,18 +4290,6 @@ videocodec rawbgr1 format 0x42475201 out BGR1 -videocodec ffrawpal - info "RAW PAL8" - comment "For decoding paletted 2 and 4 bit formats" - status working - driver ffmpeg - dll rawvideo - format 0x0 - format 0x20776172 0x42475204 - format 0x42475204 - format 0x42475202 - out BGR8 - videocodec rawyuy2 info "RAW YUY2" status working

2 1

r37816 - trunk/configure
by reimar 28 Feb '16

28 Feb '16

Author: reimar Date: Sun Feb 28 14:39:42 2016 New Revision: 37816 Log: configure: Fix compilation when zlib is missing. APNG and a few other decoders also cannot be enabled without it. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Feb 28 13:49:33 2016 (r37815) +++ trunk/configure Sun Feb 28 14:39:42 2016 (r37816) @@ -6464,8 +6464,8 @@ if test "$_zlib" = yes ; then mplayer_encoders="$mplayer_encoders PNG_ENCODER" else def_zlib='#define CONFIG_ZLIB 0' - libavdecoders=$(filter_out_component decoder 'FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M TSCC ZEROCODEC') - libavencoders=$(filter_out_component encoder 'FLASHSV FLASHSV2 PNG ZMBV ZLIB') + libavdecoders=$(filter_out_component decoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M RSCC SCREENPRESSO TDSC TSCC ZEROCODEC') + libavencoders=$(filter_out_component encoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB') fi echores "$_zlib"

1 0

r37814 - trunk/sub/ass_mp.c
by reimar 26 Feb '16

26 Feb '16

Author: reimar Date: Fri Feb 26 22:17:52 2016 New Revision: 37814 Log: ass_mp: Fix subdelay applied inverted. Fixes trac issue #2286. Modified: trunk/sub/ass_mp.c Modified: trunk/sub/ass_mp.c ============================================================================== --- trunk/sub/ass_mp.c Fri Feb 26 22:14:48 2016 (r37813) +++ trunk/sub/ass_mp.c Fri Feb 26 22:17:52 2016 (r37814) @@ -332,7 +332,7 @@ static int prev_visibility; static void eosd_ass_update(struct mp_eosd_source *src, const struct mp_eosd_settings *res, double ts) { - long long ts_ms = (ts + sub_delay) * 1000 + .5; + long long ts_ms = (ts - sub_delay) * 1000 + .5; ASS_Image *aimg; struct mp_eosd_image *img; if (res->changed || !src->initialized || ass_force_reload) {

1 0

r37813 - trunk/sub/subreader.c
by reimar 26 Feb '16

26 Feb '16

Author: reimar Date: Fri Feb 26 22:14:48 2016 New Revision: 37813 Log: subreader: fix -subdelay applied inverted for -dumpsrtsub etc. Modified: trunk/sub/subreader.c Modified: trunk/sub/subreader.c ============================================================================== --- trunk/sub/subreader.c Fri Feb 26 22:03:49 2016 (r37812) +++ trunk/sub/subreader.c Fri Feb 26 22:14:48 2016 (r37813) @@ -2314,7 +2314,7 @@ void dump_srt(sub_data* subd, float fps) temp=onesub->start; if (!subd->sub_uses_time) temp = temp * 100 / sub_fps; - temp -= sub_delay * 100; + temp += sub_delay * 100; h=temp/360000;temp%=360000; //h =1*100*60*60 m=temp/6000; temp%=6000; //m =1*100*60 s=temp/100; temp%=100; //s =1*100 @@ -2324,7 +2324,7 @@ void dump_srt(sub_data* subd, float fps) temp=onesub->end; if (!subd->sub_uses_time) temp = temp * 100 / sub_fps; - temp -= sub_delay * 100; + temp += sub_delay * 100; h=temp/360000;temp%=360000; m=temp/6000; temp%=6000; s=temp/100; temp%=100; @@ -2346,7 +2346,7 @@ void dump_mpsub(sub_data* subd, float fp float a,b; subtitle *subs = subd->subtitles; - mpsub_position = subd->sub_uses_time? (sub_delay*100) : (sub_delay*fps); + mpsub_position = subd->sub_uses_time? (-sub_delay*100) : (-sub_delay*fps); if (sub_fps==0) sub_fps=fps; fd=fopen ("dump.mpsub", "w"); @@ -2412,8 +2412,8 @@ void dump_microdvd(sub_data* subd, float start = start * sub_fps / fps; end = end * sub_fps / fps; } - start -= delay; - end -= delay; + start += delay; + end += delay; fprintf(fd, "{%d}{%d}", start, end); for (j = 0; j < subs[i].lines; ++j) fprintf(fd, "%s%s", j ? "|" : "", subs[i].text[j]); @@ -2447,7 +2447,7 @@ void dump_jacosub(sub_data* subd, float temp=onesub->start; if (!subd->sub_uses_time) temp = temp * 100 / sub_fps; - temp -= sub_delay * 100; + temp += sub_delay * 100; h=temp/360000;temp%=360000; //h =1*100*60*60 m=temp/6000; temp%=6000; //m =1*100*60 s=temp/100; temp%=100; //s =1*100 @@ -2457,7 +2457,7 @@ void dump_jacosub(sub_data* subd, float temp=onesub->end; if (!subd->sub_uses_time) temp = temp * 100 / sub_fps; - temp -= sub_delay * 100; + temp += sub_delay * 100; h=temp/360000;temp%=360000; m=temp/6000; temp%=6000; s=temp/100; temp%=100; @@ -2505,7 +2505,7 @@ void dump_sami(sub_data* subd, float fps temp=onesub->start; if (!subd->sub_uses_time) temp = temp * 100 / sub_fps; - temp -= sub_delay * 100; + temp += sub_delay * 100; fprintf(fd,"\t<SYNC Start=%lu>\n" "\t <P>", temp * 10); @@ -2517,7 +2517,7 @@ void dump_sami(sub_data* subd, float fps temp=onesub->end; if (!subd->sub_uses_time) temp = temp * 100 / sub_fps; - temp -= sub_delay * 100; + temp += sub_delay * 100; fprintf(fd,"\t<SYNC Start=%lu>\n" "\t <P> \n", temp * 10); }

1 0

r37812 - trunk/libmpdemux/aviheader.c
by reimar 26 Feb '16

26 Feb '16

Author: reimar Date: Fri Feb 26 22:03:49 2016 New Revision: 37812 Log: aviheader: check fread result when reading index file. Modified: trunk/libmpdemux/aviheader.c Modified: trunk/libmpdemux/aviheader.c ============================================================================== --- trunk/libmpdemux/aviheader.c Fri Feb 26 21:52:36 2016 (r37811) +++ trunk/libmpdemux/aviheader.c Fri Feb 26 22:03:49 2016 (r37812) @@ -611,12 +611,12 @@ if (index_file_load) { mp_msg(MSGT_HEADER,MSGL_ERR, MSGTR_MPDEMUX_AVIHDR_CantReadIdxFile, index_file_load, strerror(errno)); goto gen_index; } - fread(&magic, 6, 1, fp); - if (strncmp(magic, "MPIDX1", 6)) { + if (fread(&magic, 6, 1, fp) != 1 || + strncmp(magic, "MPIDX1", 6) || + fread(&priv->idx_size, sizeof(priv->idx_size), 1, fp) != 1) { mp_msg(MSGT_HEADER,MSGL_ERR, MSGTR_MPDEMUX_AVIHDR_NotValidMPidxFile, index_file_load); goto gen_index; } - fread(&priv->idx_size, sizeof(priv->idx_size), 1, fp); priv->idx=calloc(priv->idx_size,sizeof(AVIINDEXENTRY)); if (!priv->idx) { mp_msg(MSGT_HEADER,MSGL_ERR, MSGTR_MPDEMUX_AVIHDR_FailedMallocForIdxFile, index_file_load);

1 0

r37811 - trunk/stream/stream_cddb.c
by reimar 26 Feb '16

26 Feb '16

Author: reimar Date: Fri Feb 26 21:52:36 2016 New Revision: 37811 Log: stream_cddb: do not pointlessly call stat() before mkdir. Avoids time-of-check, time-of-use Coverity warning. And simplifies code. Modified: trunk/stream/stream_cddb.c Modified: trunk/stream/stream_cddb.c ============================================================================== --- trunk/stream/stream_cddb.c Fri Feb 26 21:47:16 2016 (r37810) +++ trunk/stream/stream_cddb.c Fri Feb 26 21:52:36 2016 (r37811) @@ -480,7 +480,6 @@ static int cddb_read_cache(cddb_data_t * static int cddb_write_cache(cddb_data_t *cddb_data) { // We have the file, save it for cache. - struct stat file_stat; char file_name[100]; int file_fd, ret; int wrote = 0; @@ -488,23 +487,15 @@ static int cddb_write_cache(cddb_data_t if (cddb_data == NULL || cddb_data->cache_dir == NULL) return -1; - // Check if the CDDB cache dir exist - ret = stat(cddb_data->cache_dir, &file_stat); - if (ret < 0) { - // Directory not present, create it. + // Create directory if not present ret = mkdir(cddb_data->cache_dir, 0755); -#ifdef __MINGW32__ if (ret < 0 && errno != EEXIST) { -#else - if (ret < 0) { -#endif perror("mkdir"); mp_msg(MSGT_DEMUX, MSGL_ERR, MSGTR_MPDEMUX_CDDB_FailedToCreateDirectory, cddb_data->cache_dir); return -1; } - } snprintf(file_name, sizeof(file_name), "%s%08lx", cddb_data->cache_dir, cddb_data->disc_id);

1 0

r37810 - trunk/libao2/ao_oss.c
by reimar 26 Feb '16

26 Feb '16

Author: reimar Date: Fri Feb 26 21:47:16 2016 New Revision: 37810 Log: ao_oss: check ioctl return values. Modified: trunk/libao2/ao_oss.c Modified: trunk/libao2/ao_oss.c ============================================================================== --- trunk/libao2/ao_oss.c Fri Feb 26 21:24:09 2016 (r37809) +++ trunk/libao2/ao_oss.c Fri Feb 26 21:47:16 2016 (r37810) @@ -185,19 +185,22 @@ static int control(int cmd,void *arg){ if ((fd = open(oss_mixer_device, O_RDONLY)) != -1) { - ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devs); + if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devs) == -1) + return CONTROL_ERROR; if (devs & (1 << oss_mixer_channel)) { if (cmd == AOCONTROL_GET_VOLUME) { - ioctl(fd, MIXER_READ(oss_mixer_channel), &v); + if (ioctl(fd, MIXER_READ(oss_mixer_channel), &v) == -1) + return CONTROL_ERROR; vol->right = (v & 0xFF00) >> 8; vol->left = v & 0x00FF; } else { v = ((int)vol->right << 8) | (int)vol->left; - ioctl(fd, MIXER_WRITE(oss_mixer_channel), &v); + if (ioctl(fd, MIXER_WRITE(oss_mixer_channel), &v) == -1) + return CONTROL_ERROR; } } else @@ -251,7 +254,8 @@ static int init(int rate,int channels,in mp_msg(MSGT_AO,MSGL_ERR,MSGTR_AO_OSS_CantOpenMixer, oss_mixer_device, strerror(errno)); }else{ - ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devs); + if (ioctl(fd, SOUND_MIXER_READ_DEVMASK, &devs) == -1) + devs = 0; close(fd); for (i=0; i<SOUND_MIXER_NRDEVICES; i++){ @@ -300,7 +304,8 @@ static int init(int rate,int channels,in if(AF_FORMAT_IS_AC3(format)) { ao_data.samplerate=rate; - ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate); + if (ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate) == -1) + mp_msg(MSGT_AO,MSGL_WARN, "OSS: Failed setting AC3 sample-rate %i %s\n", rate, strerror(errno)); } ac3_retry: @@ -355,7 +360,8 @@ ac3_retry: mp_msg(MSGT_AO,MSGL_V,"audio_setup: using %d channels (requested: %d)\n", ao_data.channels, channels); // set rate ao_data.samplerate=rate; - ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate); + if (ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate) == -1) + mp_msg(MSGT_AO,MSGL_WARN, "OSS: Failed setting sample-rate %i %s\n", rate, strerror(errno)); mp_msg(MSGT_AO,MSGL_V,"audio_setup: using %d Hz samplerate (requested: %d)\n",ao_data.samplerate,rate); } @@ -437,6 +443,7 @@ static void uninit(int immed){ // stop playing and empty buffers (for seeking/pause) static void reset(void){ + int fail = 0; int oss_format; uninit(1); audio_fd=open(dsp, O_WRONLY); @@ -451,17 +458,18 @@ static void reset(void){ oss_format = format2oss(ao_data.format); if(AF_FORMAT_IS_AC3(ao_data.format)) - ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate); - ioctl (audio_fd, SNDCTL_DSP_SETFMT, &oss_format); + fail |= ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate) == -1; + fail |= ioctl (audio_fd, SNDCTL_DSP_SETFMT, &oss_format) == -1; if(!AF_FORMAT_IS_AC3(ao_data.format)) { if (ao_data.channels > 2) - ioctl (audio_fd, SNDCTL_DSP_CHANNELS, &ao_data.channels); + fail |= ioctl (audio_fd, SNDCTL_DSP_CHANNELS, &ao_data.channels) == -1; else { int c = ao_data.channels-1; - ioctl (audio_fd, SNDCTL_DSP_STEREO, &c); + fail |= ioctl (audio_fd, SNDCTL_DSP_STEREO, &c) == -1; } - ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate); + fail |= ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate) == -1; } + mp_msg(MSGT_AO,MSGL_WARN, "OSS: Reset failed\n"); } // stop playing, keep buffers (for pause)

1 0

r37809 - trunk/vidix/unichrome_vid.c
by reimar 26 Feb '16

26 Feb '16

Author: reimar Date: Fri Feb 26 21:24:09 2016 New Revision: 37809 Log: unichrome_vid: avoid potentially undefined signed shift. Happens due to default type conversion to int. Avoids a Coverity warning. Modified: trunk/vidix/unichrome_vid.c Modified: trunk/vidix/unichrome_vid.c ============================================================================== --- trunk/vidix/unichrome_vid.c Fri Feb 26 21:13:57 2016 (r37808) +++ trunk/vidix/unichrome_vid.c Fri Feb 26 21:24:09 2016 (r37809) @@ -515,7 +515,7 @@ unichrome_init (void) enable_app_io (); outb (0x2f, 0x3c4); - tmp = inb (0x3c5) << 0x18; + tmp = (unsigned)(inb (0x3c5)) << 0x18; vio = map_phys_mem (tmp, 0x1000); outb (0x16, 0x3c4);

1 0

r37808 - trunk/sub/font_load.c
by reimar 26 Feb '16

26 Feb '16

Author: reimar Date: Fri Feb 26 21:13:57 2016 New Revision: 37808 Log: font_load: improve range check a bit more. Modified: trunk/sub/font_load.c Modified: trunk/sub/font_load.c ============================================================================== --- trunk/sub/font_load.c Fri Feb 26 21:10:07 2016 (r37807) +++ trunk/sub/font_load.c Fri Feb 26 21:13:57 2016 (r37808) @@ -49,7 +49,8 @@ raw_file* load_raw(char *name,int verbos if(raw->w == 0) // 2 bytes were not enough for the width... read 4 bytes from the end of the header raw->w = AV_RB32(head + 28); if(raw->c>256) goto err_out; // too many colors!? - if (raw->w > INT_MAX / 4 || (uint64_t)raw->w * raw->h > INT_MAX / 4) + if (!raw->w || !raw->h || + raw->w > INT_MAX / 4 || raw->h > INT_MAX / 4 / raw->w) goto err_out; mp_msg(MSGT_OSD, MSGL_DBG2, "RAW: %s %d x %d, %d colors\n",name,raw->w,raw->h,raw->c); if(raw->c){

1 0

r37807 - trunk/libmpdemux/demux_mkv.c
by reimar 26 Feb '16

26 Feb '16

Author: reimar Date: Fri Feb 26 21:10:07 2016 New Revision: 37807 Log: demux_mkv_read_block_lacing: add range checks. Fixes Coverity warning and might avoid invalid read crashes with invalid files. Modified: trunk/libmpdemux/demux_mkv.c Modified: trunk/libmpdemux/demux_mkv.c ============================================================================== --- trunk/libmpdemux/demux_mkv.c Fri Feb 26 20:47:52 2016 (r37806) +++ trunk/libmpdemux/demux_mkv.c Fri Feb 26 21:10:07 2016 (r37807) @@ -2244,6 +2244,7 @@ static int demux_mkv_read_block_lacing(u *all_lace_sizes = NULL; lace_size = NULL; /* lacing flags */ + if (!*size) goto err_out; flags = *buffer++; (*size)--; @@ -2257,6 +2258,7 @@ static int demux_mkv_read_block_lacing(u case 1: /* xiph lacing */ case 2: /* fixed-size lacing */ case 3: /* EBML lacing */ + if (!*size) goto err_out; *laces = *buffer++; (*size)--; (*laces)++; @@ -2268,10 +2270,12 @@ static int demux_mkv_read_block_lacing(u lace_size[i] = 0; do { lace_size[i] += *buffer; + if (!*size) goto err_out; (*size)--; } while (*buffer++ == 0xFF); total += lace_size[i]; } + if (*size < total) goto err_out; lace_size[i] = *size - total; break; @@ -2284,10 +2288,7 @@ static int demux_mkv_read_block_lacing(u { int l; uint64_t num = ebml_read_vlen_uint(buffer, &l); - if (num == EBML_UINT_INVALID) { - free(lace_size); - return 1; - } + if (num == EBML_UINT_INVALID || *size < l) goto err_out; buffer += l; *size -= l; @@ -2295,15 +2296,13 @@ static int demux_mkv_read_block_lacing(u for (i = 1; i < *laces - 1; i++) { int64_t snum; snum = ebml_read_vlen_int(buffer, &l); - if (snum == EBML_INT_INVALID) { - free(lace_size); - return 1; - } + if (snum == EBML_INT_INVALID || *size < l) goto err_out; buffer += l; *size -= l; lace_size[i] = lace_size[i - 1] + snum; total += lace_size[i]; } + if (*size < total) goto err_out; lace_size[i] = *size - total; break; } @@ -2312,6 +2311,10 @@ static int demux_mkv_read_block_lacing(u } *all_lace_sizes = lace_size; return 0; + +err_out: + free(lace_size); + return 1; } static void handle_subtitles(demuxer_t *demuxer, mkv_track_t *track,

1 0