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

r31194 - trunk/DOCS/tech/svn-howto.txt
by diego 10 Oct '10

10 Oct '10

Author: diego Date: Sun May 23 17:07:34 2010 New Revision: 31194 Log: K&R coding style should be applied to new code. Modified: trunk/DOCS/tech/svn-howto.txt Modified: trunk/DOCS/tech/svn-howto.txt ============================================================================== --- trunk/DOCS/tech/svn-howto.txt Sun May 23 16:15:27 2010 (r31193) +++ trunk/DOCS/tech/svn-howto.txt Sun May 23 17:07:34 2010 (r31194) @@ -261,13 +261,9 @@ II. POLICY / RULES: not apply to files you wrote and/or maintain. -6. We refuse source indentation and other cosmetic changes if they are mixed - with functional changes, such commits will be rejected and removed. Every - developer has his own indentation style, you should not change it. Of course - if you (re)write something, you can use your own style... (Many projects - force a given indentation style - we don't.) If you really need to make - indentation changes (try to avoid this), separate them strictly from real - changes. +6. Do not mix cosmetic changes (indentation, function / variable renaming and + similar) with functional changes in a single commit. Instead, commit such + changes as a separate commit of their own. NOTE: If you had to put if(){ .. } over a large (> 5 lines) chunk of code, do NOT change the indentation of the inner part (don't move it to the right)! @@ -328,6 +324,12 @@ II. POLICY / RULES: with our local changes. +15. Use K&R style with 4 space indentation, no tabs and no trailing whitespace. + Unnecessary braces should be avoided. This policy applies to new files. In + existing files that don't follow K&R style, try to respect the surrounding + style, but in doubt, go for K&R. + + Also read DOCS/tech/patches.txt !!!! We think our rules are not too hard. If you have comments, contact us.

4 5

r31783 - in trunk: Makefile configure
by reimar 20 Sep '10

20 Sep '10

Author: reimar Date: Sat Jul 24 17:14:43 2010 New Revision: 31783 Log: Fix dependency generation for libav* Modified: trunk/Makefile trunk/configure Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Jul 24 16:43:55 2010 (r31782) +++ trunk/Makefile Sat Jul 24 17:14:43 2010 (r31783) @@ -829,13 +829,13 @@ all: $(ALL_PRG-yes) $(CC) $(ASFLAGS) -c -o $@ $< %.o: %.c - $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $< + $(CC) $(CC_DEPFLAGS) $(CFLAGS) -c -o $@ $< %.o: %.cpp - $(CC) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $< + $(CC) $(CC_DEPFLAGS) $(CXXFLAGS) -c -o $@ $< %.o: %.m - $(CC) $(DEPFLAGS) $(CFLAGS) -c -o $@ $< + $(CC) $(CC_DEPFLAGS) $(CFLAGS) -c -o $@ $< %-rc.o: %.rc $(WINDRES) -I. $< $@ Modified: trunk/configure ============================================================================== --- trunk/configure Sat Jul 24 16:43:55 2010 (r31782) +++ trunk/configure Sat Jul 24 17:14:43 2010 (r31783) @@ -2562,7 +2562,7 @@ else fi cflag_check -mno-omit-leaf-frame-pointer && cflags_no_omit_leaf_frame_pointer="-mno-omit-leaf-frame-pointer" -cflag_check -MD -MP && DEPFLAGS="-MD -MP $CFLAGS" +cflag_check -MMD -MF "$mplayer_tmpdir/test.d" -MT test.o && DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' if test -n "$LDFLAGS" ; then @@ -8576,7 +8576,8 @@ WINDRES = $_windres CFLAGS = $CFLAGS $extra_cflags ASFLAGS = \$(CFLAGS) CXXFLAGS = $CXXFLAGS $extra_cflags $extra_cxxflags -DEPFLAGS = $DEPFLAGS +CC_DEPFLAGS = $DEPFLAGS +AS_DEPFLAGS = $DEPFLAGS CFLAGS_DHAHELPER = $cflags_dhahelper CFLAGS_FAAD_FIXED = $cflags_faad_fixed

3 4

r32035 - in branches/1.0rc4: . libmpdemux/demux_lavf.c
by siretart 02 Sep '10

02 Sep '10

Author: siretart Date: Mon Aug 30 22:07:34 2010 New Revision: 32035 Log: Always use convergence_duration for subtitles otherwise they will stay on screen forever for ASS subtitles in mkv if no ASS renderer is used. backport r32032 by reimar Modified: branches/1.0rc4/ (props changed) branches/1.0rc4/libmpdemux/demux_lavf.c Modified: branches/1.0rc4/libmpdemux/demux_lavf.c ============================================================================== --- branches/1.0rc4/libmpdemux/demux_lavf.c Mon Aug 30 18:48:52 2010 (r32034) +++ branches/1.0rc4/libmpdemux/demux_lavf.c Mon Aug 30 22:07:34 2010 (r32035) @@ -634,7 +634,10 @@ static int demux_lavf_fill_buffer(demuxe if(pkt.pts != AV_NOPTS_VALUE){ dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base); priv->last_pts= dp->pts * AV_TIME_BASE; - if(pkt.flags & PKT_FLAG_KEY && pkt.convergence_duration > 0) + // always set endpts for subtitles, even if PKT_FLAG_KEY is not set, + // otherwise they will stay on screen to long if e.g. ASS is demuxed from mkv + if((ds == demux->sub || (pkt.flags & PKT_FLAG_KEY)) && + pkt.convergence_duration > 0) dp->endpts = dp->pts + pkt.convergence_duration * av_q2d(priv->avfc->streams[id]->time_base); } dp->pos=demux->filepos;

3 8

r32037 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 31 Aug '10

31 Aug '10

Author: reimar Date: Tue Aug 31 21:39:17 2010 New Revision: 32037 Log: Set coded_width/coded_height instead of width/height since that's how it is supposed to be done. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Tue Aug 31 01:24:56 2010 (r32036) +++ trunk/libmpcodecs/vd_ffmpeg.c Tue Aug 31 21:39:17 2010 (r32037) @@ -313,8 +313,8 @@ static int init(sh_video_t *sh){ avctx->flags|= lavc_param_bitexact; - avctx->width = sh->disp_w; - avctx->height= sh->disp_h; + avctx->coded_width = sh->disp_w; + avctx->coded_height= sh->disp_h; avctx->workaround_bugs= lavc_param_workaround_bugs; avctx->error_recognition= lavc_param_error_resilience; if(lavc_param_gray) avctx->flags|= CODEC_FLAG_GRAY;

1 0

[propchange]: r32015 - svn:log
by cigaes 31 Aug '10

31 Aug '10

Author: cigaes Revision: 32015 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,3 @@ -Add #ifdefs to fix build with ASS disabled. +Fix compilation with ASS disabled. +Use pointers to struct instead of typedef types and surround code with +#ifdef.

1 0

r32034 - trunk/etc/codecs.conf
by compn 31 Aug '10

31 Aug '10

Author: compn Date: Mon Aug 30 18:48:52 2010 New Revision: 32034 Log: add binary codec for fourcc AMV2 add fourcc WAWV to ffodivx and ffodivxvdpau Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Sun Aug 29 13:27:00 2010 (r32033) +++ trunk/etc/codecs.conf Mon Aug 30 18:48:52 2010 (r32034) @@ -97,6 +97,14 @@ videocodec imm4 dll "VCMIMM4.dll" out BGR15 flip +videocodec amv2 + info "lossless video codec" + status working + fourcc AMV2 + driver vfw + dll "amv2codec.dll" + out BGR32 flip + videocodec lzocodec info "lzo lossless" status working @@ -1036,7 +1044,7 @@ videocodec ffodivx fourcc FFDS fourcc DCOD,MVXM,EM4A,PM4V fourcc M4T3,DMK2,DIGI,INMC - fourcc EPHV,SN40 + fourcc EPHV,SN40,WAWV fourcc uldx,ULDX,VSPX fourcc SIPP ; Samsung SHR-6040 driver ffmpeg @@ -1069,7 +1077,7 @@ videocodec ffodivxvdpau fourcc FFDS fourcc DCOD,MVXM,EM4A,PM4V fourcc M4T3,DMK2,DIGI,INMC - fourcc EPHV,SN40 + fourcc EPHV,SN40,WAWV fourcc uldx,ULDX,VSPX fourcc SIPP ; Samsung SHR-6040 driver ffmpeg @@ -1122,7 +1130,7 @@ videocodec xvid fourcc FFDS fourcc DCOD,MVXM,EM4A,PM4V fourcc M4T3,DMK2,DIGI,INMC - fourcc EPHV,SN40 + fourcc EPHV,SN40,WAWV fourcc uldx,ULDX,VSPX format 0x10000004 ; mpeg 4 es fourcc SIPP ; Samsung SHR-6040

2 1

r32036 - in trunk/libmpcodecs: dec_video.c mp_image.h vd_ffmpeg.c
by cehoyos 30 Aug '10

30 Aug '10

Author: cehoyos Date: Tue Aug 31 01:24:56 2010 New Revision: 32036 Log: Improve correct-pts with PAFF streams. Patch by Pásztor Szilárd, bartosteka freemail hu Modified: trunk/libmpcodecs/dec_video.c trunk/libmpcodecs/mp_image.h trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/dec_video.c ============================================================================== --- trunk/libmpcodecs/dec_video.c Mon Aug 30 22:07:34 2010 (r32035) +++ trunk/libmpcodecs/dec_video.c Tue Aug 31 01:24:56 2010 (r32036) @@ -394,8 +394,21 @@ void *decode_video(sh_video_t *sh_video, unsigned int t = GetTimer(); unsigned int t2; double tt; + int delay; + int got_picture = 1; - if (correct_pts && pts != MP_NOPTS_VALUE) { + mpi = mpvdec->decode(sh_video, start, in_size, drop_frame); + + //------------------------ frame decoded. -------------------- + + if (mpi && mpi->type == MP_IMGTYPE_INCOMPLETE) { + got_picture = 0; + mpi = NULL; + } + + delay = get_current_video_decoder_lag(sh_video); + if (correct_pts && pts != MP_NOPTS_VALUE + && (got_picture || sh_video->num_buffered_pts < delay)) { if (sh_video->num_buffered_pts == sizeof(sh_video->buffered_pts) / sizeof(double)) mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Too many buffered pts\n"); @@ -411,10 +424,6 @@ void *decode_video(sh_video_t *sh_video, } } - mpi = mpvdec->decode(sh_video, start, in_size, drop_frame); - - //------------------------ frame decoded. -------------------- - #if HAVE_MMX // some codecs are broken, and doesn't restore MMX state :( // it happens usually with broken/damaged files. @@ -439,7 +448,6 @@ void *decode_video(sh_video_t *sh_video, mpi->fields &= ~MP_IMGFIELD_TOP_FIRST; if (correct_pts) { - int delay = get_current_video_decoder_lag(sh_video); if (sh_video->num_buffered_pts) { sh_video->num_buffered_pts--; sh_video->pts = sh_video->buffered_pts[sh_video->num_buffered_pts]; Modified: trunk/libmpcodecs/mp_image.h ============================================================================== --- trunk/libmpcodecs/mp_image.h Mon Aug 30 22:07:34 2010 (r32035) +++ trunk/libmpcodecs/mp_image.h Tue Aug 31 01:24:56 2010 (r32036) @@ -86,6 +86,10 @@ #define MP_IMGTYPE_IPB 4 // Upper 16 bits give desired buffer number, -1 means get next available #define MP_IMGTYPE_NUMBERED 5 +// Doesn't need any buffer, incomplete image (probably a first field only) +// we need this type to be able to differentiate between half frames and +// all other cases +#define MP_IMGTYPE_INCOMPLETE 6 #define MP_MAX_PLANES 4 Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Mon Aug 30 22:07:34 2010 (r32035) +++ trunk/libmpcodecs/vd_ffmpeg.c Tue Aug 31 01:24:56 2010 (r32036) @@ -103,6 +103,11 @@ static int lavc_param_threads=1; static int lavc_param_bitexact=0; static char *lavc_avopt = NULL; +static const mp_image_t mpi_no_picture = +{ + .type = MP_IMGTYPE_INCOMPLETE +}; + const m_option_t lavc_decode_opts_conf[]={ {"bug", &lavc_param_workaround_bugs, CONF_TYPE_INT, CONF_RANGE, -1, 999999, NULL}, {"er", &lavc_param_error_resilience, CONF_TYPE_INT, CONF_RANGE, 0, 99, NULL}, @@ -901,7 +906,12 @@ static mp_image_t *decode(sh_video_t *sh } //-- - if(!got_picture) return NULL; // skipped image + if(!got_picture) { + if (avctx->codec->id == CODEC_ID_H264) + return &mpi_no_picture; // H.264 first field only + else + return NULL; // skipped image + } if(init_vo(sh, avctx->pix_fmt) < 0) return NULL;

1 0

r32015 - in trunk: eosd.c eosd.h
by cigaes 29 Aug '10

29 Aug '10

Author: cigaes Date: Thu Aug 26 13:20:50 2010 New Revision: 32015 Log: Add #ifdefs to fix build with ASS disabled. Modified: trunk/eosd.c trunk/eosd.h Modified: trunk/eosd.c ============================================================================== --- trunk/eosd.c Wed Aug 25 18:34:39 2010 (r32014) +++ trunk/eosd.c Thu Aug 26 13:20:50 2010 (r32015) @@ -26,6 +26,7 @@ #include "libass/ass_mp.h" #include "eosd.h" +#ifdef CONFIG_ASS static ASS_Renderer *ass_renderer; int prev_visibility; @@ -35,6 +36,7 @@ void eosd_ass_init(ASS_Library *ass_libr if (!ass_renderer) return; ass_configure_fonts(ass_renderer); } +#endif void eosd_init(vf_instance_t *vf) { @@ -43,28 +45,34 @@ void eosd_init(vf_instance_t *vf) void eosd_configure(mp_eosd_res_t *res, int hinting) { +#ifdef CONFIG_ASS double dar = (double) (res->w - res->ml - res->mr) / (res->h - res->mt - res->mb); if (ass_renderer) { ass_configure(ass_renderer, res->w, res->h, hinting); ass_set_margins(ass_renderer, res->mt, res->mb, res->ml, res->mr); ass_set_aspect_ratio(ass_renderer, dar, (double)res->srcw/res->srch); } +#endif } ASS_Image *eosd_render_frame(double ts, int *changed) { ASS_Image *r = NULL; +#ifdef CONFIG_ASS if (sub_visibility && ass_renderer && ass_track && ts != MP_NOPTS_VALUE) { r = ass_mp_render_frame(ass_renderer, ass_track, (ts+sub_delay) * 1000 + .5, changed); if (!prev_visibility && changed) *changed = 2; } prev_visibility = sub_visibility; +#endif return r; } void eosd_uninit(void) { +#ifdef CONFIG_ASS if (ass_renderer) ass_renderer_done(ass_renderer); +#endif } Modified: trunk/eosd.h ============================================================================== --- trunk/eosd.h Wed Aug 25 18:34:39 2010 (r32014) +++ trunk/eosd.h Thu Aug 26 13:20:50 2010 (r32015) @@ -25,9 +25,9 @@ void eosd_init(vf_instance_t *); void eosd_configure(mp_eosd_res_t *, int); -ASS_Image *eosd_render_frame(double, int *); +struct ass_image *eosd_render_frame(double, int *); void eosd_uninit(void); -void eosd_ass_init(ASS_Library *); +void eosd_ass_init(struct ass_library *); #endif /* MPLAYER_EOSD_H */

4 4

r32033 - trunk/subreader.c
by aurel 29 Aug '10

29 Aug '10

Author: aurel Date: Sun Aug 29 13:27:00 2010 New Revision: 32033 Log: fix crash with un-commonly formated ASS files Modified: trunk/subreader.c Modified: trunk/subreader.c ============================================================================== --- trunk/subreader.c Sun Aug 29 08:51:05 2010 (r32032) +++ trunk/subreader.c Sun Aug 29 13:27:00 2010 (r32033) @@ -641,19 +641,20 @@ static subtitle *sub_read_line_ssa(strea do { if (!stream_read_line (st, line, LINE_LEN, utf16)) return NULL; - } while (sscanf (line, "Dialogue: Marked=%d,%d:%d:%d.%d,%d:%d:%d.%d," + } while (sscanf (line, "Dialogue: Marked=%d,%d:%d:%d.%d,%d:%d:%d.%d" "%[^\n\r]", &nothing, &hour1, &min1, &sec1, &hunsec1, &hour2, &min2, &sec2, &hunsec2, line3) < 9 && - sscanf (line, "Dialogue: %d,%d:%d:%d.%d,%d:%d:%d.%d," + sscanf (line, "Dialogue: %d,%d:%d:%d.%d,%d:%d:%d.%d" "%[^\n\r]", &nothing, &hour1, &min1, &sec1, &hunsec1, &hour2, &min2, &sec2, &hunsec2, line3) < 9 ); line2=strchr(line3, ','); + if (!line2) return NULL; for (comma = 4; comma < max_comma; comma ++) {

1 0

[propchange]: r32023 - svn:log
by diego 29 Aug '10

29 Aug '10

Author: diego Revision: 32023 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Add Doxygen comments and formal parameters names in eosd.h. +Add Doxygen comments and formal parameter names in eosd.h.

1 0

r32032 - trunk/libmpdemux/demux_lavf.c
by reimar 29 Aug '10

29 Aug '10

Author: reimar Date: Sun Aug 29 08:51:05 2010 New Revision: 32032 Log: Always use convergence_duration for subtitles otherwise they will stay on screen forever for ASS subtitles in mkv if no ASS renderer is used. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Sun Aug 29 08:46:06 2010 (r32031) +++ trunk/libmpdemux/demux_lavf.c Sun Aug 29 08:51:05 2010 (r32032) @@ -628,7 +628,10 @@ static int demux_lavf_fill_buffer(demuxe if(pkt.pts != AV_NOPTS_VALUE){ dp->pts=pkt.pts * av_q2d(priv->avfc->streams[id]->time_base); priv->last_pts= dp->pts * AV_TIME_BASE; - if(pkt.flags & PKT_FLAG_KEY && pkt.convergence_duration > 0) + // always set endpts for subtitles, even if PKT_FLAG_KEY is not set, + // otherwise they will stay on screen to long if e.g. ASS is demuxed from mkv + if((ds == demux->sub || (pkt.flags & PKT_FLAG_KEY)) && + pkt.convergence_duration > 0) dp->endpts = dp->pts + pkt.convergence_duration * av_q2d(priv->avfc->streams[id]->time_base); } dp->pos=demux->filepos;

1 0

r32031 - trunk/libmpdemux/demuxer.c
by reimar 29 Aug '10

29 Aug '10

Author: reimar Date: Sun Aug 29 08:46:06 2010 New Revision: 32031 Log: Also reset subtitle EOF on seeking. Modified: trunk/libmpdemux/demuxer.c Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c Sun Aug 29 08:33:29 2010 (r32030) +++ trunk/libmpdemux/demuxer.c Sun Aug 29 08:46:06 2010 (r32031) @@ -1306,6 +1306,7 @@ int demux_seek(demuxer_t *demuxer, float demuxer->stream->eof = 0; demuxer->video->eof = 0; demuxer->audio->eof = 0; + demuxer->sub->eof = 0; if (flags & SEEK_ABSOLUTE) pts = 0.0f;

1 0

r32030 - trunk/mpcommon.c
by reimar 29 Aug '10

29 Aug '10

Author: reimar Date: Sun Aug 29 08:33:29 2010 New Revision: 32030 Log: Fix indentation. Modified: trunk/mpcommon.c Modified: trunk/mpcommon.c ============================================================================== --- trunk/mpcommon.c Sun Aug 29 08:06:28 2010 (r32029) +++ trunk/mpcommon.c Sun Aug 29 08:33:29 2010 (r32030) @@ -228,9 +228,9 @@ void update_subtitles(sh_video_t *sh_vid if (len > 10 && memcmp(packet, "Dialogue: ", 10) == 0) ass_process_data(ass_track, packet, len); else - ass_process_chunk(ass_track, packet, len, - (long long)(subpts*1000 + 0.5), - (long long)((endpts-subpts)*1000 + 0.5)); + ass_process_chunk(ass_track, packet, len, + (long long)(subpts*1000 + 0.5), + (long long)((endpts-subpts)*1000 + 0.5)); } else { // plaintext subs with libass if (subpts != MP_NOPTS_VALUE) { subtitle tmp_subs = {0};

1 0

r32029 - trunk/libmpcodecs/vf_vo.c
by reimar 29 Aug '10

29 Aug '10

Author: reimar Date: Sun Aug 29 08:06:28 2010 New Revision: 32029 Log: Replace ass_mp.h include by eosd.h include. Avoids a dependency on ASS and fixes implicit declaration warnings. Modified: trunk/libmpcodecs/vf_vo.c Modified: trunk/libmpcodecs/vf_vo.c ============================================================================== --- trunk/libmpcodecs/vf_vo.c Sat Aug 28 16:20:58 2010 (r32028) +++ trunk/libmpcodecs/vf_vo.c Sun Aug 29 08:06:28 2010 (r32029) @@ -29,9 +29,7 @@ #include "libvo/sub.h" #include "libvo/video_out.h" -#ifdef CONFIG_ASS -#include "libass/ass_mp.h" -#endif +#include "eosd.h" //===========================================================================//

1 0

r32028 - in branches/1.0rc4: . loader/module.c mplayer.c
by siretart 28 Aug '10

28 Aug '10

Author: siretart Date: Sat Aug 28 16:20:58 2010 New Revision: 32028 Log: Disable loading codecs from the current directory. While convenient, it is too risky. backport r32025 and r32026 by reimar Modified: branches/1.0rc4/ (props changed) branches/1.0rc4/loader/module.c branches/1.0rc4/mplayer.c Modified: branches/1.0rc4/loader/module.c ============================================================================== --- branches/1.0rc4/loader/module.c Fri Aug 27 23:58:14 2010 (r32027) +++ branches/1.0rc4/loader/module.c Sat Aug 28 16:20:58 2010 (r32028) @@ -381,6 +381,10 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR lib // if(fs_installed==0) // install_fs(); + // Do not load libraries from a path relative to the current directory + if (*libname != '/') + i++; + while (wm == 0 && listpath[++i]) { if (i < 2) Modified: branches/1.0rc4/mplayer.c ============================================================================== --- branches/1.0rc4/mplayer.c Fri Aug 27 23:58:14 2010 (r32027) +++ branches/1.0rc4/mplayer.c Sat Aug 28 16:20:58 2010 (r32028) @@ -2746,9 +2746,13 @@ int gui_no_filename=0; { HMODULE kernel32 = GetModuleHandle("Kernel32.dll"); BOOL WINAPI (*setDEP)(DWORD) = NULL; - if (kernel32) + BOOL WINAPI (*setDllDir)(LPCTSTR) = NULL; + if (kernel32) { setDEP = GetProcAddress(kernel32, "SetProcessDEPPolicy"); + setDllDir = GetProcAddress(kernel32, "SetDllDirectoryA"); + } if (setDEP) setDEP(3); + if (setDllDir) setDllDir(""); } // stop Windows from showing all kinds of annoying error dialogs SetErrorMode(0x8003);

1 0

r32027 - trunk/configure
by cehoyos 27 Aug '10

27 Aug '10

Author: cehoyos Date: Fri Aug 27 23:58:14 2010 New Revision: 32027 Log: Fix compilation with --disable-networking. Patch by Andrew Wason, rectalogic rectalogic com Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Aug 27 21:48:39 2010 (r32026) +++ trunk/configure Fri Aug 27 23:58:14 2010 (r32027) @@ -3427,7 +3427,7 @@ else def_network='#undef CONFIG_NETWORK' def_networking='#undef CONFIG_NETWORKING' _ftp=no - libavprotocols=$(echo $libavprotocols | sed -e s/GOPHER_PROTOCOL// -e s/HTTP_PROTOCOL// -e s/RTMP_PROTOCOL// -e s/RTP_PROTOCOL// -e s/TCP_PROTOCOL// -e s/UDP_PROTOCOL//) + libavprotocols=$(echo $libavprotocols | sed -e s/GOPHER_PROTOCOL// -e s/HTTP_PROTOCOL// -e s/RTMP_PROTOCOL// -e s/RTP_PROTOCOL// -e s/TCP_PROTOCOL// -e s/UDP_PROTOCOL// -e s/MMSH_PROTOCOL// -e s/MMST_PROTOCOL//) libavdemuxers=$(echo $libavdemuxers | sed -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER//) fi echores "$networking"

1 0

r32025 - in trunk: loader/module.c mplayer.c
by reimar 27 Aug '10

27 Aug '10

Author: reimar Date: Fri Aug 27 18:28:53 2010 New Revision: 32025 Log: Disable loading codecs from the current directory. While convenient, it is too risky. Modified: trunk/loader/module.c trunk/mplayer.c Modified: trunk/loader/module.c ============================================================================== --- trunk/loader/module.c Fri Aug 27 18:19:24 2010 (r32024) +++ trunk/loader/module.c Fri Aug 27 18:28:53 2010 (r32025) @@ -381,6 +381,10 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR lib // if(fs_installed==0) // install_fs(); + // Do not load libraries from a path relative to the current directory + if (*libname != '/') + i++; + while (wm == 0 && listpath[++i]) { if (i < 2) Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Fri Aug 27 18:19:24 2010 (r32024) +++ trunk/mplayer.c Fri Aug 27 18:28:53 2010 (r32025) @@ -2768,9 +2768,13 @@ int gui_no_filename=0; { HMODULE kernel32 = GetModuleHandle("Kernel32.dll"); BOOL WINAPI (*setDEP)(DWORD) = NULL; - if (kernel32) + BOOL WINAPI (*setDllDir)(LPCTSTR) = NULL; + if (kernel32) { setDEP = GetProcAddress(kernel32, "SetProcessDEPPolicy"); + setDllDir = GetProcAddress(kernel32, "SetDllDirectory"); + } if (setDEP) setDEP(3); + if (setDllDir) setDllDir(""); } // stop Windows from showing all kinds of annoying error dialogs SetErrorMode(0x8003);

3 2

r32026 - trunk/mplayer.c
by reimar 27 Aug '10

27 Aug '10

Author: reimar Date: Fri Aug 27 21:48:39 2010 New Revision: 32026 Log: 100l, we need to search for SetDllDirectoryA instead of SetDllDirectory Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Fri Aug 27 18:28:53 2010 (r32025) +++ trunk/mplayer.c Fri Aug 27 21:48:39 2010 (r32026) @@ -2771,7 +2771,7 @@ int gui_no_filename=0; BOOL WINAPI (*setDllDir)(LPCTSTR) = NULL; if (kernel32) { setDEP = GetProcAddress(kernel32, "SetProcessDEPPolicy"); - setDllDir = GetProcAddress(kernel32, "SetDllDirectory"); + setDllDir = GetProcAddress(kernel32, "SetDllDirectoryA"); } if (setDEP) setDEP(3); if (setDllDir) setDllDir("");

1 0

r32024 - trunk/configure
by reimar 27 Aug '10

27 Aug '10

Author: reimar Date: Fri Aug 27 18:19:24 2010 New Revision: 32024 Log: Fix arts check to actually check linking so it doesn't get enabled when e.g. cross-compiling under Linux for Windows. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Fri Aug 27 16:12:20 2010 (r32023) +++ trunk/configure Fri Aug 27 18:19:24 2010 (r32024) @@ -94,6 +94,7 @@ function_check() { int main(void) { $2; return 0; } EOF shift + shift compile_check $TMPC $@ } @@ -5695,7 +5696,7 @@ echocheck "aRts" if test "$_arts" = auto ; then _arts=no if ( artsc-config --version ) >> "$TMPLOG" 2>&1 ; then - header_check artsc.h $(artsc-config --libs) $(artsc-config --cflags) && + function_check artsc.h "arts_init()" $(artsc-config --libs) $(artsc-config --cflags) && _arts=yes fi fi

1 0

r32023 - trunk/eosd.h
by cigaes 27 Aug '10

27 Aug '10

Author: cigaes Date: Fri Aug 27 16:12:20 2010 New Revision: 32023 Log: Add Doxygen comments and formal parameters names in eosd.h. Modified: trunk/eosd.h Modified: trunk/eosd.h ============================================================================== --- trunk/eosd.h Fri Aug 27 14:14:59 2010 (r32022) +++ trunk/eosd.h Fri Aug 27 16:12:20 2010 (r32023) @@ -22,12 +22,44 @@ #ifndef MPLAYER_EOSD_H #define MPLAYER_EOSD_H -void eosd_init(vf_instance_t *); +/** + * Initialize the EOSD subsystem. + * + * @param vf the video filter chain where the rendering will take place. + */ +void eosd_init(vf_instance_t *vf); -void eosd_configure(mp_eosd_res_t *, int); -struct ass_image *eosd_render_frame(double, int *); +/** + * Configure the resolution for EOSD rendering. + * Should be called by the rendering engine whenever the resolution or + * settings change. + * + * @param res resolution and margins of the rendering area. + * @param hinting nonzero if hinting is useful. + */ +void eosd_configure(mp_eosd_res_t *res, int hinting); + +/** + * Renders the EOSD elements for the current frame. + * Should be called by the rendering engine when it is about to do or + * prepare the rendering. + * + * @param ts presentation timestamp of the frame. + * @param changed if not NULL, will be set to 0 if the elements are + * identical since the last call, 1 if they have changed + * only in coordinates, and 2 if they have really changed. + * @return a linked list of EOSD elements. + */ +struct ass_image *eosd_render_frame(double ts, int *changed); + +/** + * Shut down the EOSD subsystem and free the associated resources. + */ void eosd_uninit(void); +/** + * Initialize the use of EOSD for ASS subtitles rendering. + */ void eosd_ass_init(struct ass_library *); #endif /* MPLAYER_EOSD_H */

1 0

r32022 - trunk/etc/codecs.conf
by compn 27 Aug '10

27 Aug '10

Author: compn Date: Fri Aug 27 14:14:59 2010 New Revision: 32022 Log: add matchware screen codec fourcc MWSC Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Thu Aug 26 23:06:24 2010 (r32021) +++ trunk/etc/codecs.conf Fri Aug 27 14:14:59 2010 (r32022) @@ -2488,6 +2488,14 @@ videocodec bwmpeg dll "bw10.dll" ;requires vtaccess.dll out YV12,YUY2,I420 +videocodec matchware + info "matchware screen capture codec" + status working + fourcc MWSC + driver vfw + dll "mwsc.dll" + out BGR24 flip + videocodec zdsoft info "zdsoft screen recorder" status working

1 0

r32021 - trunk/stream/cache2.c
by cehoyos 27 Aug '10

27 Aug '10

Author: cehoyos Date: Thu Aug 26 23:06:24 2010 New Revision: 32021 Log: Fix compilation with gcc 2.95.3 with some help by Reimar. Modified: trunk/stream/cache2.c Modified: trunk/stream/cache2.c ============================================================================== --- trunk/stream/cache2.c Thu Aug 26 21:24:18 2010 (r32020) +++ trunk/stream/cache2.c Thu Aug 26 23:06:24 2010 (r32021) @@ -366,7 +366,8 @@ static void dummy_sighandler(int x) { static void cache_mainloop(cache_vars_t *s) { int sleep_count = 0; #if FORKED_CACHE - struct sigaction sa = { .sa_handler = SIG_IGN }; + struct sigaction sa = { 0 }; + sa.sa_handler = SIG_IGN; sigaction(SIGUSR1, &sa, NULL); #endif do {

2 1

r32020 - trunk/configure
by reimar 26 Aug '10

26 Aug '10

Author: reimar Date: Thu Aug 26 21:24:18 2010 New Revision: 32020 Log: Fix --disable-ass-internal to actually have an effect. Further cleanup of this "mess" welcome. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Aug 26 20:44:14 2010 (r32019) +++ trunk/configure Thu Aug 26 21:24:18 2010 (r32020) @@ -805,7 +805,7 @@ _vstream=auto _pthreads=auto _w32threads=auto _ass=auto -ass_internal=no +ass_internal=auto _rpath=no _asmalign_pot=auto _stream_cache=yes @@ -6411,9 +6411,8 @@ EOF _ass=no cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes if test "$_ass" = no ; then - ass_internal=no res_comment="FreeType >= 2.2.1 needed" - elif test "$ass_internal" = no ; then + elif test "$ass_internal" != yes ; then cat > $TMPC << EOF #include <ass/ass.h> int main(void) { @@ -6427,8 +6426,10 @@ EOF if cc_check -lass ; then res_comment="external" extra_ldflags="$extra_ldflags -lass" - else + elif test "$ass_internal" = auto ; then ass_internal=yes + else + _ass=no fi fi fi @@ -6441,6 +6442,7 @@ if test "$ass_internal" = yes ; then def_ass_internal='#define CONFIG_ASS_INTERNAL 1' else def_ass_internal='#undef CONFIG_ASS_INTERNAL' + ass_internal=no fi echores "$_ass"

1 0

r32019 - trunk/libmpcodecs/ve_xvid4.c
by cehoyos 26 Aug '10

26 Aug '10

Author: cehoyos Date: Thu Aug 26 20:44:14 2010 New Revision: 32019 Log: Print a warning, but allow to encode to a non-supported frame rate with libxvid. Patch by Carl Eric Codere, cecodere yahoo ca Modified: trunk/libmpcodecs/ve_xvid4.c Modified: trunk/libmpcodecs/ve_xvid4.c ============================================================================== --- trunk/libmpcodecs/ve_xvid4.c Thu Aug 26 20:42:47 2010 (r32018) +++ trunk/libmpcodecs/ve_xvid4.c Thu Aug 26 20:44:14 2010 (r32019) @@ -1004,10 +1004,9 @@ static int set_create_struct(xvid_mplaye if( ((float)mod->mux->h.dwRate/(float)mod->mux->h.dwScale > (float)selected_profile->fps) && (selected_profile->fps != 0)) { - mp_msg(MSGT_MENCODER,MSGL_ERR, - "xvid:[ERROR] frame rate must be <= %d for the chosen profile\n", + mp_msg(MSGT_MENCODER,MSGL_WARN, + "xvid:[WARNING] frame rate should be <= %d for the chosen profile\n", selected_profile->fps); - return BAD; } /* Encodings zones */

1 0

r32018 - trunk/libmpcodecs/ve_xvid4.c
by cehoyos 26 Aug '10

26 Aug '10

Author: cehoyos Date: Thu Aug 26 20:42:47 2010 New Revision: 32018 Log: Add new Simple Profile Levels to the Xvid encoder. Patch by Carl Eric Codere, cecodere yahoo ca Modified: trunk/libmpcodecs/ve_xvid4.c Modified: trunk/libmpcodecs/ve_xvid4.c ============================================================================== --- trunk/libmpcodecs/ve_xvid4.c Thu Aug 26 13:29:01 2010 (r32017) +++ trunk/libmpcodecs/ve_xvid4.c Thu Aug 26 20:42:47 2010 (r32018) @@ -113,6 +113,11 @@ static const profile_t profiles[] = { "sp1", 0x01, 176, 144, 15, 4, 198, 99, 1485, 100, 10*16368, 2048, 64000, 0, -1, PROFILE_S|PROFILE_ADAPTQUANT }, { "sp2", 0x02, 352, 288, 15, 4, 792, 396, 5940, 100, 40*16368, 4096, 128000, 0, -1, PROFILE_S|PROFILE_ADAPTQUANT }, { "sp3", 0x03, 352, 288, 15, 4, 792, 396, 11880, 100, 40*16368, 8192, 384000, 0, -1, PROFILE_S|PROFILE_ADAPTQUANT }, + /* From ISO/IEC 14496-2:2004/FPDAM 2: New Levels for Simple Profile */ + { "sp4a", 0x04, 640, 480, 30, 4, 2400, 1200, 36000, 100, 80*16368, 16384, 4000000, 0, -1, PROFILE_S|PROFILE_ADAPTQUANT }, + { "sp5", 0x05, 720, 576, 30, 4, 3240, 1620, 40500, 100, 112*16368, 16384, 8000000, 0, -1, PROFILE_S|PROFILE_ADAPTQUANT }, + /* From ISO/IEC 14496-2:2004/FPDAM 4: Simple profile level 6 */ + { "sp6", 0x06, 1280, 720, 30, 4, 7200, 3600, 108000, 100, 248*16368, 16384,12000000, 0, -1, PROFILE_S|PROFILE_ADAPTQUANT }, { "asp0", 0xf0, 176, 144, 30, 1, 297, 99, 2970, 100, 10*16368, 2048, 128000, 0, -1, PROFILE_AS }, { "asp1", 0xf1, 176, 144, 30, 4, 297, 99, 2970, 100, 10*16368, 2048, 128000, 0, -1, PROFILE_AS },

1 0

r32017 - trunk/eosd.c
by cigaes 26 Aug '10

26 Aug '10

Author: cigaes Date: Thu Aug 26 13:29:01 2010 New Revision: 32017 Log: Cosmetic: reformat a if...return. Modified: trunk/eosd.c Modified: trunk/eosd.c ============================================================================== --- trunk/eosd.c Thu Aug 26 13:26:46 2010 (r32016) +++ trunk/eosd.c Thu Aug 26 13:29:01 2010 (r32017) @@ -33,7 +33,8 @@ int prev_visibility; void eosd_ass_init(ASS_Library *ass_library) { ass_renderer = ass_renderer_init(ass_library); - if (!ass_renderer) return; + if (!ass_renderer) + return; ass_configure_fonts(ass_renderer); } #endif

1 0

r32016 - trunk/mencoder.c
by cigaes 26 Aug '10

26 Aug '10

Author: cigaes Date: Thu Aug 26 13:26:46 2010 New Revision: 32016 Log: Cosmetic: reindent a line. Modified: trunk/mencoder.c Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Thu Aug 26 13:20:50 2010 (r32015) +++ trunk/mencoder.c Thu Aug 26 13:26:46 2010 (r32016) @@ -1052,7 +1052,7 @@ default: { } #endif - sh_video->vfilter=append_filters(sh_video->vfilter); + sh_video->vfilter=append_filters(sh_video->vfilter); eosd_init(sh_video->vfilter); #ifdef CONFIG_ASS

1 0

r32009 - in trunk: eosd.c eosd.h
by cigaes 25 Aug '10

25 Aug '10

Author: cigaes Date: Mon Aug 23 21:22:03 2010 New Revision: 32009 Log: Forgot to svn add those two files. Added: trunk/eosd.c trunk/eosd.h Added: trunk/eosd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/eosd.c Mon Aug 23 21:22:03 2010 (r32009) @@ -0,0 +1,70 @@ +/* + * Extended On Screen Display + * Copyright (C) 2010 Nicolas George + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "mpcommon.h" +#include "libmpcodecs/vf.h" +#include "libvo/video_out.h" +#include "libvo/sub.h" +#include "libass/ass_mp.h" +#include "eosd.h" + +static ASS_Renderer *ass_renderer; +int prev_visibility; + +void eosd_ass_init(ASS_Library *ass_library) +{ + ass_renderer = ass_renderer_init(ass_library); + if (!ass_renderer) return; + ass_configure_fonts(ass_renderer); +} + +void eosd_init(vf_instance_t *vf) +{ + vf->control(vf, VFCTRL_INIT_EOSD, NULL); +} + +void eosd_configure(mp_eosd_res_t *res, int hinting) +{ + double dar = (double) (res->w - res->ml - res->mr) / (res->h - res->mt - res->mb); + if (ass_renderer) { + ass_configure(ass_renderer, res->w, res->h, hinting); + ass_set_margins(ass_renderer, res->mt, res->mb, res->ml, res->mr); + ass_set_aspect_ratio(ass_renderer, dar, (double)res->srcw/res->srch); + } +} + +ASS_Image *eosd_render_frame(double ts, int *changed) +{ + ASS_Image *r = NULL; + if (sub_visibility && ass_renderer && ass_track && ts != MP_NOPTS_VALUE) { + r = ass_mp_render_frame(ass_renderer, ass_track, (ts+sub_delay) * 1000 + .5, changed); + if (!prev_visibility && changed) + *changed = 2; + } + prev_visibility = sub_visibility; + return r; +} + +void eosd_uninit(void) +{ + if (ass_renderer) + ass_renderer_done(ass_renderer); +} Added: trunk/eosd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/eosd.h Mon Aug 23 21:22:03 2010 (r32009) @@ -0,0 +1,33 @@ +/* + * Extended On Screen Display + * Copyright (C) 2010 Nicolas George + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_EOSD_H +#define MPLAYER_EOSD_H + +void eosd_init(vf_instance_t *); + +void eosd_configure(mp_eosd_res_t *, int); +ASS_Image *eosd_render_frame(double, int *); +void eosd_uninit(void); + +void eosd_ass_init(ASS_Library *); + +#endif /* MPLAYER_EOSD_H */

6 15

r32008 - in trunk: Makefile libmpcodecs/dec_video.c libmpcodecs/vf_ass.c libmpcodecs/vf_vo.c mencoder.c mplayer.c
by cigaes 24 Aug '10

24 Aug '10

Author: cigaes Date: Mon Aug 23 21:13:05 2010 New Revision: 32008 Log: EOSD/ASS code factorization Move some code that was partially duplicated between vf_vo and vf_ass with subtle differences into a separate file. Modified: trunk/Makefile trunk/libmpcodecs/dec_video.c trunk/libmpcodecs/vf_ass.c trunk/libmpcodecs/vf_vo.c trunk/mencoder.c trunk/mplayer.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Mon Aug 23 01:38:40 2010 (r32007) +++ trunk/Makefile Mon Aug 23 21:13:05 2010 (r32008) @@ -336,6 +336,7 @@ SRCS_COMMON = asxparser.c \ codec-cfg.c \ cpudetect.c \ edl.c \ + eosd.c \ find_sub.c \ fmt-conversion.c \ m_config.c \ Modified: trunk/libmpcodecs/dec_video.c ============================================================================== --- trunk/libmpcodecs/dec_video.c Mon Aug 23 01:38:40 2010 (r32007) +++ trunk/libmpcodecs/dec_video.c Mon Aug 23 21:13:05 2010 (r32008) @@ -39,6 +39,7 @@ #include "libmpdemux/stheader.h" #include "vd.h" #include "vf.h" +#include "eosd.h" #include "dec_video.h" @@ -185,6 +186,7 @@ void uninit_video(sh_video_t *sh_video) dlclose(sh_video->dec_handle); #endif vf_uninit_filter_chain(sh_video->vfilter); + eosd_uninit(); sh_video->initialized = 0; } Modified: trunk/libmpcodecs/vf_ass.c ============================================================================== --- trunk/libmpcodecs/vf_ass.c Mon Aug 23 01:38:40 2010 (r32007) +++ trunk/libmpcodecs/vf_ass.c Mon Aug 23 21:13:05 2010 (r32008) @@ -39,10 +39,12 @@ #include "libvo/fastmemcpy.h" #include "libvo/sub.h" +#include "libvo/video_out.h" #include "m_option.h" #include "m_struct.h" #include "libass/ass_mp.h" +#include "eosd.h" #define _r(c) ((c)>>24) #define _g(c) (((c)>>16)&0xFF) @@ -62,8 +64,6 @@ static const struct vf_priv_s { // 0 = insert always int auto_insert; - ASS_Renderer* ass_priv; - unsigned char* planes[3]; unsigned char* dirty_rows; } vf_priv_dflt; @@ -73,6 +73,8 @@ static int config(struct vf_instance *vf int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { + mp_eosd_res_t res = {0}; + if (outfmt == IMGFMT_IF09) return 0; vf->priv->outh = height + ass_top_margin + ass_bottom_margin; @@ -87,10 +89,13 @@ static int config(struct vf_instance *vf vf->priv->planes[2] = malloc(vf->priv->outw * vf->priv->outh); vf->priv->dirty_rows = malloc(vf->priv->outh); - if (vf->priv->ass_priv) { - ass_configure(vf->priv->ass_priv, vf->priv->outw, vf->priv->outh, 0); - ass_set_aspect_ratio(vf->priv->ass_priv, 1, 1); - } + res.w = vf->priv->outw; + res.h = vf->priv->outh; + res.srcw = width; + res.srch = height; + res.mt = ass_top_margin; + res.mb = ass_bottom_margin; + eosd_configure(&res, 0); return vf_next_config(vf, vf->priv->outw, vf->priv->outh, d_width, d_height, flags, outfmt); } @@ -324,10 +329,7 @@ static int render_frame(struct vf_instan static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) { - ASS_Image* images = 0; - if (sub_visibility && vf->priv->ass_priv && ass_track && (pts != MP_NOPTS_VALUE)) - images = ass_mp_render_frame(vf->priv->ass_priv, ass_track, (pts+sub_delay) * 1000 + .5, NULL); - + ASS_Image* images = eosd_render_frame(pts, NULL); prepare_image(vf, mpi); if (images) render_frame(vf, mpi, images); @@ -349,21 +351,15 @@ static int control(vf_instance_t *vf, in { switch (request) { case VFCTRL_INIT_EOSD: - vf->priv->ass_priv = ass_renderer_init((ASS_Library*)data); - if (!vf->priv->ass_priv) return CONTROL_FALSE; - ass_configure_fonts(vf->priv->ass_priv); return CONTROL_TRUE; case VFCTRL_DRAW_EOSD: - if (vf->priv->ass_priv) return CONTROL_TRUE; - break; + return CONTROL_TRUE; } return vf_next_control(vf, request, data); } static void uninit(struct vf_instance *vf) { - if (vf->priv->ass_priv) - ass_renderer_done(vf->priv->ass_priv); if (vf->priv->planes[1]) free(vf->priv->planes[1]); if (vf->priv->planes[2]) Modified: trunk/libmpcodecs/vf_vo.c ============================================================================== --- trunk/libmpcodecs/vf_vo.c Mon Aug 23 01:38:40 2010 (r32007) +++ trunk/libmpcodecs/vf_vo.c Mon Aug 23 21:13:05 2010 (r32008) @@ -38,10 +38,6 @@ struct vf_priv_s { double pts; const vo_functions_t *vo; -#ifdef CONFIG_ASS - ASS_Renderer* ass_priv; - int prev_visibility; -#endif }; #define video_out (vf->priv->vo) @@ -81,11 +77,6 @@ static int config(struct vf_instance *vf if(config_video_out(video_out,width,height,d_width,d_height,flags,"MPlayer",outfmt)) return 0; -#ifdef CONFIG_ASS - if (vf->priv->ass_priv) - ass_configure(vf->priv->ass_priv, width, height, !!(vf->default_caps & VFCAP_EOSD_UNSCALED)); -#endif - ++vo_config_count; return 1; } @@ -130,34 +121,17 @@ static int control(struct vf_instance *v #ifdef CONFIG_ASS case VFCTRL_INIT_EOSD: { - vf->priv->ass_priv = ass_renderer_init((ASS_Library*)data); - if (!vf->priv->ass_priv) return CONTROL_FALSE; - ass_configure_fonts(vf->priv->ass_priv); - vf->priv->prev_visibility = 0; return CONTROL_TRUE; } case VFCTRL_DRAW_EOSD: { EOSD_ImageList images = {NULL, 2}; + mp_eosd_res_t res = {0}; double pts = vf->priv->pts; - if (!vo_config_count || !vf->priv->ass_priv) return CONTROL_FALSE; - if (sub_visibility && vf->priv->ass_priv && ass_track && (pts != MP_NOPTS_VALUE)) { - mp_eosd_res_t res; - memset(&res, 0, sizeof(res)); - if (video_out->control(VOCTRL_GET_EOSD_RES, &res) == VO_TRUE) { - double dar = (double) (res.w - res.ml - res.mr) / (res.h - res.mt - res.mb); - ass_set_frame_size(vf->priv->ass_priv, res.w, res.h); - ass_set_margins(vf->priv->ass_priv, res.mt, res.mb, res.ml, res.mr); - ass_set_aspect_ratio(vf->priv->ass_priv, dar, (double)res.srcw/res.srch); - } - - images.imgs = ass_mp_render_frame(vf->priv->ass_priv, ass_track, (pts+sub_delay) * 1000 + .5, &images.changed); - if (!vf->priv->prev_visibility) - images.changed = 2; - vf->priv->prev_visibility = 1; - } else - vf->priv->prev_visibility = 0; - vf->priv->prev_visibility = sub_visibility; + if (!vo_config_count) return CONTROL_FALSE; + if (video_out->control(VOCTRL_GET_EOSD_RES, &res) == VO_TRUE) + eosd_configure(&res, !!(vf->default_caps & VFCAP_EOSD_UNSCALED)); + images.imgs = eosd_render_frame(pts, &images.changed); return (video_out->control(VOCTRL_DRAW_EOSD, &images) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE; } #endif @@ -222,13 +196,7 @@ static void draw_slice(struct vf_instanc static void uninit(struct vf_instance *vf) { - if (vf->priv) { -#ifdef CONFIG_ASS - if (vf->priv->ass_priv) - ass_renderer_done(vf->priv->ass_priv); -#endif free(vf->priv); - } } //===========================================================================// Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Mon Aug 23 01:38:40 2010 (r32007) +++ trunk/mencoder.c Mon Aug 23 21:13:05 2010 (r32008) @@ -97,6 +97,7 @@ #include "path.h" #include "spudec.h" #include "vobsub.h" +#include "eosd.h" int vo_doublebuffering=0; @@ -1052,10 +1053,11 @@ default: { #endif sh_video->vfilter=append_filters(sh_video->vfilter); + eosd_init(sh_video->vfilter); #ifdef CONFIG_ASS if (ass_enabled) - ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_INIT_EOSD, ass_library); + eosd_ass_init(ass_library); #endif // after reading video params we should load subtitles because Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Mon Aug 23 01:38:40 2010 (r32007) +++ trunk/mplayer.c Mon Aug 23 21:13:05 2010 (r32008) @@ -124,6 +124,7 @@ #include "spudec.h" #include "subreader.h" #include "vobsub.h" +#include "eosd.h" #ifdef CONFIG_X11 #include "libvo/x11_common.h" @@ -2322,10 +2323,11 @@ int reinit_video_chain(void) { #endif sh_video->vfilter=append_filters(sh_video->vfilter); + eosd_init(sh_video->vfilter); #ifdef CONFIG_ASS if (ass_enabled) - ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_INIT_EOSD, ass_library); + eosd_ass_init(ass_library); #endif current_module="init_video_codec";

3 2

r32007 - in trunk/libmpcodecs: ad_ffmpeg.c vd_ffmpeg.c
by diego 22 Aug '10

22 Aug '10

Author: diego Date: Mon Aug 23 01:38:40 2010 New Revision: 32007 Log: Remove pointless casts of avcodec_find_decoder_by_name() return value. avcodec_find_decoder_by_name() already returns AVCodec*, so there is no need to cast the return value to this type. Modified: trunk/libmpcodecs/ad_ffmpeg.c trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/ad_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/ad_ffmpeg.c Sat Aug 21 18:04:18 2010 (r32006) +++ trunk/libmpcodecs/ad_ffmpeg.c Mon Aug 23 01:38:40 2010 (r32007) @@ -101,7 +101,7 @@ static int init(sh_audio_t *sh_audio) avcodec_initialized=1; } - lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh_audio->codec->dll); + lavc_codec = avcodec_find_decoder_by_name(sh_audio->codec->dll); if(!lavc_codec){ mp_msg(MSGT_DECAUDIO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh_audio->codec->dll); return 0; Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sat Aug 21 18:04:18 2010 (r32006) +++ trunk/libmpcodecs/vd_ffmpeg.c Mon Aug 23 01:38:40 2010 (r32007) @@ -264,7 +264,7 @@ static int init(sh_video_t *sh){ return 0; memset(ctx, 0, sizeof(vd_ffmpeg_ctx)); - lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh->codec->dll); + lavc_codec = avcodec_find_decoder_by_name(sh->codec->dll); if(!lavc_codec){ mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_MissingLAVCcodec, sh->codec->dll); uninit(sh);

1 0

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

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

21 Aug '10

Author: reimar Date: Sat Aug 21 11:58:02 2010 New Revision: 31996 Log: Avoid another unnecessary intermediate variable. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:55:30 2010 (r31995) +++ trunk/stream/stream_bd.c Sat Aug 21 11:58:02 2010 (r31996) @@ -163,7 +163,6 @@ static int find_vuk(struct bd_priv *bd, int i; char line[1024]; char *vst; - unsigned int byte; stream_read_line(file, line, sizeof(line), 0); // file is built up this way: @@ -188,9 +187,8 @@ static int find_vuk(struct bd_priv *bd, if (strlen(vst) < 32) continue; for (i = 0; i < 16; i++) { - if (sscanf(&vst[i*2], "%2x", &byte) != 1) + if (sscanf(&vst[i*2], "%2"SCNx8, &bd->vuk.u8[i]) != 1) break; - bd->vuk.u8[i] = byte; } vukfound = 1; }

1 0

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

21 Aug '10

Author: reimar Date: Sat Aug 21 11:55:30 2010 New Revision: 31995 Log: Avoid a pointless extra variable. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:47:08 2010 (r31994) +++ trunk/stream/stream_bd.c Sat Aug 21 11:55:30 2010 (r31995) @@ -21,6 +21,7 @@ #include <stdio.h> #include <limits.h> +#include <ctype.h> #include "libavutil/common.h" #include "libavutil/aes.h" #include "libavutil/sha.h" @@ -161,7 +162,6 @@ static int find_vuk(struct bd_priv *bd, while (!stream_eof(file)) { int i; char line[1024]; - char d[200]; char *vst; unsigned int byte; @@ -183,9 +183,12 @@ static int find_vuk(struct bd_priv *bd, vst = strstr(line, "| V |"); if (!vst) break; - sscanf(&vst[6], "%32s", d); + vst += 6; + while (isspace(*vst)) vst++; + if (strlen(vst) < 32) + continue; for (i = 0; i < 16; i++) { - if (sscanf(&d[i*2], "%2x", &byte) != 1) + if (sscanf(&vst[i*2], "%2x", &byte) != 1) break; bd->vuk.u8[i] = byte; }

1 0

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

21 Aug '10

Author: reimar Date: Sat Aug 21 11:47:08 2010 New Revision: 31994 Log: Format NULL-pointer check consistently. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:46:06 2010 (r31993) +++ trunk/stream/stream_bd.c Sat Aug 21 11:47:08 2010 (r31994) @@ -181,7 +181,7 @@ static int find_vuk(struct bd_priv *bd, mp_msg(MSGT_OPEN, MSGL_V, "KeyDB found Entry for DiscID:\n%s\n", line); vst = strstr(line, "| V |"); - if (vst == 0) + if (!vst) break; sscanf(&vst[6], "%32s", d); for (i = 0; i < 16; i++) {

1 0

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

21 Aug '10

Author: reimar Date: Sat Aug 21 11:46:06 2010 New Revision: 31993 Log: Simplify searching for discid by comparing the string representations. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:41:15 2010 (r31992) +++ trunk/stream/stream_bd.c Sat Aug 21 11:46:06 2010 (r31993) @@ -146,6 +146,7 @@ static int find_vuk(struct bd_priv *bd, const char *home; int vukfound = 0; stream_t *file; + char idstr[ID_STR_LEN]; // look up discid in KEYDB.cfg to get VUK home = getenv("HOME"); @@ -156,10 +157,10 @@ static int find_vuk(struct bd_priv *bd, "Cannot open VUK database file %s\n", filename); return 0; } + id2str(discid, 20, idstr); while (!stream_eof(file)) { int i; char line[1024]; - uint8_t id[20]; char d[200]; char *vst; unsigned int byte; @@ -175,14 +176,7 @@ static int find_vuk(struct bd_priv *bd, // or I | I-Key // can be followed by ; and comment - //This means: first string up to whitespace is discid - sscanf(line, "%40s", d); - for (i = 0; i < 20; ++i) { - if (sscanf(&d[i*2], "%2x", &byte) != 1) - break; - id[i] = byte; - } - if (memcmp(id, discid, 20) != 0) + if (strncasecmp(line, idstr, 40)) continue; mp_msg(MSGT_OPEN, MSGL_V, "KeyDB found Entry for DiscID:\n%s\n", line);

1 0

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

21 Aug '10

Author: reimar Date: Sat Aug 21 11:41:15 2010 New Revision: 31992 Log: Switch to uppercase hex. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:40:16 2010 (r31991) +++ trunk/stream/stream_bd.c Sat Aug 21 11:41:15 2010 (r31992) @@ -137,7 +137,7 @@ static void id2str(const uint8_t *id, in int i; idlen = FFMIN(idlen, 20); for (i = 0; i < idlen; i++) - snprintf(dst + 2*i, 3, "%02"PRIx8, id[i]); + snprintf(dst + 2*i, 3, "%02"PRIX8, id[i]); } static int find_vuk(struct bd_priv *bd, const uint8_t discid[20])

1 0

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

21 Aug '10

Author: reimar Date: Sat Aug 21 11:40:16 2010 New Revision: 31991 Log: Simplify/fix printing of disc id/VUK Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:27:15 2010 (r31990) +++ trunk/stream/stream_bd.c Sat Aug 21 11:40:16 2010 (r31991) @@ -131,6 +131,15 @@ static int bd_stream_seek(stream_t *s, o return 1; } +#define ID_STR_LEN 41 +static void id2str(const uint8_t *id, int idlen, char dst[ID_STR_LEN]) +{ + int i; + idlen = FFMIN(idlen, 20); + for (i = 0; i < idlen; i++) + snprintf(dst + 2*i, 3, "%02"PRIx8, id[i]); +} + static int find_vuk(struct bd_priv *bd, const uint8_t discid[20]) { char filename[PATH_MAX]; @@ -197,12 +206,13 @@ static int bd_get_uks(struct bd_priv *bd unsigned char *buf; size_t file_size; int pos; - int i, j; + int i; struct AVAES *a; struct AVSHA *asha; stream_t *file; char filename[PATH_MAX]; uint8_t discid[20]; + char idstr[ID_STR_LEN]; snprintf(filename, sizeof(filename), BD_UKF_PATH, bd->device); file = open_stream(filename, NULL, NULL); @@ -229,10 +239,9 @@ static int bd_get_uks(struct bd_priv *bd av_free(asha); if (!find_vuk(bd, discid)) { + id2str(discid, 20, idstr); mp_msg(MSGT_OPEN, MSGL_ERR, - "No Volume Unique Key (VUK) found for this Disc: "); - for (j = 0; j < 20; j++) mp_msg(MSGT_OPEN, MSGL_ERR, "%02x", discid[j]); - mp_msg(MSGT_OPEN, MSGL_ERR, "\n"); + "No Volume Unique Key (VUK) found for this Disc: %s\n", idstr); av_free(buf); return 0; } @@ -253,14 +262,10 @@ static int bd_get_uks(struct bd_priv *bd a = av_malloc(av_aes_size); av_aes_init(a, bd->vuk.u8, 128, 1); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BD_DISCID="); - for (j = 0; j < 20; j++) - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "%02x", discid[j]); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "\n"); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BD_VUK="); - for (j = 0; j < 20; j++) - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "%02x", discid[j]); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "\n"); + id2str(discid, 20, idstr); + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BD_DISCID=%s\n", idstr); + id2str(bd->vuk.u8, 16, idstr); + mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BD_VUK=%s\n", idstr); for (i = 0; i < bd->uks.count; i++) { av_aes_crypt(a, bd->uks.keys[i].u8, &buf[key_pos], 1, NULL, 1); // decrypt unit key

1 0

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

21 Aug '10

Author: reimar Date: Sat Aug 21 11:27:15 2010 New Revision: 31990 Log: Add const to pointer argument. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:20:14 2010 (r31989) +++ trunk/stream/stream_bd.c Sat Aug 21 11:27:15 2010 (r31990) @@ -131,7 +131,7 @@ static int bd_stream_seek(stream_t *s, o return 1; } -static int find_vuk(struct bd_priv *bd, uint8_t discid[20]) +static int find_vuk(struct bd_priv *bd, const uint8_t discid[20]) { char filename[PATH_MAX]; const char *home;

1 0

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

21 Aug '10

Author: reimar Date: Sat Aug 21 11:20:14 2010 New Revision: 31989 Log: Remove a unused assignment. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:19:12 2010 (r31988) +++ trunk/stream/stream_bd.c Sat Aug 21 11:20:14 2010 (r31989) @@ -251,7 +251,7 @@ static int bd_get_uks(struct bd_priv *bd bd->uks.keys = calloc(bd->uks.count, sizeof(key)); a = av_malloc(av_aes_size); - j = av_aes_init(a, bd->vuk.u8, 128, 1); + av_aes_init(a, bd->vuk.u8, 128, 1); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_BD_DISCID="); for (j = 0; j < 20; j++)

1 0

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

21 Aug '10

Author: reimar Date: Sat Aug 21 11:19:12 2010 New Revision: 31988 Log: Fix a memleak. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Sat Aug 21 11:18:29 2010 (r31987) +++ trunk/stream/stream_bd.c Sat Aug 21 11:19:12 2010 (r31988) @@ -233,6 +233,7 @@ static int bd_get_uks(struct bd_priv *bd "No Volume Unique Key (VUK) found for this Disc: "); for (j = 0; j < 20; j++) mp_msg(MSGT_OPEN, MSGL_ERR, "%02x", discid[j]); mp_msg(MSGT_OPEN, MSGL_ERR, "\n"); + av_free(buf); return 0; }

1 0

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

21 Aug '10

Author: reimar Date: Sat Aug 21 11:18:29 2010 New Revision: 31987 Log: Extract reading KEDB.cfg into a separate function. Modified: trunk/stream/stream_bd.c Modified: trunk/stream/stream_bd.c ============================================================================== --- trunk/stream/stream_bd.c Fri Aug 20 20:19:11 2010 (r31986) +++ trunk/stream/stream_bd.c Sat Aug 21 11:18:29 2010 (r31987) @@ -131,43 +131,12 @@ static int bd_stream_seek(stream_t *s, o return 1; } -static int bd_get_uks(struct bd_priv *bd) +static int find_vuk(struct bd_priv *bd, uint8_t discid[20]) { - unsigned char *buf; - size_t file_size; - int pos; - int i, j; - struct AVAES *a; - struct AVSHA *asha; - stream_t *file; char filename[PATH_MAX]; - uint8_t discid[20]; - char *home; + const char *home; int vukfound = 0; - - snprintf(filename, sizeof(filename), BD_UKF_PATH, bd->device); - file = open_stream(filename, NULL, NULL); - if (!file) { - mp_msg(MSGT_OPEN, MSGL_ERR, - "Cannot open file %s to get UK and DiscID\n", filename); - return 0; - } - file_size = file->end_pos; - if (file_size <= 0 || file_size > 10 * 1024* 1024) { - mp_msg(MSGT_OPEN, MSGL_ERR, "File %s too large\n", filename); - free_stream(file); - return 0; - } - buf = av_malloc(file_size); - stream_read(file, buf, file_size); - free_stream(file); - - // get discid from file - asha = av_malloc(av_sha_size); - av_sha_init(asha, 160); - av_sha_update(asha, buf, file_size); - av_sha_final(asha, discid); - av_free(asha); + stream_t *file; // look up discid in KEYDB.cfg to get VUK home = getenv("HOME"); @@ -176,10 +145,10 @@ static int bd_get_uks(struct bd_priv *bd if (!file) { mp_msg(MSGT_OPEN,MSGL_ERR, "Cannot open VUK database file %s\n", filename); - av_free(buf); return 0; } while (!stream_eof(file)) { + int i; char line[1024]; uint8_t id[20]; char d[200]; @@ -220,7 +189,46 @@ static int bd_get_uks(struct bd_priv *bd vukfound = 1; } free_stream(file); - if (!vukfound) { + return vukfound; +} + +static int bd_get_uks(struct bd_priv *bd) +{ + unsigned char *buf; + size_t file_size; + int pos; + int i, j; + struct AVAES *a; + struct AVSHA *asha; + stream_t *file; + char filename[PATH_MAX]; + uint8_t discid[20]; + + snprintf(filename, sizeof(filename), BD_UKF_PATH, bd->device); + file = open_stream(filename, NULL, NULL); + if (!file) { + mp_msg(MSGT_OPEN, MSGL_ERR, + "Cannot open file %s to get UK and DiscID\n", filename); + return 0; + } + file_size = file->end_pos; + if (file_size <= 0 || file_size > 10 * 1024* 1024) { + mp_msg(MSGT_OPEN, MSGL_ERR, "File %s too large\n", filename); + free_stream(file); + return 0; + } + buf = av_malloc(file_size); + stream_read(file, buf, file_size); + free_stream(file); + + // get discid from file + asha = av_malloc(av_sha_size); + av_sha_init(asha, 160); + av_sha_update(asha, buf, file_size); + av_sha_final(asha, discid); + av_free(asha); + + if (!find_vuk(bd, discid)) { mp_msg(MSGT_OPEN, MSGL_ERR, "No Volume Unique Key (VUK) found for this Disc: "); for (j = 0; j < 20; j++) mp_msg(MSGT_OPEN, MSGL_ERR, "%02x", discid[j]);

1 0