August 2010 - MPlayer-cvslog - lists.mplayerhq.hu

r32006 - in trunk/libmpdemux: demux_lavf.c demuxer.c stheader.h
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 18:04:18 2010 New Revision: 32006 Log: Print subtitle type also for internally-supported types with a libavcodec decoder. Modified: trunk/libmpdemux/demux_lavf.c trunk/libmpdemux/demuxer.c trunk/libmpdemux/stheader.h Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Sat Aug 21 13:54:04 2010 (r32005) +++ trunk/libmpdemux/demux_lavf.c Sat Aug 21 18:04:18 2010 (r32006) @@ -461,7 +461,10 @@ static void handle_stream(demuxer_t *dem } if (stream_type) { AVCodec *avc = avcodec_find_decoder(codec->codec_id); - mp_msg(MSGT_DEMUX, MSGL_INFO, "[lavf] stream %d: %s (%s), -%cid %d", i, stream_type, avc ? avc->name : "unknown", *stream_type, stream_id); + const char *codec_name = avc ? avc->name : "unknown"; + if (!avc && *stream_type == 's' && demuxer->s_streams[stream_id]) + codec_name = sh_sub_type2str(((sh_sub_t *)demuxer->s_streams[stream_id])->type); + mp_msg(MSGT_DEMUX, MSGL_INFO, "[lavf] stream %d: %s (%s), -%cid %d", i, stream_type, codec_name, *stream_type, stream_id); if (lang && lang->value && *stream_type != 'v') mp_msg(MSGT_DEMUX, MSGL_INFO, ", -%clang %s", *stream_type, lang->value); if (title && title->value) Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c Sat Aug 21 13:54:04 2010 (r32005) +++ trunk/libmpdemux/demuxer.c Sat Aug 21 18:04:18 2010 (r32006) @@ -254,6 +254,21 @@ demuxer_t *new_demuxer(stream_t *stream, return d; } +const char *sh_sub_type2str(int type) +{ + switch (type) { + case 't': return "text"; + case 'm': return "movtext"; + case 'a': return "ass"; + case 'v': return "vobsub"; + case 'x': return "xsub"; + case 'b': return "dvb"; + case 'd': return "dvb-teletext"; + case 'p': return "hdmv pgs"; + } + return "unknown"; +} + sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid, const char *lang) { if (id > MAX_S_STREAMS - 1 || id < 0) { Modified: trunk/libmpdemux/stheader.h ============================================================================== --- trunk/libmpdemux/stheader.h Sat Aug 21 13:54:04 2010 (r32005) +++ trunk/libmpdemux/stheader.h Sat Aug 21 18:04:18 2010 (r32006) @@ -140,6 +140,8 @@ sh_sub_t *new_sh_sub_sid(demuxer_t *demu void free_sh_audio(demuxer_t *demuxer, int id); void free_sh_video(sh_video_t *sh); +const char *sh_sub_type2str(int type); + // video.c: int video_read_properties(sh_video_t *sh_video); int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** start,int force_fps);

1 0

r32005 - trunk/av_sub.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 13:54:04 2010 New Revision: 32005 Log: Pass the video dimensions specified in the subtitle to spudec. Makes DVD-resolution PGS subs work correctly. Modified: trunk/av_sub.c Modified: trunk/av_sub.c ============================================================================== --- trunk/av_sub.c Sat Aug 21 13:36:18 2010 (r32004) +++ trunk/av_sub.c Sat Aug 21 13:54:04 2010 (r32005) @@ -38,7 +38,6 @@ int decode_avsub(struct sh_sub *sh, uint { AVCodecContext *ctx = sh->context; enum CodecID cid = CODEC_ID_NONE; - int srcw = 0, srch = 0; int new_type = 0; int res; int got_sub; @@ -49,7 +48,6 @@ int decode_avsub(struct sh_sub *sh, uint case 'b': cid = CODEC_ID_DVB_SUBTITLE; break; case 'p': - srcw = 1920; srch = 1080; cid = CODEC_ID_HDMV_PGS_SUBTITLE; break; case 'x': cid = CODEC_ID_XSUB; break; @@ -86,7 +84,7 @@ int decode_avsub(struct sh_sub *sh, uint switch (sub.rects[0]->type) { case SUBTITLE_BITMAP: if (!vo_spudec) - vo_spudec = spudec_new_scaled(NULL, srcw, srch, NULL, 0); + vo_spudec = spudec_new_scaled(NULL, ctx->width, ctx->height, NULL, 0); spudec_set_paletted(vo_spudec, sub.rects[0]->pict.data[0], sub.rects[0]->pict.linesize[0],

1 0

r32004 - in trunk: mencoder.c mplayer.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 13:36:18 2010 New Revision: 32004 Log: Remove pointless casts. Modified: trunk/mencoder.c trunk/mplayer.c Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Sat Aug 21 13:33:33 2010 (r32003) +++ trunk/mencoder.c Sat Aug 21 13:36:18 2010 (r32004) @@ -1033,7 +1033,7 @@ default: { char* vf_arg[] = {"auto", "1", NULL}; vf_instance_t* vf_ass = vf_open_filter(sh_video->vfilter,"ass",vf_arg); if (vf_ass) - sh_video->vfilter=(void*)vf_ass; + sh_video->vfilter=vf_ass; else mp_msg(MSGT_CPLAYER,MSGL_ERR, "ASS: cannot add video filter\n"); } Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Aug 21 13:33:33 2010 (r32003) +++ trunk/mplayer.c Sat Aug 21 13:36:18 2010 (r32004) @@ -2285,7 +2285,7 @@ int reinit_video_chain(void) { current_module="init_video_filters"; { char* vf_arg[] = { "_oldargs_", (char*)mpctx->video_out , NULL }; - sh_video->vfilter=(void*)vf_open_filter(NULL,"vo",vf_arg); + sh_video->vfilter=vf_open_filter(NULL,"vo",vf_arg); } #ifdef CONFIG_MENU if(use_menu) { @@ -2297,7 +2297,7 @@ int reinit_video_chain(void) { } } if(vf_menu) - sh_video->vfilter=(void*)vf_menu; + sh_video->vfilter=vf_menu; #endif #ifdef CONFIG_ASS @@ -2314,14 +2314,14 @@ int reinit_video_chain(void) { char* vf_arg[] = {"auto", "1", NULL}; vf_instance_t* vf_ass = vf_open_filter(sh_video->vfilter,"ass",vf_arg); if (vf_ass) - sh_video->vfilter=(void*)vf_ass; + sh_video->vfilter=vf_ass; else mp_msg(MSGT_CPLAYER,MSGL_ERR, "ASS: cannot add video filter\n"); } } #endif - sh_video->vfilter=(void*)append_filters(sh_video->vfilter); + sh_video->vfilter=append_filters(sh_video->vfilter); #ifdef CONFIG_ASS if (ass_enabled)

1 0

r32003 - trunk/mplayer.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 13:33:33 2010 New Revision: 32003 Log: Use vf_open_filter, just like in the previous change for mencoder. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Aug 21 13:30:29 2010 (r32002) +++ trunk/mplayer.c Sat Aug 21 13:33:33 2010 (r32003) @@ -2311,10 +2311,8 @@ int reinit_video_chain(void) { break; } if (insert) { - extern vf_info_t vf_info_ass; - const vf_info_t* libass_vfs[] = {&vf_info_ass, NULL}; char* vf_arg[] = {"auto", "1", NULL}; - vf_instance_t* vf_ass = vf_open_plugin(libass_vfs,sh_video->vfilter,"ass",vf_arg); + vf_instance_t* vf_ass = vf_open_filter(sh_video->vfilter,"ass",vf_arg); if (vf_ass) sh_video->vfilter=(void*)vf_ass; else

1 0

r32002 - trunk/mencoder.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 13:30:29 2010 New Revision: 32002 Log: Use vf_open_filter instead of vf_open_plugin+hacks. Modified: trunk/mencoder.c Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Sat Aug 21 13:22:45 2010 (r32001) +++ trunk/mencoder.c Sat Aug 21 13:30:29 2010 (r32002) @@ -1030,10 +1030,8 @@ default: { break; } if (insert) { - extern const vf_info_t vf_info_ass; - static const vf_info_t * const libass_vfs[] = {&vf_info_ass, NULL}; char* vf_arg[] = {"auto", "1", NULL}; - vf_instance_t* vf_ass = vf_open_plugin(libass_vfs,sh_video->vfilter,"ass",vf_arg); + vf_instance_t* vf_ass = vf_open_filter(sh_video->vfilter,"ass",vf_arg); if (vf_ass) sh_video->vfilter=(void*)vf_ass; else

1 0

r32001 - trunk/mencoder.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 13:22:45 2010 New Revision: 32001 Log: Add consts to avoid a warning about pointer type mismatch in function argument. Modified: trunk/mencoder.c Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Sat Aug 21 13:19:45 2010 (r32000) +++ trunk/mencoder.c Sat Aug 21 13:22:45 2010 (r32001) @@ -1030,8 +1030,8 @@ default: { break; } if (insert) { - extern vf_info_t vf_info_ass; - vf_info_t* libass_vfs[] = {&vf_info_ass, NULL}; + extern const vf_info_t vf_info_ass; + static const vf_info_t * const libass_vfs[] = {&vf_info_ass, NULL}; char* vf_arg[] = {"auto", "1", NULL}; vf_instance_t* vf_ass = vf_open_plugin(libass_vfs,sh_video->vfilter,"ass",vf_arg); if (vf_ass)

1 0

r32000 - trunk/mencoder.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 13:19:45 2010 New Revision: 32000 Log: Deobfuscate mencoder decode_video call. Modified: trunk/mencoder.c Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Sat Aug 21 12:08:29 2010 (r31999) +++ trunk/mencoder.c Sat Aug 21 13:19:45 2010 (r32000) @@ -1530,8 +1530,12 @@ case VCODEC_FRAMENO: break; default: // decode_video will callback down to ve_*.c encoders, through the video filters - {void *decoded_frame = decode_video(sh_video,frame_data.start,frame_data.in_size, - skip_flag>0 && (!sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE), MP_NOPTS_VALUE); + { + int drop_frame = skip_flag > 0 && + (!sh_video->vfilter || + ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE); + void *decoded_frame = decode_video(sh_video,frame_data.start,frame_data.in_size, + drop_frame, MP_NOPTS_VALUE); blit_frame = decoded_frame && filter_video(sh_video, decoded_frame, MP_NOPTS_VALUE);} if (sh_video->vf_initialized < 0) mencoder_exit(1, NULL);

1 0

r31999 - trunk/stream/stream.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 12:08:29 2010 New Revision: 31999 Log: Make sure we return an "empty" line on eof, to make sure we get no buffer overflows in case some code fails to check the return value. Modified: trunk/stream/stream.c Modified: trunk/stream/stream.c ============================================================================== --- trunk/stream/stream.c Sat Aug 21 12:07:38 2010 (r31998) +++ trunk/stream/stream.c Sat Aug 21 12:08:29 2010 (r31999) @@ -617,7 +617,7 @@ unsigned char* stream_read_line(stream_t } s->buf_pos += len; } while(!end); - if(s->eof && ptr == mem) return NULL; ptr[0] = 0; + if(s->eof && ptr == mem) return NULL; return mem; }

1 0

r31998 - trunk/stream/stream_bd.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 12:07:38 2010 New Revision: 31998 Log: Check stream_read_line result instead of checking stream_eof, checking stream_eof in the previous way would process the last line twice or even use uninitialized data in case of and empty file. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 12:02:50 2010 (r31997) +++ trunk/stream/stream_bd.c Sat Aug 21 12:07:38 2010 (r31998) @@ -143,6 +143,7 @@ static void id2str(const uint8_t *id, in static int find_vuk(struct bd_priv *bd, const uint8_t discid[20]) { + char line[1024]; char filename[PATH_MAX]; const char *home; int vukfound = 0; @@ -159,11 +160,9 @@ static int find_vuk(struct bd_priv *bd, return 0; } id2str(discid, 20, idstr); - while (!stream_eof(file)) { - char line[1024]; + while (stream_read_line(file, line, sizeof(line), 0)) { char *vst; - stream_read_line(file, line, sizeof(line), 0); // file is built up this way: // DISCID = title | V | VUK // or

1 0

r31997 - trunk/stream/stream_bd.c
by reimar 21 Aug '10

21 Aug '10

Author: reimar Date: Sat Aug 21 12:02:50 2010 New Revision: 31997 Log: Fix reading of VUK: actually fail if the key is incomplete instead of continuing with uninitialized data. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:58:02 2010 (r31996) +++ trunk/stream/stream_bd.c Sat Aug 21 12:02:50 2010 (r31997) @@ -160,7 +160,6 @@ static int find_vuk(struct bd_priv *bd, } id2str(discid, 20, idstr); while (!stream_eof(file)) { - int i; char line[1024]; char *vst; @@ -184,12 +183,12 @@ static int find_vuk(struct bd_priv *bd, break; vst += 6; while (isspace(*vst)) vst++; - if (strlen(vst) < 32) + if (sscanf(vst, "%16"SCNx64, &bd->vuk.u64[0]) != 1) continue; - for (i = 0; i < 16; i++) { - if (sscanf(&vst[i*2], "%2"SCNx8, &bd->vuk.u8[i]) != 1) - break; - } + if (sscanf(vst + 16, "%16"SCNx64, &bd->vuk.u64[1]) != 1) + continue; + bd->vuk.u64[0] = av_be2ne64(bd->vuk.u64[0]); + bd->vuk.u64[1] = av_be2ne64(bd->vuk.u64[1]); vukfound = 1; } free_stream(file);

1 0