May 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

r23524 - trunk/etc/codecs.conf
by compn 10 Jun '10

10 Jun '10

Author: compn Date: Sat Jun 9 00:59:04 2007 New Revision: 23524 Log: add mmes fourcc for mpeg2 in avi files Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Sat Jun 9 00:59:04 2007 @@ -58,6 +58,7 @@ videocodec mpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -85,6 +86,7 @@ videocodec ffmpeg2 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -104,6 +106,7 @@ videocodec ffmpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -122,6 +125,7 @@ videocodec ffmpeg12mc fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" out IDCT_MPEG2

4 5

r31294 - trunk/libmpdemux/demux_lavf.c
by aurel 10 Jun '10

10 Jun '10

Author: aurel Date: Mon May 31 21:44:02 2010 New Revision: 31294 Log: Switch mkv demuxing to lavf by default. Modified: trunk/libmpdemux/demux_lavf.c Modified: trunk/libmpdemux/demux_lavf.c ============================================================================== --- trunk/libmpdemux/demux_lavf.c Mon May 31 21:10:57 2010 (r31293) +++ trunk/libmpdemux/demux_lavf.c Mon May 31 21:44:02 2010 (r31294) @@ -212,6 +212,7 @@ static const char * const preferred_list "gxf", "nut", "nuv", + "matroska", "mov,mp4,m4a,3gp,3g2,mj2", "mpc", "mpc8",

5 8

r31297 - trunk/libvo/vo_xv.c
by reimar 31 May '10

31 May '10

Author: reimar Date: Mon May 31 23:24:00 2010 New Revision: 31297 Log: Factor out some common code and ensure we will not try to draw OSD elements outside the streams and thus crash. Modified: trunk/libvo/vo_xv.c Modified: trunk/libvo/vo_xv.c ============================================================================== --- trunk/libvo/vo_xv.c Mon May 31 23:16:02 2010 (r31296) +++ trunk/libvo/vo_xv.c Mon May 31 23:24:00 2010 (r31297) @@ -114,11 +114,20 @@ static void (*draw_alpha_fnc) (int x0, i unsigned char *src, unsigned char *srca, int stride); +static void fixup_osd_position(int *x0, int *y0, int *w, int *h) +{ + *x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x); + *w = av_clip(*w, 0, image_width); + *h = av_clip(*h, 0, image_height); + *x0 = FFMIN(*x0, image_width - *w); + *y0 = FFMIN(*y0, image_height - *h); +} + static void draw_alpha_yv12(int x0, int y0, int w, int h, unsigned char *src, unsigned char *srca, int stride) { - x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x); + fixup_osd_position(&x0, &y0, &w, &h); vo_draw_alpha_yv12(w, h, src, srca, stride, xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] + @@ -130,7 +139,7 @@ static void draw_alpha_yuy2(int x0, int unsigned char *src, unsigned char *srca, int stride) { - x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x); + fixup_osd_position(&x0, &y0, &w, &h); vo_draw_alpha_yuy2(w, h, src, srca, stride, xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] + @@ -142,7 +151,7 @@ static void draw_alpha_uyvy(int x0, int unsigned char *src, unsigned char *srca, int stride) { - x0 += image_width * (vo_panscan_x >> 1) / (vo_dwidth + vo_panscan_x); + fixup_osd_position(&x0, &y0, &w, &h); vo_draw_alpha_yuy2(w, h, src, srca, stride, xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] +

1 0

r31296 - trunk/spudec.c
by reimar 31 May '10

31 May '10

Author: reimar Date: Mon May 31 23:16:02 2010 New Revision: 31296 Log: Reindent. Modified: trunk/spudec.c Modified: trunk/spudec.c ============================================================================== --- trunk/spudec.c Mon May 31 23:15:20 2010 (r31295) +++ trunk/spudec.c Mon May 31 23:16:02 2010 (r31296) @@ -1205,11 +1205,11 @@ void *spudec_new_scaled(unsigned int *pa // For HD files in MKV the VobSub resolution can be higher though, // see largeres_vobsub.mkv if (this->orig_frame_width <= 720 && this->orig_frame_height <= 576) { - this->orig_frame_width = 720; - if (this->orig_frame_height == 480 || this->orig_frame_height == 240) - this->orig_frame_height = 480; - else - this->orig_frame_height = 576; + this->orig_frame_width = 720; + if (this->orig_frame_height == 480 || this->orig_frame_height == 240) + this->orig_frame_height = 480; + else + this->orig_frame_height = 576; } } else

1 0

r31295 - trunk/spudec.c
by reimar 31 May '10

31 May '10

Author: reimar Date: Mon May 31 23:15:20 2010 New Revision: 31295 Log: Fix subtitle display for http://samples.mplayerhq.hu/sub/largeres_vobsub.mkv Modified: trunk/spudec.c Modified: trunk/spudec.c ============================================================================== --- trunk/spudec.c Mon May 31 21:44:02 2010 (r31294) +++ trunk/spudec.c Mon May 31 23:15:20 2010 (r31295) @@ -1202,11 +1202,15 @@ void *spudec_new_scaled(unsigned int *pa spudec_parse_extradata(this, extradata, extradata_len); /* XXX Although the video frame is some size, the SPU frame is always maximum size i.e. 720 wide and 576 or 480 high */ + // For HD files in MKV the VobSub resolution can be higher though, + // see largeres_vobsub.mkv + if (this->orig_frame_width <= 720 && this->orig_frame_height <= 576) { this->orig_frame_width = 720; if (this->orig_frame_height == 480 || this->orig_frame_height == 240) this->orig_frame_height = 480; else this->orig_frame_height = 576; + } } else mp_msg(MSGT_SPUDEC,MSGL_FATAL, "FATAL: spudec_init: calloc");

1 0

r31293 - in trunk: libass/ass.c libass/ass.h mplayer.c
by aurel 31 May '10

31 May '10

Author: aurel Date: Mon May 31 21:10:57 2010 New Revision: 31293 Log: backport ass_flush_events() from upstream libass and make use of it This fixes subtitles duplication when seeking back in ass stream formated with the "standard" format FFmpeg uses. Modified: trunk/libass/ass.c trunk/libass/ass.h trunk/mplayer.c Modified: trunk/libass/ass.c ============================================================================== --- trunk/libass/ass.c Mon May 31 19:12:27 2010 (r31292) +++ trunk/libass/ass.c Mon May 31 21:10:57 2010 (r31293) @@ -909,6 +909,20 @@ void ass_process_chunk(ASS_Track *track, free(str); } +/** + * \brief Flush buffered events. + * \param track track +*/ +void ass_flush_events(ASS_Track *track) +{ + if (track->events) { + int eid; + for (eid = 0; eid < track->n_events; eid++) + ass_free_event(track, eid); + track->n_events = 0; + } +} + #ifdef CONFIG_ICONV /** \brief recode buffer to utf-8 * constraint: codepage != 0 Modified: trunk/libass/ass.h ============================================================================== --- trunk/libass/ass.h Mon May 31 19:12:27 2010 (r31292) +++ trunk/libass/ass.h Mon May 31 21:10:57 2010 (r31293) @@ -317,6 +317,12 @@ void ass_process_chunk(ASS_Track *track, long long timecode, long long duration); /** + * \brief Flush buffered events. + * \param track track +*/ +void ass_flush_events(ASS_Track *track); + +/** * \brief Read subtitles from file. * \param library library handle * \param fname file name Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Mon May 31 19:12:27 2010 (r31292) +++ trunk/mplayer.c Mon May 31 21:10:57 2010 (r31293) @@ -2581,6 +2581,11 @@ static int seek(MPContext *mpctx, double vobsub_seek(vo_vobsub, mpctx->sh_video->pts); } +#ifdef CONFIG_ASS + if (ass_enabled && mpctx->d_sub->sh && ((sh_sub_t *)mpctx->d_sub->sh)->ass_track) + ass_flush_events(((sh_sub_t *)mpctx->d_sub->sh)->ass_track); +#endif + edl_seek_reset(mpctx); c_total = 0;

1 0

r31292 - in trunk: DOCS/man/en/mplayer.1 cfg-common-opts.h
by reimar 31 May '10

31 May '10

Author: reimar Date: Mon May 31 19:12:27 2010 New Revision: 31292 Log: Extend the range of the -a52drc range up to two, as a experimental feature in case someone finds it useful. Modified: trunk/cfg-common-opts.h Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/cfg-common-opts.h ============================================================================== --- trunk/cfg-common-opts.h Mon May 31 00:14:13 2010 (r31291) +++ trunk/cfg-common-opts.h Mon May 31 19:12:27 2010 (r31292) @@ -218,7 +218,7 @@ {"ignore-start", &ignore_start, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noignore-start", &ignore_start, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - {"a52drc", &drc_level, CONF_TYPE_FLOAT, CONF_RANGE, 0, 1, NULL}, + {"a52drc", &drc_level, CONF_TYPE_FLOAT, CONF_RANGE, 0, 2, NULL}, // ------------------------- codec/vfilter options --------------------

1 0

r31286 - in trunk: cfg-common-opts.h cfg-common.h libmpcodecs/ad.c libmpcodecs/ad_ffmpeg.c libmpcodecs/ad_liba52.c
by reimar 30 May '10

30 May '10

Author: reimar Date: Sun May 30 18:46:31 2010 New Revision: 31286 Log: Use the -a52drc option also for the libavcodec decoder. Modified: trunk/cfg-common-opts.h trunk/cfg-common.h trunk/libmpcodecs/ad.c trunk/libmpcodecs/ad_ffmpeg.c trunk/libmpcodecs/ad_liba52.c Modified: trunk/cfg-common-opts.h ============================================================================== --- trunk/cfg-common-opts.h Sun May 30 16:29:18 2010 (r31285) +++ trunk/cfg-common-opts.h Sun May 30 18:46:31 2010 (r31286) @@ -19,9 +19,8 @@ #ifndef MPLAYER_CFG_COMMON_OPTS_H #define MPLAYER_CFG_COMMON_OPTS_H -#include "config.h" -#include "libmpcodecs/vd.h" -#include "osdep/priority.h" +// you may _not_ include any files here since this is included +// in the middle of an array declaration // ------------------------- common options -------------------- {"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, @@ -218,9 +217,7 @@ {"ignore-start", &ignore_start, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noignore-start", &ignore_start, CONF_TYPE_FLAG, 0, 1, 0, NULL}, -#ifdef CONFIG_LIBA52 - {"a52drc", &a52_drc_level, CONF_TYPE_FLOAT, CONF_RANGE, 0, 1, NULL}, -#endif + {"a52drc", &drc_level, CONF_TYPE_FLOAT, CONF_RANGE, 0, 1, NULL}, // ------------------------- codec/vfilter options -------------------- Modified: trunk/cfg-common.h ============================================================================== --- trunk/cfg-common.h Sun May 30 16:29:18 2010 (r31285) +++ trunk/cfg-common.h Sun May 30 18:46:31 2010 (r31286) @@ -24,6 +24,10 @@ #include "m_config.h" #include "m_option.h" +#include "libmpcodecs/ad.h" +#include "libmpcodecs/vd.h" +#include "osdep/priority.h" + extern char *mp_msg_charset; extern int mp_msg_color; extern int mp_msg_module; @@ -52,8 +56,6 @@ extern int reuse_socket; extern int dvd_speed; /* stream/stream_dvd.c */ -extern float a52_drc_level; - /* defined in libmpdemux: */ extern int hr_mp3_seek; extern const m_option_t demux_rawaudio_opts[]; Modified: trunk/libmpcodecs/ad.c ============================================================================== --- trunk/libmpcodecs/ad.c Sun May 30 16:29:18 2010 (r31285) +++ trunk/libmpcodecs/ad.c Sun May 30 18:46:31 2010 (r31286) @@ -29,6 +29,8 @@ #include "libmpdemux/stheader.h" #include "ad.h" +float drc_level = 1.0; + /* Missed vorbis, mad, dshow */ //extern ad_functions_t mpcodecs_ad_null; Modified: trunk/libmpcodecs/ad_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/ad_ffmpeg.c Sun May 30 16:29:18 2010 (r31285) +++ trunk/libmpcodecs/ad_ffmpeg.c Sun May 30 18:46:31 2010 (r31286) @@ -75,6 +75,7 @@ static int init(sh_audio_t *sh_audio) lavc_context = avcodec_alloc_context(); sh_audio->context=lavc_context; + lavc_context->drc_scale = drc_level; lavc_context->sample_rate = sh_audio->samplerate; lavc_context->bit_rate = sh_audio->i_bps * 8; if(sh_audio->wf){ Modified: trunk/libmpcodecs/ad_liba52.c ============================================================================== --- trunk/libmpcodecs/ad_liba52.c Sun May 30 16:29:18 2010 (r31285) +++ trunk/libmpcodecs/ad_liba52.c Sun May 30 18:46:31 2010 (r31286) @@ -54,8 +54,6 @@ static uint32_t channel_map; /** The output is multiplied by this var. Used for volume control */ static sample_t a52_level = 1; -/** The value of the -a52drc switch. */ -float a52_drc_level = 1.0; static int a52_drc_action = DRC_NO_ACTION; static const ad_info_t info = @@ -136,8 +134,8 @@ int channels=0; static sample_t dynrng_call (sample_t c, void *data) { -// fprintf(stderr, "(%lf, %lf): %lf\n", (double)c, (double)a52_drc_level, (double)pow((double)c, a52_drc_level)); - return pow((double)c, a52_drc_level); +// fprintf(stderr, "(%lf, %lf): %lf\n", (double)c, (double)drc_level, (double)pow((double)c, drc_level)); + return pow((double)c, drc_level); } @@ -207,10 +205,10 @@ static int init(sh_audio_t *sh_audio) /* Init a52 dynrng */ - if (a52_drc_level < 0.001) { + if (drc_level < 0.001) { /* level == 0 --> no compression, init library without callback */ a52_drc_action = DRC_NO_COMPRESSION; - } else if (a52_drc_level > 0.999) { + } else if (drc_level > 0.999) { /* level == 1 --> full compression, do nothing at all (library default = full compression) */ a52_drc_action = DRC_NO_ACTION; } else {

3 3

r31291 - in trunk: cfg-common-opts.h cfg-mencoder.h cfg-mplayer.h libmpdemux/demux_ts.c libmpdemux/demux_ts.h
by diego 30 May '10

30 May '10

Author: diego Date: Mon May 31 00:14:13 2010 New Revision: 31291 Log: Move TS_MAX_PROBE_SIZE #define to demux_ts.h instead of duplicating it. Modified: trunk/cfg-common-opts.h trunk/cfg-mencoder.h trunk/cfg-mplayer.h trunk/libmpdemux/demux_ts.c trunk/libmpdemux/demux_ts.h Modified: trunk/cfg-common-opts.h ============================================================================== --- trunk/cfg-common-opts.h Mon May 31 00:11:32 2010 (r31290) +++ trunk/cfg-common-opts.h Mon May 31 00:14:13 2010 (r31291) @@ -264,7 +264,6 @@ {"tsfastparse", "-tsfastparse is no longer a valid option.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL }, {"tsprog", &ts_prog, CONF_TYPE_INT, CONF_RANGE, 0, 65534, NULL}, -#define TS_MAX_PROBE_SIZE 2000000 /* don't forget to change this in libmpdemux/demux_ts.c too */ {"tsprobe", &ts_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL}, {"psprobe", &ps_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL}, {"tskeepbroken", &ts_keep_broken, CONF_TYPE_FLAG, 0, 0, 1, NULL}, Modified: trunk/cfg-mencoder.h ============================================================================== --- trunk/cfg-mencoder.h Mon May 31 00:11:32 2010 (r31290) +++ trunk/cfg-mencoder.h Mon May 31 00:14:13 2010 (r31291) @@ -24,6 +24,7 @@ */ #include "libmpcodecs/ve_x264.h" +#include "libmpdemux/demux_ts.h" #include "cfg-common.h" extern int sws_flags; Modified: trunk/cfg-mplayer.h ============================================================================== --- trunk/cfg-mplayer.h Mon May 31 00:11:32 2010 (r31290) +++ trunk/cfg-mplayer.h Mon May 31 00:14:13 2010 (r31291) @@ -25,6 +25,7 @@ #include "cfg-common.h" #include "libmpcodecs/vd.h" +#include "libmpdemux/demux_ts.h" #include "libvo/vo_zr.h" extern int key_fifo_size; Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c Mon May 31 00:11:32 2010 (r31290) +++ trunk/libmpdemux/demux_ts.c Mon May 31 00:14:13 2010 (r31291) @@ -45,7 +45,6 @@ #define MAX_HEADER_SIZE 6 /* enough for PES header + length */ #define MAX_CHECK_SIZE 65535 -#define TS_MAX_PROBE_SIZE 2000000 /* do not forget to change this in cfg-common-opts.h, too */ #define NUM_CONSECUTIVE_TS_PACKETS 32 #define NUM_CONSECUTIVE_AUDIO_PACKETS 348 #define MAX_A52_FRAME_SIZE 3840 Modified: trunk/libmpdemux/demux_ts.h ============================================================================== --- trunk/libmpdemux/demux_ts.h Mon May 31 00:11:32 2010 (r31290) +++ trunk/libmpdemux/demux_ts.h Mon May 31 00:14:13 2010 (r31291) @@ -21,6 +21,8 @@ #include <stdint.h> +#define TS_MAX_PROBE_SIZE 2000000 + int mp_a52_framesize(uint8_t *buf, int *srate); #endif /* MPLAYER_DEMUX_TS_H */

1 0