July 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

r31858 - in branches/1.0rc4/libmpcodecs: vf_geq.c vf_qp.c
by siretart 19 Aug '10

19 Aug '10

Author: siretart Date: Thu Jul 29 13:36:59 2010 New Revision: 31858 Log: Revert commit r31322 by cehoyos Modified: branches/1.0rc4/libmpcodecs/vf_geq.c branches/1.0rc4/libmpcodecs/vf_qp.c Modified: branches/1.0rc4/libmpcodecs/vf_geq.c ============================================================================== --- branches/1.0rc4/libmpcodecs/vf_geq.c Thu Jul 29 11:15:32 2010 (r31857) +++ branches/1.0rc4/libmpcodecs/vf_geq.c Thu Jul 29 13:36:59 2010 (r31858) @@ -34,7 +34,7 @@ #include "vf.h" #include "libavcodec/avcodec.h" -#include "libavutil/eval.h" +#include "libavcodec/eval.h" struct vf_priv_s { AVExpr * e[3]; @@ -116,7 +116,7 @@ static int put_image(struct vf_instance const_values[3]=y; for(x=0; x<w; x++){ const_values[2]=x; - dst[x + y * dst_stride] = av_eval_expr(vf->priv->e[plane], + dst[x + y * dst_stride] = ff_eval_expr(vf->priv->e[plane], const_values, vf); } } @@ -178,7 +178,7 @@ static int vf_open(vf_instance_t *vf, ch plane==0 ? lum : (plane==1 ? cb : cr), NULL }; - res = av_parse_expr(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL); + res = ff_parse_expr(&vf->priv->e[plane], eq[plane], const_names, NULL, NULL, func2_names, func2, 0, NULL); if (res < 0) { mp_msg(MSGT_VFILTER, MSGL_ERR, "geq: error loading equation `%s'\n", eq[plane]); Modified: branches/1.0rc4/libmpcodecs/vf_qp.c ============================================================================== --- branches/1.0rc4/libmpcodecs/vf_qp.c Thu Jul 29 11:15:32 2010 (r31857) +++ branches/1.0rc4/libmpcodecs/vf_qp.c Thu Jul 29 13:36:59 2010 (r31858) @@ -32,7 +32,7 @@ #include "libvo/fastmemcpy.h" #include "libavcodec/avcodec.h" -#include "libavutil/eval.h" +#include "libavcodec/eval.h" struct vf_priv_s { @@ -69,7 +69,7 @@ static int config(struct vf_instance *vf double temp_val; int res; - res= av_parse_and_eval_expr(&temp_val, vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL); + res= ff_parse_and_eval_expr(&temp_val, vf->priv->eq, const_names, const_values, NULL, NULL, NULL, NULL, NULL, 0, NULL); if (res < 0){ mp_msg(MSGT_VFILTER, MSGL_ERR, "qp: Error evaluating \"%s\" \n", vf->priv->eq);

3 2

r31872 - trunk/etc/codecs.conf
by compn 02 Aug '10

02 Aug '10

Author: compn Date: Sat Jul 31 15:47:47 2010 New Revision: 31872 Log: add binary expression codec for fourcc MTS2 Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Fri Jul 30 20:28:02 2010 (r31871) +++ trunk/etc/codecs.conf Sat Jul 31 15:47:47 2010 (r31872) @@ -1265,6 +1265,16 @@ videocodec wms10dmod guid 0x7bafb3b1, 0xd8f4, 0x4279, 0x92, 0x53, 0x27, 0xda, 0x42, 0x31, 0x08, 0xde out BGR32,BGR24,BGR16 +videocodec eescreen + info "expression encoder" + comment "requires xp or newer and msvcr100.dll" + status working + fourcc MTS2 + driver dmo + dll "Microsoft.Expression.Encoder.EEScreen.Codec.dll" + guid 0x9a6e798c, 0x00ba, 0x478c, 0x8d, 0x64, 0x88, 0xf2, 0xe5, 0xb2, 0x5c, 0x1a + out BGR32,BGR24,BGR16 ;,BGR15 + videocodec gotomeeting info "GoToMeeting codec" status working

2 1

r31880 - trunk/configure
by diego 31 Jul '10

31 Jul '10

Author: diego Date: Sun Aug 1 00:15:49 2010 New Revision: 31880 Log: Default to -O2 optimization level for the clang compiler. patch by Rowan James, rowanj phere net Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Aug 1 00:02:55 2010 (r31879) +++ trunk/configure Sun Aug 1 00:15:49 2010 (r31880) @@ -2553,6 +2553,8 @@ elif test -z "$CFLAGS" ; then CFLAGS="-O2 $_march $_mcpu $_pipe -fomit-frame-pointer -wd167 -wd556 -wd144" elif test "$cc_vendor" = "sun" ; then CFLAGS="-O2 $_march $_mcpu $_pipe -xc99 -xregs=frameptr" + elif test "$cc_vendor" = "clang"; then + CFLAGS="-O2 $_march $_pipe" elif test "$cc_vendor" != "gnu" ; then CFLAGS="-O2 $_march $_mcpu $_pipe" else

1 0

r31874 - trunk/libmpdemux/demux_ts.c
by diego 31 Jul '10

31 Jul '10

Author: diego Date: Sat Jul 31 17:22:11 2010 New Revision: 31874 Log: Initialize frame_length variable to zero to avoid the warning: libmpdemux/demux_ts.c:669: warning: 'frame_length' may be used uninitialized in this function Modified: trunk/libmpdemux/demux_ts.c Modified: trunk/libmpdemux/demux_ts.c ============================================================================== --- trunk/libmpdemux/demux_ts.c Sat Jul 31 17:17:17 2010 (r31873) +++ trunk/libmpdemux/demux_ts.c Sat Jul 31 17:22:11 2010 (r31874) @@ -666,7 +666,7 @@ int mp_a52_framesize(uint8_t * buf, int //second stage: returns the count of A52 syncwords found static int a52_check(char *buf, int len) { - int cnt, frame_length, ok, srate; + int cnt, frame_length = 0, ok, srate; cnt = ok = 0; if(len < 8)

3 2

r31878 - trunk/mplayer.c
by reimar 31 Jul '10

31 Jul '10

Author: reimar Date: Sat Jul 31 18:55:57 2010 New Revision: 31878 Log: Fix compilation with --enable-crash-debug Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Jul 31 18:43:20 2010 (r31877) +++ trunk/mplayer.c Sat Jul 31 18:55:57 2010 (r31878) @@ -345,6 +345,11 @@ static unsigned int initialized_flags=0; /// step size of mixer changes int volstep = 3; +#ifdef CONFIG_CRASH_DEBUG +static char *prog_path; +static int crash_debug = 0; +#endif + /* This header requires all the global variable declarations. */ #include "cfg-mplayer.h" @@ -792,11 +797,6 @@ static void child_sighandler(int x){ } #endif -#ifdef CONFIG_CRASH_DEBUG -static char *prog_path; -static int crash_debug = 0; -#endif - static void exit_sighandler(int x){ static int sig_count=0; #ifdef CONFIG_CRASH_DEBUG

1 0

r31877 - trunk/stream/stream_dvb.c
by diego 31 Jul '10

31 Jul '10

Author: diego Date: Sat Jul 31 18:43:20 2010 New Revision: 31877 Log: Initialize conf_file variable to kill the warning: stream/stream_dvb.c:755: warning: 'conf_file' may be used uninitialized in this function Blessed and suggested by Nico Sabbi. Modified: trunk/stream/stream_dvb.c Modified: trunk/stream/stream_dvb.c ============================================================================== --- trunk/stream/stream_dvb.c Sat Jul 31 18:15:36 2010 (r31876) +++ trunk/stream/stream_dvb.c Sat Jul 31 18:43:20 2010 (r31877) @@ -783,6 +783,7 @@ dvb_config_t *dvb_get_config(void) continue; } + conf_file = get_path("channels.conf"); switch(type) { case TUNER_TER:

1 0

r31876 - trunk/libmpdemux/muxer_mpeg.c
by diego 31 Jul '10

31 Jul '10

Author: diego Date: Sat Jul 31 18:15:36 2010 New Revision: 31876 Log: Use mp_a52_framesize() in all cases; gets rid of liba52 dependency. Blessed by Nico Sabbi. Modified: trunk/libmpdemux/muxer_mpeg.c Modified: trunk/libmpdemux/muxer_mpeg.c ============================================================================== --- trunk/libmpdemux/muxer_mpeg.c Sat Jul 31 18:05:19 2010 (r31875) +++ trunk/libmpdemux/muxer_mpeg.c Sat Jul 31 18:15:36 2010 (r31876) @@ -40,9 +40,6 @@ #include "mpeg_hdr.h" #include "mp3_hdr.h" -#ifdef CONFIG_LIBA52 -#include <a52dec/a52.h> -#endif #define PACK_HEADER_START_CODE 0x01ba #define SYSTEM_HEADER_START_CODE 0x01bb @@ -2075,7 +2072,7 @@ static int analyze_mpa(muxer_stream_t *s static int parse_audio(muxer_stream_t *s, int finalize, unsigned int *nf, double *timer, double delay, int drop) { - int i, j, len, chans, srate, spf, layer, dummy, tot, num, frm_idx; + int i, j, len, chans, srate, spf, layer, tot, num, frm_idx; int finished; unsigned int frames; uint64_t idur; @@ -2124,11 +2121,7 @@ static int parse_audio(muxer_stream_t *s if(s->b_buffer[i] == 0x0B && s->b_buffer[i+1] == 0x77) { srate = 0; - #ifdef CONFIG_LIBA52 - len = a52_syncinfo(&(s->b_buffer[i]), &dummy, &srate, &dummy); - #else len = mp_a52_framesize(&(s->b_buffer[i]), &srate); - #endif if((len > 0) && (srate == s->wf->nSamplesPerSec) && (i + len <= s->b_buffer_len)) { dur = (double) 1536 / (double) srate;

1 0

r31875 - trunk/libmpdemux/muxer_mpeg.c
by diego 31 Jul '10

31 Jul '10

Author: diego Date: Sat Jul 31 18:05:19 2010 New Revision: 31875 Log: Add 'z' length modifier to %d printf format specifiers for size_t arguments. This silences the following warnings on OS X with gcc 4.2.1: libmpdemux/muxer_mpeg.c:1660: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' libmpdemux/muxer_mpeg.c:1784: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' libmpdemux/muxer_mpeg.c:1873: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' libmpdemux/muxer_mpeg.c:1930: warning: format '%d' expects type 'int', but argument 4 has type 'size_t' libmpdemux/muxer_mpeg.c:2362: warning: format '%d' expects type 'int', but argument 4 has type 'long unsigned int' Modified: trunk/libmpdemux/muxer_mpeg.c Modified: trunk/libmpdemux/muxer_mpeg.c ============================================================================== --- trunk/libmpdemux/muxer_mpeg.c Sat Jul 31 17:22:11 2010 (r31874) +++ trunk/libmpdemux/muxer_mpeg.c Sat Jul 31 18:05:19 2010 (r31875) @@ -1657,7 +1657,7 @@ static size_t parse_mpeg12_video(muxer_s mp_msg(MSGT_MUXER, MSGL_DBG2,"parse_mpeg12_video, len=%u\n", (uint32_t) len); if(s->buffer[0] != 0 || s->buffer[1] != 0 || s->buffer[2] != 1 || len<6) { - mp_msg(MSGT_MUXER, MSGL_ERR,"Unknown video format, possibly non-MPEG1/2 stream, len=%d!\n", len); + mp_msg(MSGT_MUXER, MSGL_ERR,"Unknown video format, possibly non-MPEG1/2 stream, len=%zd!\n", len); return 0; } @@ -1781,7 +1781,7 @@ static size_t parse_mpeg12_video(muxer_s ret = add_frame(spriv, spriv->delta_pts, s->buffer, len, pt, spriv->last_dts, spriv->last_pts); if(ret < 0) { - mp_msg(MSGT_MUXER, MSGL_FATAL, "\r\nPARSE_MPEG12: add_frames(%d) failed, exit\r\n", len); + mp_msg(MSGT_MUXER, MSGL_FATAL, "\r\nPARSE_MPEG12: add_frames(%zd) failed, exit\r\n", len); return 0; } mp_msg(MSGT_MUXER, MSGL_DBG2, "\r\nVIDEO FRAME, PT: %C, tr: %d, diff: %d, dts: %.3lf, pts: %.3lf, pdt: %u, gop_reset: %d\r\n", @@ -1870,7 +1870,7 @@ static size_t parse_mpeg4_video(muxer_st mp_msg(MSGT_MUXER, MSGL_DBG2,"parse_mpeg4_video, len=%u\n", (uint32_t) len); if(len<6) { - mp_msg(MSGT_MUXER, MSGL_ERR,"Frame too short: %d, exit!\n", len); + mp_msg(MSGT_MUXER, MSGL_ERR,"Frame too short: %zd, exit!\n", len); return 0; } @@ -1927,7 +1927,7 @@ static size_t parse_mpeg4_video(muxer_st ret = add_frame(vpriv, delta_pts, s->buffer, len, pt, vpriv->last_dts, vpriv->last_pts); if(ret < 0) { - mp_msg(MSGT_MUXER, MSGL_FATAL, "\r\nPARSE_MPEG4: add_frames(%d) failed, exit\r\n", len); + mp_msg(MSGT_MUXER, MSGL_FATAL, "\r\nPARSE_MPEG4: add_frames(%zd) failed, exit\r\n", len); return 0; } @@ -2359,7 +2359,7 @@ static void mpegfile_write_chunk(muxer_s tmp = realloc(s->b_buffer, len + s->b_buffer_len); if(!tmp) { - mp_msg(MSGT_MUXER, MSGL_FATAL, "\nFATAL! couldn't realloc %d bytes\n", len + s->b_buffer_len); + mp_msg(MSGT_MUXER, MSGL_FATAL, "\nFATAL! couldn't realloc %zd bytes\n", len + s->b_buffer_len); return; } s->b_buffer = tmp;

1 0