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