May 2012 - MPlayer-cvslog - lists.mplayerhq.hu

r34899 - in trunk: Changelog DOCS/man/en/mplayer.1
by reimar 14 May '12

14 May '12

Author: reimar Date: Mon May 14 21:52:52 2012 New Revision: 34899 Log: Document -dr influence on video display speed. Modified: trunk/Changelog Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Mon May 14 21:31:59 2012 (r34898) +++ trunk/Changelog Mon May 14 21:52:52 2012 (r34899) @@ -15,6 +15,8 @@ MPlayer * lavfi: libavfilter filter graphs (experimental). Other: + * -dr support for H.264 B-frames. + 40% faster frame blitting on e.g. PPC G4 Macs with -vo gl * support adding noise at output resolution with -vo gl:noise-strength=8 * experimental support for OpenGL ES 1.0 in -vo gl * support for PGS (BluRay-compatible), DVB and XSUB subtitles.

1 0

r34898 - trunk/libvo/vo_gl.c
by reimar 14 May '12

14 May '12

Author: reimar Date: Mon May 14 21:31:59 2012 New Revision: 34898 Log: Align glMapBuffer result. Mesa for some silly reason returns a pointer that is only 8 byte aligned. Fixes -dr and force-pbo crashes (on e.g. x86) and bad output (on e.g. PPC). Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Mon May 14 20:11:24 2012 (r34897) +++ trunk/libvo/vo_gl.c Mon May 14 21:31:59 2012 (r34898) @@ -929,7 +929,7 @@ static uint32_t get_image(mp_image_t *mp mpi->height = texture_height; } mpi->stride[0] = mpi->width * mpi->bpp / 8; - needed_size = mpi->stride[0] * mpi->height; + needed_size = mpi->stride[0] * mpi->height + 31; if (mesa_buffer) { #ifdef CONFIG_GL_X11 if (mesa_bufferptr && needed_size > mesa_buffersize) { @@ -952,7 +952,8 @@ static uint32_t get_image(mp_image_t *mp } if (!gl_bufferptr) gl_bufferptr = mpglMapBuffer(GL_PIXEL_UNPACK_BUFFER, GL_WRITE_ONLY); - mpi->planes[0] = gl_bufferptr; + mpi->priv = gl_bufferptr; + mpi->planes[0] = (uint8_t *)gl_bufferptr + (-(intptr_t)gl_bufferptr & 31); mpglBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0); } if (!mpi->planes[0]) { @@ -1052,7 +1053,7 @@ static uint32_t draw_image(mp_image_t *m mpglPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, 1); w = texture_width; } else { - intptr_t base = (intptr_t)planes[0]; + intptr_t base = (intptr_t)mpi->priv; if (ati_hack) { w = texture_width; h = texture_height; } if (mpi_flipped) base += (mpi->h - 1) * stride[0];

1 0

r34896 - trunk/configure
by al 13 May '12

13 May '12

Author: al Date: Sun May 13 21:55:27 2012 New Revision: 34896 Log: build: Check if SCTP is available Test for SCTP and remove it from the list of libavformat protocols in case the test did not succeed or the feature was explicitly disabled. Unconditionally trying to build it, as it was done before if you had a new enough libavformat version that contains that feature, is obviously not a good idea. This patch is closely based on a patch from Johan Andersson. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun May 13 20:58:32 2012 (r34895) +++ trunk/configure Sun May 13 21:55:27 2012 (r34896) @@ -384,6 +384,7 @@ Optional features: parsing [disabled] --enable-macosx-bundle enable Mac OS X bundle file locations [autodetect] --disable-inet6 disable IPv6 support [autodetect] + --disable-sctp disable SCTP support [autodetect] --disable-gethostbyname2 gethostbyname2 part of the C library [autodetect] --disable-ftp disable FTP support [enabled] --disable-vstream disable TiVo vstream client support [autodetect] @@ -855,6 +856,7 @@ _freetypeconfig='freetype-config' _fribidi=auto _enca=auto _inet6=auto +_sctp=auto _gethostbyname2=auto _ftp=auto _musepack=no @@ -1375,6 +1377,9 @@ for ac_option do --enable-inet6) _inet6=yes ;; --disable-inet6) _inet6=no ;; + --enable-sctp) _sctp=yes ;; + --disable-sctp) _sctp=no ;; + --enable-gethostbyname2) _gethostbyname2=yes ;; --disable-gethostbyname2) _gethostbyname2=no ;; @@ -3364,7 +3369,7 @@ else def_network='#define CONFIG_NETWORK 0' def_networking='#undef CONFIG_NETWORKING' def_rtpdec='#define CONFIG_RTPDEC 0' - 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//) + 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// -e s/SCTP_PROTOCOL//) libavdemuxers=$(echo $libavdemuxers | sed -e s/RTSP_DEMUXER// -e s/SDP_DEMUXER// -e s/SAP_DEMUXER// -e s/RTP_DEMUXER//) fi echores "$networking" @@ -3415,6 +3420,17 @@ else fi echores "$_gethostbyname2" +echocheck "SCTP" +if test "$_sctp" = auto ; then + _sctp=no + if header_check netinet/sctp.h; then + _sctp=yes + fi +fi +if test "$_sctp" = no ; then + libavprotocols=$(echo $libavprotocols | sed -e s/SCTP_PROTOCOL//) +fi +echores "$_sctp" echocheck "sys/poll.h" poll_h=no

1 0

r34895 - trunk/stream/stream_pvr.c
by reimar 13 May '12

13 May '12

Author: reimar Date: Sun May 13 20:58:32 2012 New Revision: 34895 Log: stream_pvr: Use sizeof() to get destination buffer size. The code in lines 382/384 used the wrong constant. Fixes bug #2066. Modified: trunk/stream/stream_pvr.c Modified: trunk/stream/stream_pvr.c ============================================================================== --- trunk/stream/stream_pvr.c Tue May 8 15:56:23 2012 (r34894) +++ trunk/stream/stream_pvr.c Sun May 13 20:58:32 2012 (r34895) @@ -89,6 +89,9 @@ char *pvr_param_bitrate_mode = NULL; int pvr_param_bitrate_peak = 0; char *pvr_param_stream_type = NULL; +#define BUFSTRCPY(d, s) av_strlcpy(d, s, sizeof(d)) +#define BUFPRINTF(d, ...) snprintf(d, sizeof(d), __VA_ARGS__) + typedef struct station_elem_s { char name[8]; int freq; @@ -227,13 +230,12 @@ copycreate_stationlist (stationlist_t *s /* transport the channel list data to our extented struct */ stationlist->total = num; - av_strlcpy (stationlist->name, chanlists[chantab].name, PVR_STATION_NAME_SIZE); + BUFSTRCPY(stationlist->name, chanlists[chantab].name); for (i = 0; i < chanlists[chantab].count; i++) { stationlist->list[i].station[0]= '\0'; /* no station name yet */ - av_strlcpy (stationlist->list[i].name, - chanlists[chantab].list[i].name, PVR_STATION_NAME_SIZE); + BUFSTRCPY(stationlist->list[i].name, chanlists[chantab].list[i].name); stationlist->list[i].freq = chanlists[chantab].list[i].freq; stationlist->list[i].enabled = 1; /* default enabled */ stationlist->enabled++; @@ -319,14 +321,11 @@ set_station (struct pvr_t *pvr, const ch } if (station) - av_strlcpy (pvr->stationlist.list[i].station, - station, PVR_STATION_NAME_SIZE); + BUFSTRCPY(pvr->stationlist.list[i].station, station); else if (channel) - av_strlcpy (pvr->stationlist.list[i].station, - channel, PVR_STATION_NAME_SIZE); + BUFSTRCPY(pvr->stationlist.list[i].station, channel); else - snprintf (pvr->stationlist.list[i].station, - PVR_STATION_NAME_SIZE, "F %d", freq); + BUFPRINTF(pvr->stationlist.list[i].station, "F %d", freq); mp_msg (MSGT_OPEN, MSGL_DBG2, "%s Set user station channel: %8s - freq: %8d - station: %s\n", @@ -376,13 +375,11 @@ set_station (struct pvr_t *pvr, const ch pvr->stationlist.enabled++; if (station) - av_strlcpy (pvr->stationlist.list[i].station, - station, PVR_STATION_NAME_SIZE); + BUFSTRCPY(pvr->stationlist.list[i].station, station); if (channel) - av_strlcpy (pvr->stationlist.list[i].name, channel, PVR_STATION_NAME_SIZE); + BUFSTRCPY(pvr->stationlist.list[i].name, channel); else - snprintf (pvr->stationlist.list[i].name, - PVR_STATION_NAME_SIZE, "F %d", freq); + BUFPRINTF(pvr->stationlist.list[i].name, "F %d", freq); pvr->stationlist.list[i].freq = freq; @@ -471,10 +468,10 @@ parse_setup_stationlist (struct pvr_t *p if (!sep) continue; /* Wrong syntax, but mplayer should not crash */ - av_strlcpy (station, sep + 1, PVR_STATION_NAME_SIZE); + BUFSTRCPY(station, sep + 1); sep[0] = '\0'; - av_strlcpy (channel, tmp, PVR_STATION_NAME_SIZE); + BUFSTRCPY(channel, tmp); while ((sep = strchr (station, '_'))) sep[0] = ' ';

1 0

r34894 - trunk/etc/codecs.conf
by cehoyos 08 May '12

08 May '12

Author: cehoyos Date: Tue May 8 15:56:23 2012 New Revision: 34894 Log: 100l: ffcamstudio is not flipped and does not know BGR8. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue May 8 12:56:22 2012 (r34893) +++ trunk/etc/codecs.conf Tue May 8 15:56:23 2012 (r34894) @@ -3485,7 +3485,7 @@ videocodec ffcamstudio fourcc CSCD,cscd driver ffmpeg dll "camstudio" - out BGRA,BGR32,BGR24,BGR15LE,BGR15,BGR8 query,flip + out BGRA,BGR32,BGR24,BGR15LE,BGR15 ; Fraps - Realtime Video Capture - http://www.fraps.com/ videocodec fraps

1 0

r34893 - in trunk: codec-cfg.c etc/codecs.conf fmt-conversion.c libmpcodecs/img_format.c libmpcodecs/img_format.h libmpcodecs/mp_image.c libmpcodecs/vf_scale.c m_option.c
by cehoyos 08 May '12

08 May '12

Author: cehoyos Date: Tue May 8 12:56:22 2012 New Revision: 34893 Log: Improve Avid Meridien (AVUI) decoding with FFmpeg. Modified: trunk/codec-cfg.c trunk/etc/codecs.conf trunk/fmt-conversion.c trunk/libmpcodecs/img_format.c trunk/libmpcodecs/img_format.h trunk/libmpcodecs/mp_image.c trunk/libmpcodecs/vf_scale.c trunk/m_option.c Modified: trunk/codec-cfg.c ============================================================================== --- trunk/codec-cfg.c Tue May 8 12:53:40 2012 (r34892) +++ trunk/codec-cfg.c Tue May 8 12:56:22 2012 (r34893) @@ -190,6 +190,7 @@ static const struct { {"444P", IMGFMT_444P}, {"444A", IMGFMT_444A}, {"422P", IMGFMT_422P}, + {"422A", IMGFMT_422A}, {"411P", IMGFMT_411P}, {"440P", IMGFMT_440P}, {"Y800", IMGFMT_Y800}, Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Tue May 8 12:53:40 2012 (r34892) +++ trunk/etc/codecs.conf Tue May 8 12:56:22 2012 (r34893) @@ -3144,6 +3144,14 @@ videocodec ffdnxhd dll "dnxhd" out 422P +videocodec ffavui + info "FFmpeg Avid Meridien" + status working + fourcc AVUI + driver ffmpeg + dll avui + out 422A + ; quicktime codecs: videocodec qtm100 Modified: trunk/fmt-conversion.c ============================================================================== --- trunk/fmt-conversion.c Tue May 8 12:53:40 2012 (r34892) +++ trunk/fmt-conversion.c Tue May 8 12:56:22 2012 (r34893) @@ -65,6 +65,7 @@ static const struct { {IMGFMT_RGBA, PIX_FMT_RGB0}, {IMGFMT_RGB64LE, PIX_FMT_RGBA64LE}, {IMGFMT_RGB64BE, PIX_FMT_RGBA64BE}, + {IMGFMT_422A, PIX_FMT_YUVA422P}, {IMGFMT_444A, PIX_FMT_YUVA444P}, #endif #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 20, 1) Modified: trunk/libmpcodecs/img_format.c ============================================================================== --- trunk/libmpcodecs/img_format.c Tue May 8 12:53:40 2012 (r34892) +++ trunk/libmpcodecs/img_format.c Tue May 8 12:56:22 2012 (r34893) @@ -83,6 +83,7 @@ const char *vo_format_name(int format) case IMGFMT_444P: return "Planar 444P"; case IMGFMT_444A: return "Planar 444P with alpha"; case IMGFMT_422P: return "Planar 422P"; + case IMGFMT_422A: return "Planar 422P with alpha"; case IMGFMT_411P: return "Planar 411P"; case IMGFMT_NV12: return "Planar NV12"; case IMGFMT_NV21: return "Planar NV21"; @@ -179,6 +180,10 @@ int mp_get_chroma_shift(int format, int xs = 0; ys = 0; break; + case IMGFMT_422A: + xs = 1; + ys = 0; + break; case IMGFMT_420A: case IMGFMT_I420: case IMGFMT_IYUV: @@ -204,7 +209,7 @@ int mp_get_chroma_shift(int format, int if (y_shift) *y_shift = ys; if (component_bits) *component_bits = bits; bpp = 8 + ((16 >> xs) >> ys); - if (format == IMGFMT_420A || format == IMGFMT_444A) + if (format == IMGFMT_420A || format == IMGFMT_422A || format == IMGFMT_444A) bpp += 8; bpp *= (bits + 7) >> 3; return err ? 0 : bpp; Modified: trunk/libmpcodecs/img_format.h ============================================================================== --- trunk/libmpcodecs/img_format.h Tue May 8 12:53:40 2012 (r34892) +++ trunk/libmpcodecs/img_format.h Tue May 8 12:56:22 2012 (r34893) @@ -126,6 +126,8 @@ // 4:2:0 planar with alpha #define IMGFMT_420A 0x41303234 +// 4:2:2 planar with alpha +#define IMGFMT_422A 0x41323234 // 4:4:4 planar with alpha #define IMGFMT_444A 0x41343434 Modified: trunk/libmpcodecs/mp_image.c ============================================================================== --- trunk/libmpcodecs/mp_image.c Tue May 8 12:53:40 2012 (r34892) +++ trunk/libmpcodecs/mp_image.c Tue May 8 12:56:22 2012 (r34893) @@ -141,6 +141,7 @@ void mp_image_setfmt(mp_image_t* mpi,uns case IMGFMT_YV12: return; case IMGFMT_420A: + case IMGFMT_422A: case IMGFMT_444A: case IMGFMT_IF09: mpi->num_planes=4; Modified: trunk/libmpcodecs/vf_scale.c ============================================================================== --- trunk/libmpcodecs/vf_scale.c Tue May 8 12:53:40 2012 (r34892) +++ trunk/libmpcodecs/vf_scale.c Tue May 8 12:56:22 2012 (r34893) @@ -88,6 +88,7 @@ static const unsigned int outfmt_list[]= IMGFMT_420P9_LE, IMGFMT_420P9_BE, IMGFMT_420A, + IMGFMT_422A, IMGFMT_444A, IMGFMT_IYUV, IMGFMT_YVU9, Modified: trunk/m_option.c ============================================================================== --- trunk/m_option.c Tue May 8 12:53:40 2012 (r34892) +++ trunk/m_option.c Tue May 8 12:56:22 2012 (r34893) @@ -1099,6 +1099,7 @@ static struct { {"420p10", IMGFMT_420P10}, {"420p9", IMGFMT_420P9}, {"444a", IMGFMT_444A}, + {"422a", IMGFMT_422A}, {"420a", IMGFMT_420A}, {"444p", IMGFMT_444P}, {"422p", IMGFMT_422P},

1 0

r34892 - trunk/libvo/vo_png.c
by cehoyos 08 May '12

08 May '12

Author: cehoyos Date: Tue May 8 12:53:40 2012 New Revision: 34892 Log: Fix -vo png:alpha with newer FFmpeg. Modified: trunk/libvo/vo_png.c Modified: trunk/libvo/vo_png.c ============================================================================== --- trunk/libvo/vo_png.c Sun May 6 15:26:31 2012 (r34891) +++ trunk/libvo/vo_png.c Tue May 8 12:53:40 2012 (r34892) @@ -205,7 +205,7 @@ query_format(uint32_t format) switch(format){ case IMGFMT_RGB24: return use_alpha ? 0 : supported_flags; - case IMGFMT_BGR32: + case IMGFMT_RGBA: return use_alpha ? supported_flags : 0; } return 0;

1 0

r34891 - trunk/DOCS/tech/release.sh
by reimar 06 May '12

06 May '12

Author: reimar Date: Sun May 6 15:26:31 2012 New Revision: 34891 Log: release script: also remove .gitignore from MPlayer SVN. Modified: trunk/DOCS/tech/release.sh Modified: trunk/DOCS/tech/release.sh ============================================================================== --- trunk/DOCS/tech/release.sh Sun May 6 14:34:00 2012 (r34890) +++ trunk/DOCS/tech/release.sh Sun May 6 15:26:31 2012 (r34891) @@ -22,6 +22,6 @@ rm -rf $dst-DOCS/ # git archive unfortunately is refused git clone --depth 1 git://git.videolan.org/ffmpeg.git $dst/ffmpeg -rm -rf $dst/ffmpeg/.git* +rm -rf $dst/.git* $dst/ffmpeg/.git* tar --owner=0 --group=0 -cjf $dst.tar.bz2 $dst/

1 0

r34890 - trunk/DOCS/tech/release.sh
by reimar 06 May '12

06 May '12

Author: reimar Date: Sun May 6 14:34:00 2012 New Revision: 34890 Log: Add a preliminary release.sh file. Added: trunk/DOCS/tech/release.sh (contents, props changed) Added: trunk/DOCS/tech/release.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/DOCS/tech/release.sh Sun May 6 14:34:00 2012 (r34890) @@ -0,0 +1,27 @@ +#!/bin/bash +# will create checkouts and tarballs in the current dir +ver=1.1 +dst=MPlayer-$ver +svnurl=svn://svn.mplayerhq.hu/mplayer/trunk +#svnurl=svn://svn.mplayerhq.hu/mplayer/branches/$ver + +rm -rf $dst/ $dst-DOCS/ + +svn export svn://svn.mplayerhq.hu/mplayer/trunk $dst/ +echo $ver > $dst/VERSION + +# create HTML docs +cp -a $dst/ $dst-DOCS/ +pushd $dst-DOCS/ +mkdir -p ffmpeg/libavutil +./configure --yasm='' --language=all +make html-chunked +popd +mv $dst-DOCS/DOCS/HTML $dst/DOCS +rm -rf $dst-DOCS/ + +# git archive unfortunately is refused +git clone --depth 1 git://git.videolan.org/ffmpeg.git $dst/ffmpeg +rm -rf $dst/ffmpeg/.git* + +tar --owner=0 --group=0 -cjf $dst.tar.bz2 $dst/

3 2

r34889 - trunk/DOCS/tech/release-howto.txt
by reimar 06 May '12

06 May '12

Author: reimar Date: Sun May 6 14:29:22 2012 New Revision: 34889 Log: Some minor updates to release-howto.txt Modified: trunk/DOCS/tech/release-howto.txt Modified: trunk/DOCS/tech/release-howto.txt ============================================================================== --- trunk/DOCS/tech/release-howto.txt Sun May 6 14:24:09 2012 (r34888) +++ trunk/DOCS/tech/release-howto.txt Sun May 6 14:29:22 2012 (r34889) @@ -8,13 +8,15 @@ preparations: - Identify regressions or other serious issues, fix or revert (on the branch) as needed so the release is of good quality. - Find a codename for the release +- update osdep/mplayer.rc if necessary +- possibly bump etc/codecs.conf "release" line create the release tree: - tag Subversion with release name -- Add a VERSION file with the release version to the root of the source tree. - update release.sh script with version number ***the following steps are done automatically by release.sh script*** - checkout the mplayer src tree +- Add a VERSION file with the release version to the root of the source tree. - check out FFmpeg subdirs - remove obsolete DOCS translations, help files

1 0