diff options
| -rw-r--r-- | Changelog | 1 | ||||
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 9 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | etc/codecs.conf | 39 | ||||
| -rw-r--r-- | libmpcodecs/vf.c | 4 | ||||
| -rw-r--r-- | libmpcodecs/vf_yuy2.c | 99 | ||||
| -rw-r--r-- | loader/wine/winbase.h | 2 |
8 files changed, 46 insertions, 114 deletions
@@ -119,6 +119,7 @@ MPlayer (1.0) * add af_scaletempo which maintains audio pitch when changing playback speed * fix multi-channel reordering * af_stats, filter to print information about the audio stream + * remove vf_yuy2, functionality is replaced by -vf format=yuv2 Streaming: * tv:// support for Windows diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index b050e38cbf..25508202a5 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -4183,11 +4183,11 @@ Explicitly choose the Matrox device name to use (default: /dev/\:mga_vid). .PD 1 . .TP -.B s3fb (Linux only) (also see \-vf yuv2 and \-dr) +.B s3fb (Linux only) (also see \-dr) S3 Virge specific video output driver. This driver supports the card's YUV conversion and scaling, double buffering and direct rendering features. -Use \-vf yuy2 to get hardware-accelerated YUY2 rendering, which is +Use \-vf format=yuy2 to get hardware-accelerated YUY2 rendering, which is much faster than YV12 on this card. .PD 0 .RSs @@ -6076,11 +6076,6 @@ Rounds up to make both width and height divisible by <r> (default: 1). .RE . .TP -.B "yuy2\ \ \ " -Forces software YV12/\:I420/\:422P to YUY2 conversion. -Useful for video cards/\:drivers with slow YV12 but fast YUY2 support. -. -.TP .B "yvu9\ \ \ " Forces software YVU9 to YV12 colorspace conversion. Deprecated in favor of the software scaler. @@ -171,7 +171,7 @@ SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c SRCS_COMMON-$(LIBSWSCALE_INTERNALS) += libmpcodecs/vf_palette.c \ libmpcodecs/vf_rgb2bgr.c \ - libmpcodecs/vf_yuy2.c + SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c SRCS_COMMON-$(LIVE555) += libmpdemux/demux_rtp.cpp \ libmpdemux/demux_rtp_codec.cpp \ @@ -802,7 +802,7 @@ codec-cfg.d codec-cfg.o: codecs.conf.h $(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi osdep/mplayer.rc): version.h # Files that depend on libswscale internals -libvo/vo_mga.o libvo/vo_xmga.o libmpcodecs/vf_palette.o libmpcodecs/vf_rgb2bgr.o libmpcodecs/vf_yuy2.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS) +libvo/vo_mga.o libvo/vo_xmga.o libmpcodecs/vf_palette.o libmpcodecs/vf_rgb2bgr.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS) # Files that depend on libavcodec internals libmpcodecs/vf_fspp.o libmpcodecs/vf_geq.o libmpcodecs/vf_mcdeint.o libmpcodecs/vf_qp.o libmpcodecs/vf_spp.o libvo/jpeg_enc.o: CFLAGS := -I$(FFMPEG_SOURCE_PATH) $(CFLAGS) @@ -3629,7 +3629,7 @@ def_termios_h='#undef HAVE_TERMIOS_H' def_termios_sys_h='#undef HAVE_SYS_TERMIOS_H' if test "$_termios" = auto ; then _termios=no - for _termios_header in "sys/termios.h" "termios.h"; do + for _termios_header in "termios.h" "sys/termios.h"; do cat > $TMPC <<EOF #include <$_termios_header> int main(void) { return 0; } diff --git a/etc/codecs.conf b/etc/codecs.conf index a2d384bd15..b132f40d9e 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -4131,6 +4131,13 @@ audiocodec mp3 fourcc "LAME" ; used in mythtv .nuv files driver mp3lib +audiocodec ffmp3on4float + info "FFmpeg Multi-channel MPEG layer-3 on MP4 audio" + status working + format 0x1d61346d ; 'm','4','a',29 internal MPlayer fourcc + driver ffmpeg + dll "mp3on4float" + audiocodec ffmp3on4 info "FFmpeg Multi-channel MPEG layer-3 on MP4 audio" status working @@ -4138,6 +4145,19 @@ audiocodec ffmp3on4 driver ffmpeg dll "mp3on4" +audiocodec ffmp3float + info "FFmpeg MPEG layer-3 audio" + comment "integer only" + status working + format 0x55 + format 0x5500736d ; "ms\0\x55" older mp3 fcc (MOV files) + format 0x55005354 ; broken file + fourcc ".mp3" ; CBR/VBR MP3 (MOV files) + fourcc "MP3 " ; used in .nsv files + fourcc "LAME" ; used in mythtv .nuv files + driver ffmpeg + dll "mp3float" + audiocodec ffmp3 info "FFmpeg MPEG layer-3 audio" comment "integer only" @@ -4151,6 +4171,14 @@ audiocodec ffmp3 driver ffmpeg dll "mp3" +audiocodec ffmp3adufloat + info "FFmpeg MPEG layer-3 adu audio" + comment "integer only" + status working + format 0x55756461 ; 'a','d','u',0x55 internal MPlayer fourcc + driver ffmpeg + dll "mp3adufloat" + audiocodec ffmp3adu info "FFmpeg MPEG layer-3 adu audio" comment "integer only" @@ -4159,6 +4187,17 @@ audiocodec ffmp3adu driver ffmpeg dll "mp3adu" +audiocodec ffmp2float + info "FFmpeg MPEG layer-1 and layer-2 audio" + comment "integer only" + status working + format 0x50 + format 0x5000736d ; "ms\0\x50" older mp2 fcc (MOV files) + fourcc ".mp2" ; MP2 (MOV files) + fourcc ".mp1" ; MP1 (MOV files) + driver ffmpeg + dll "mp2float" + audiocodec ffmp2 info "FFmpeg MPEG layer-1 and layer-2 audio" comment "integer only" diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 98688793e8..217e802a84 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -50,7 +50,6 @@ extern const vf_info_t vf_info_pp; extern const vf_info_t vf_info_scale; extern const vf_info_t vf_info_format; extern const vf_info_t vf_info_noformat; -extern const vf_info_t vf_info_yuy2; extern const vf_info_t vf_info_flip; extern const vf_info_t vf_info_rgb2bgr; extern const vf_info_t vf_info_rotate; @@ -136,9 +135,6 @@ static const vf_info_t* const filter_list[]={ &vf_info_vo, &vf_info_format, &vf_info_noformat, -#ifdef CONFIG_LIBSWSCALE_INTERNALS - &vf_info_yuy2, -#endif &vf_info_flip, #ifdef CONFIG_LIBSWSCALE_INTERNALS &vf_info_rgb2bgr, diff --git a/libmpcodecs/vf_yuy2.c b/libmpcodecs/vf_yuy2.c deleted file mode 100644 index 987de0b1ce..0000000000 --- a/libmpcodecs/vf_yuy2.c +++ /dev/null @@ -1,99 +0,0 @@ -/* - * 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 <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <inttypes.h> - -#include "config.h" -#include "mp_msg.h" - -#include "img_format.h" -#include "mp_image.h" -#include "vf.h" - -#include "libswscale/rgb2rgb.h" -#include "vf_scale.h" - -//===========================================================================// - -static int config(struct vf_instance* vf, - int width, int height, int d_width, int d_height, - unsigned int flags, unsigned int outfmt){ - - sws_rgb2rgb_init(get_sws_cpuflags()); - - if(vf_next_query_format(vf,IMGFMT_YUY2)<=0){ - mp_tmsg(MSGT_VFILTER, MSGL_WARN, "%s not supported by next filter/vo :(\n", "YUY2"); - return 0; - } - - return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_YUY2); -} - -static int put_image(struct vf_instance* vf, mp_image_t *mpi, double pts){ - mp_image_t *dmpi; - - // hope we'll get DR buffer: - dmpi=vf_get_image(vf->next,IMGFMT_YUY2, - MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE, - mpi->w, mpi->h); - - if(mpi->imgfmt==IMGFMT_422P) - yuv422ptoyuy2(mpi->planes[0],mpi->planes[1],mpi->planes[2], dmpi->planes[0], - mpi->w,mpi->h, mpi->stride[0],mpi->stride[1],dmpi->stride[0]); - else - yv12toyuy2(mpi->planes[0],mpi->planes[1],mpi->planes[2], dmpi->planes[0], - mpi->w,mpi->h, mpi->stride[0],mpi->stride[1],dmpi->stride[0]); - - vf_clone_mpi_attributes(dmpi, mpi); - - return vf_next_put_image(vf,dmpi, pts); -} - -//===========================================================================// - -static int query_format(struct vf_instance* vf, unsigned int fmt){ - switch(fmt){ - case IMGFMT_YV12: - case IMGFMT_I420: - case IMGFMT_IYUV: - case IMGFMT_422P: - return vf_next_query_format(vf,IMGFMT_YUY2) & (~VFCAP_CSP_SUPPORTED_BY_HW); - } - return 0; -} - -static int vf_open(vf_instance_t *vf, char *args){ - vf->config=config; - vf->put_image=put_image; - vf->query_format=query_format; - return 1; -} - -const vf_info_t vf_info_yuy2 = { - "fast YV12/Y422p -> YUY2 conversion", - "yuy2", - "A'rpi", - "", - vf_open, - NULL -}; - -//===========================================================================// diff --git a/loader/wine/winbase.h b/loader/wine/winbase.h index a8fe81ee3f..19394bc81d 100644 --- a/loader/wine/winbase.h +++ b/loader/wine/winbase.h @@ -537,7 +537,7 @@ typedef struct UINT16 flags; DWORD dwOptions WINE_PACKED; DWORD dwFilter WINE_PACKED; - CHAR achAllocModule[8] WINE_PACKED; + CHAR achAllocModule[8]; DWORD dwAllocBreak WINE_PACKED; DWORD dwAllocCount WINE_PACKED; } WINDEBUGINFO, *LPWINDEBUGINFO; |