February 2011 - MPlayer-cvslog - lists.mplayerhq.hu

r32777 - in trunk: DOCS/man/en/mplayer.1 help/help_mp-cs.h help/help_mp-de.h help/help_mp-en.h help/help_mp-es.h help/help_mp-fr.h help/help_mp-hu.h help/help_mp-it.h help/help_mp-pl.h help/help_mp...
by cboesch 18 Jun '11

18 Jun '11

Author: cboesch Date: Mon Jan 10 20:18:51 2011 New Revision: 32777 Log: Add size based support for -endpos in MPlayer. Modified: trunk/mplayer.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 trunk/help/help_mp-cs.h trunk/help/help_mp-de.h trunk/help/help_mp-en.h trunk/help/help_mp-es.h trunk/help/help_mp-fr.h trunk/help/help_mp-hu.h trunk/help/help_mp-it.h trunk/help/help_mp-pl.h trunk/help/help_mp-ru.h trunk/help/help_mp-tr.h trunk/help/help_mp-uk.h trunk/help/help_mp-zh_CN.h trunk/help/help_mp-zh_TW.h Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sun Jan 9 21:21:45 2011 (r32776) +++ trunk/mplayer.c Mon Jan 10 20:18:51 2011 (r32777) @@ -3654,11 +3654,6 @@ if (seek_to_sec) { end_at.pos += seek_to_sec; } -if (end_at.type == END_AT_SIZE) { - mp_msg(MSGT_CPLAYER, MSGL_WARN, MSGTR_MPEndposNoSizeBased); - end_at.type = END_AT_NONE; -} - #ifdef CONFIG_DVDNAV mp_dvdnav_context_free(mpctx); if (mpctx->stream->type == STREAMTYPE_DVDNAV) { @@ -3702,7 +3697,8 @@ if(!mpctx->sh_video) { if(!quiet) print_status(a_pos, 0, 0); - if(end_at.type == END_AT_TIME && end_at.pos < a_pos) + if(end_at.type == END_AT_TIME && end_at.pos < a_pos || + end_at.type == END_AT_SIZE && end_at.pos < stream_tell(mpctx->stream)) mpctx->eof = PT_NEXT_ENTRY; update_subtitles(NULL, a_pos, mpctx->d_sub, 0); update_osd_msg(); @@ -3810,10 +3806,9 @@ if(auto_quality>0){ if (play_n_frames <= 0) mpctx->eof = PT_NEXT_ENTRY; } - -// FIXME: add size based support for -endpos - if (end_at.type == END_AT_TIME && - !frame_time_remaining && end_at.pos <= mpctx->sh_video->pts) + if (!frame_time_remaining && + ((end_at.type == END_AT_TIME && mpctx->sh_video->pts >= end_at.pos) || + (end_at.type == END_AT_SIZE && stream_tell(mpctx->stream) >= end_at.pos))) mpctx->eof = PT_NEXT_ENTRY; } // end if(mpctx->sh_video)

4 9

r32973 - trunk/mplayer.c
by cboesch 11 Mar '11

11 Mar '11

Author: cboesch Date: Sat Feb 26 12:58:53 2011 New Revision: 32973 Log: Use mp_asprintf in get_metadata instead of limited stack buffer. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sat Feb 26 12:57:54 2011 (r32972) +++ trunk/mplayer.c Sat Feb 26 12:58:53 2011 (r32973) @@ -438,7 +438,6 @@ static char *get_demuxer_info (char *tag } char *get_metadata (metadata_t type) { - char meta[128]; sh_audio_t * const sh_audio = mpctx->sh_audio; sh_video_t * const sh_video = mpctx->sh_video; @@ -460,18 +459,14 @@ char *get_metadata (metadata_t type) { else if (sh_video->format == 0x10000005) return strdup("h264"); else if (sh_video->format >= 0x20202020) - snprintf(meta, sizeof(meta), "%.4s", (char *) &sh_video->format); - else - snprintf(meta, sizeof(meta), "0x%08X", sh_video->format); - return strdup(meta); + return mp_asprintf("%.4s", (char *)&sh_video->format); + return mp_asprintf("0x%08X", sh_video->format); case META_VIDEO_BITRATE: - snprintf(meta, sizeof(meta), "%d kbps", (int) (sh_video->i_bps * 8 / 1024)); - return strdup(meta); + return mp_asprintf("%d kbps", (int)(sh_video->i_bps * 8 / 1024)); case META_VIDEO_RESOLUTION: - snprintf(meta, sizeof(meta), "%d x %d", sh_video->disp_w, sh_video->disp_h); - return strdup(meta); + return mp_asprintf("%d x %d", sh_video->disp_w, sh_video->disp_h); case META_AUDIO_CODEC: if (sh_audio->codec && sh_audio->codec->name) @@ -479,12 +474,10 @@ char *get_metadata (metadata_t type) { break; case META_AUDIO_BITRATE: - snprintf(meta, sizeof(meta), "%d kbps", (int)(sh_audio->i_bps * 8 / 1000)); - return strdup(meta); + return mp_asprintf("%d kbps", (int)(sh_audio->i_bps * 8 / 1000)); case META_AUDIO_SAMPLES: - snprintf(meta, sizeof(meta), "%d Hz, %d ch.", sh_audio->samplerate, sh_audio->channels); - return strdup(meta); + return mp_asprintf("%d Hz, %d ch.", sh_audio->samplerate, sh_audio->channels); /* check for valid demuxer */ case META_INFO_TITLE:

7 23

r32883 - trunk/configure
by cehoyos 06 Mar '11

06 Mar '11

Author: cehoyos Date: Fri Feb 11 11:02:09 2011 New Revision: 32883 Log: Fix compilation by adding defines necessary for ac3dsp to config.asm. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Thu Feb 10 22:31:24 2011 (r32882) +++ trunk/configure Fri Feb 11 11:02:09 2011 (r32883) @@ -8196,13 +8196,14 @@ EOF ff_config_enable () { list=$(echo $1 | tr '[a-z]' '[A-Z]') item=$(echo $2 | tr '[a-z]' '[A-Z]') -_nprefix=$3; +_nprefix=$4; +_defineprefix=$3; test -z "$_nprefix" && _nprefix='CONFIG' for part in $list; do if $(echo $item | grep -q -E "(^| )$part($| )"); then - echo "#define ${_nprefix}_$part 1" + echo "${_defineprefix}define ${_nprefix}_$part 1" else - echo "#define ${_nprefix}_$part 0" + echo "${_defineprefix}define ${_nprefix}_$part 0" fi done } @@ -8346,9 +8347,9 @@ $def_pthread_cache $def_ebx_available $def_words_endian $def_bigendian -$(ff_config_enable "$arch_all" "$arch" "ARCH") -$(ff_config_enable "$subarch_all" "$subarch" "ARCH") -$(ff_config_enable "$cpuexts_all" "$cpuexts" "HAVE") +$(ff_config_enable "$arch_all" "$arch" "#" "ARCH") +$(ff_config_enable "$subarch_all" "$subarch" "#" "ARCH") +$(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE") /* Blu-ray/DVD/VCD/CD */ @@ -8684,14 +8685,14 @@ $def_mp3lame_lavc $def_x264_lavc $def_xvid_lavc -$(ff_config_enable "$libavdecoders_all" "$libavdecoders") -$(ff_config_enable "$libavencoders_all" "$libavencoders") -$(ff_config_enable "$libavparsers_all" "$libavparsers") -$(ff_config_enable "$libavdemuxers_all" "$libavdemuxers") -$(ff_config_enable "$libavmuxers_all" "$libavmuxers") -$(ff_config_enable "$libavprotocols_all" "$libavprotocols") -$(ff_config_enable "$libavbsfs_all" "$libavbsfs") -$(ff_config_enable "$libavhwaccels_all" "$libavhwaccels") +$(ff_config_enable "$libavdecoders_all" "$libavdecoders" "#") +$(ff_config_enable "$libavencoders_all" "$libavencoders" "#") +$(ff_config_enable "$libavparsers_all" "$libavparsers" "#") +$(ff_config_enable "$libavdemuxers_all" "$libavdemuxers" "#") +$(ff_config_enable "$libavmuxers_all" "$libavmuxers" "#") +$(ff_config_enable "$libavprotocols_all" "$libavprotocols" "#") +$(ff_config_enable "$libavbsfs_all" "$libavbsfs" "#") +$(ff_config_enable "$libavhwaccels_all" "$libavhwaccels" "#") #endif /* MPLAYER_CONFIG_H */ EOF @@ -8723,6 +8724,7 @@ for part in $arch $subarch; do part=$(echo $part | tr '[a-z]' '[A-Z]') echo "%define ARCH_${part}" >> "$TMPS" done +echo "$(ff_config_enable "$cpuexts_all" "$cpuexts" "%" "HAVE")" >> "$TMPS" cmp -s "$TMPS" config.asm || mv -f "$TMPS" config.asm fi

2 1

r32970 - in trunk: Makefile mp_strings.c mp_strings.h
by cboesch 06 Mar '11

06 Mar '11

Author: cboesch Date: Sat Feb 26 12:55:02 2011 New Revision: 32970 Log: Add mp_strings.c with mp_asprintf function. Added: trunk/mp_strings.c trunk/mp_strings.h Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Fri Feb 25 13:26:31 2011 (r32969) +++ trunk/Makefile Sat Feb 26 12:55:02 2011 (r32970) @@ -301,6 +301,7 @@ SRCS_COMMON = asxparser.c \ m_option.c \ m_struct.c \ mp_msg.c \ + mp_strings.c \ mpcommon.c \ parser-cfg.c \ path.c \ Added: trunk/mp_strings.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mp_strings.c Sat Feb 26 12:55:02 2011 (r32970) @@ -0,0 +1,50 @@ +/* + * Strings utilities + * + * 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 <stdlib.h> +#include <stdarg.h> +#include <stdio.h> +#include "mp_strings.h" + +char *mp_asprintf(const char *fmt, ...) +{ + char *p = NULL; + va_list va, va_bak; + int len; + + va_start(va, fmt); + va_copy(va_bak, va); + + len = vsnprintf(NULL, 0, fmt, va); + if (len < 0) + goto end; + + p = malloc(len + 1); + if (!p) + goto end; + + len = vsnprintf(p, len + 1, fmt, va_bak); + if (len < 0) + free(p), p = NULL; + +end: + va_end(va); + return p; +} Added: trunk/mp_strings.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/mp_strings.h Sat Feb 26 12:55:02 2011 (r32970) @@ -0,0 +1,26 @@ +/* + * Strings utilities + * + * 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_MP_STRINGS_H +#define MPLAYER_MP_STRINGS_H + +char *mp_asprintf(const char *fmt, ...); + +#endif /* !MPLAYER_MP_STRINGS_H */

3 2

[propchange]: r32984 - svn:log
by ib 28 Feb '11

28 Feb '11

Author: ib Revision: 32984 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,8 @@ -Cosmetic: Format to MPlayer coding style. \ No newline at end of file +Cosmetic: Format to MPlayer coding style. + +Additionally: remove needless includes, group and sort includes, drop +prototype declarations of unused functions or those to become 'static' +from header file, strip off variable names from prototype declarations, +sort prototype declarations, reorder variable declarations, change float +constant notations, group statements by adding or removing new lines to +ease reading, remove and edit comments resp. add comments for future treatment.

1 0

[propchange]: r32968 - svn:log
by ib 28 Feb '11

28 Feb '11

Author: ib Revision: 32968 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,7 @@ -Cosmetic: Format to MPlayer coding style. \ No newline at end of file +Cosmetic: Format to MPlayer coding style. + +Additionally: remove needless includes, group and sort includes, drop +prototype declarations of unused functions or those to become 'static' +from header file, strip off variable names from prototype declarations, +sort prototype declarations, group statements by adding or removing new +lines to ease reading, remove needless parentheses, move and edit comments.

1 0

[propchange]: r32960 - svn:log
by ib 28 Feb '11

28 Feb '11

Author: ib Revision: 32960 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,7 @@ -Cosmetic: Format to MPlayer coding style. \ No newline at end of file +Cosmetic: Format to MPlayer coding style. + +Additionally: remove needless includes, group and sort includes, strip off +variable names from prototype declarations, sort prototype declarations, +move typedef declaration to the top, reorder variable declarations, group +statements by adding or removing new lines to ease reading, remove useless +comments and add useful ones.

1 0

[propchange]: r32956 - svn:log
by ib 28 Feb '11

28 Feb '11

Author: ib Revision: 32956 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,5 @@ -Cosmetic: Format to MPlayer coding style. \ No newline at end of file +Cosmetic: Format to MPlayer coding style. + +Additionally: group and sort includes, strip off variable names from +prototype declarations, sort prototype declarations, group statements +by adding or removing new lines to ease reading and move comment.

1 0

[propchange]: r32955 - svn:log
by ib 28 Feb '11

28 Feb '11

Author: ib Revision: 32955 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1,4 @@ -Cosmetic: Format to MPlayer coding style. \ No newline at end of file +Cosmetic: Format to MPlayer coding style. + +Additionally: sort includes, strip off variable names from prototype +declarations and group statements by adding new lines to ease reading.

1 0

r32989 - trunk/libmpcodecs/ve_raw.c
by reimar 28 Feb '11

28 Feb '11

Author: reimar Date: Mon Feb 28 21:15:45 2011 New Revision: 32989 Log: Missing part of r32577: Add NV12/NV21/HM12 to query_format so they really work. Modified: trunk/libmpcodecs/ve_raw.c Modified: trunk/libmpcodecs/ve_raw.c ============================================================================== --- trunk/libmpcodecs/ve_raw.c Mon Feb 28 18:51:02 2011 (r32988) +++ trunk/libmpcodecs/ve_raw.c Mon Feb 28 21:15:45 2011 (r32989) @@ -129,6 +129,9 @@ static int query_format(struct vf_instan if (IMGFMT_IS_RGB(fmt) || IMGFMT_IS_BGR(fmt)) return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW; switch (fmt) { + case IMGFMT_NV12: + case IMGFMT_NV21: + case IMGFMT_HM12: case IMGFMT_I420: case IMGFMT_IYUV: case IMGFMT_YV12:

1 0