December 2009 - MPlayer-cvslog - lists.mplayerhq.hu

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

r29721 - trunk/libvo/gl_common.c
by reimar 24 May '10

24 May '10

Author: reimar Date: Sun Sep 27 16:24:15 2009 New Revision: 29721 Log: Also check GLX client and server strings for extensions Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sat Sep 26 23:22:01 2009 (r29720) +++ trunk/libvo/gl_common.c Sun Sep 27 16:24:15 2009 (r29721) @@ -1563,6 +1563,21 @@ static XVisualInfo *getWindowVisualInfo( return XGetVisualInfo(mDisplay, VisualIDMask, &vinfo_template, &tmp); } +static void appendstr(char **dst, const char *str) +{ + int newsize; + char *newstr; + if (!str) + return; + newsize = strlen(*dst) + 1 + strlen(str) + 1; + newstr = realloc(*dst, newsize); + if (!newstr) + return; + *dst = newstr; + strcat(*dst, " "); + strcat(*dst, str); +} + /** * \brief Changes the window in which video is displayed. * If possible only transfers the context to the new window, otherwise @@ -1619,6 +1634,7 @@ int setGlWindow(XVisualInfo **vinfo, GLX if (!keep_context) { void *(*getProcAddress)(const GLubyte *); const char *(*glXExtStr)(Display *, int); + char *glxstr = strdup(""); if (*context) glXDestroyContext(mDisplay, *context); *context = new_context; @@ -1631,8 +1647,17 @@ int setGlWindow(XVisualInfo **vinfo, GLX if (!getProcAddress) getProcAddress = (void *)getdladdr; glXExtStr = getdladdr("glXQueryExtensionsString"); - getFunctions(getProcAddress, !glXExtStr ? NULL : - glXExtStr(mDisplay, DefaultScreen(mDisplay))); + if (glXExtStr) + appendstr(&glxstr, glXExtStr(mDisplay, DefaultScreen(mDisplay))); + glXExtStr = getdladdr("glXGetClientString"); + if (glXExtStr) + appendstr(&glxstr, glXExtStr(mDisplay, GLX_EXTENSIONS)); + glXExtStr = getdladdr("glXGetServerString"); + if (glXExtStr) + appendstr(&glxstr, glXExtStr(mDisplay, GLX_EXTENSIONS)); + + getFunctions(getProcAddress, glxstr); + free(glxstr); // and inform that reinit is neccessary return SET_WINDOW_REINIT;

4 6

r30047 - trunk/vidix/pci_db2c.awk
by diego 04 Jan '10

04 Jan '10

Author: diego Date: Thu Dec 17 00:44:26 2009 New Revision: 30047 Log: Make vidix/pci_db2c.awk executable. Modified: trunk/vidix/pci_db2c.awk (contents, props changed) Modified: trunk/vidix/pci_db2c.awk ============================================================================== --- trunk/vidix/pci_db2c.awk Wed Dec 16 23:36:17 2009 (r30046) +++ trunk/vidix/pci_db2c.awk Thu Dec 17 00:44:26 2009 (r30047) @@ -1,9 +1,8 @@ +#!/usr/bin/awk -f # This file converts given pci.db to "C" source and header files # For latest version of pci ids see: http://pciids.sf.net # Copyright 2002 Nick Kurshev # -# Usage: awk -f pci_db2c.awk pci.db -# # Tested with Gawk v 3.0.x and Mawk 1.3.3 # But it should work with standard Awk implementations (hopefully). # (Nobody tested it with Nawk, but it should work, too). @@ -28,7 +27,7 @@ BEGIN { if(ARGC != 3) { # check for arguments: - print "Usage awk -f pci_db2c.awk pci.db (and make sure pci.db file exists first)"; + print "Usage ./pci_db2c.awk pci.db (and make sure pci.db file exists first)"; exit(1); } in_file = ARGV[1];

3 3

r30094 - in trunk: Makefile vidix vidix/pci_db2c.awk vidix/pci_names.c
by diego 04 Jan '10

04 Jan '10

Author: diego Date: Sun Dec 20 22:11:39 2009 New Revision: 30094 Log: Do not auto-generate the C code to handle PCI vendor and device names. This part of the code does not change so there is no point in generating it. Added: trunk/vidix/pci_names.c Modified: trunk/Makefile trunk/vidix/ (props changed) trunk/vidix/pci_db2c.awk Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Dec 20 21:57:44 2009 (r30093) +++ trunk/Makefile Sun Dec 20 22:11:39 2009 (r30094) @@ -895,7 +895,7 @@ tremor/%: CFLAGS += $(CFLAGS_TREMOR_LOW) vidix/%: CFLAGS += $(CFLAGS_DHAHELPER) $(CFLAGS_SVGALIB_HELPER) -VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_names.c \ +VIDIX_PCI_FILES = vidix/pci_dev_ids.c vidix/pci_ids.h vidix/pci_vendor_ids.h \ vidix/pci_vendors.h $(VIDIX_PCI_FILES): vidix/pci_db2c.awk vidix/pci.db Modified: trunk/vidix/pci_db2c.awk ============================================================================== --- trunk/vidix/pci_db2c.awk Sun Dec 20 21:57:44 2009 (r30093) +++ trunk/vidix/pci_db2c.awk Sun Dec 20 22:11:39 2009 (r30094) @@ -34,12 +34,12 @@ BEGIN { with_pci_db = ARGV[2]; dev_ids_c_file = "vidix/pci_dev_ids.c" ids_h_file = "vidix/pci_ids.h" - names_c_file = "vidix/pci_names.c" + vendor_ids_h_file = "vidix/pci_vendor_ids.h" vendors_h_file = "vidix/pci_vendors.h"; # print out head lines print_head(vendors_h_file); print_head(ids_h_file); - print_head(names_c_file); + print_head(vendor_ids_h_file); print_head(dev_ids_c_file); print "#include <stdlib.h>" > dev_ids_c_file; print "#include \"pci_names.h\"" > dev_ids_c_file; @@ -49,12 +49,12 @@ BEGIN { print "#include \"pci_vendors.h\"" > ids_h_file print "" > ids_h_file - print "#include <stddef.h>" > names_c_file - print "#include \"pci_names.h\"" > names_c_file + print "#include <stddef.h>" > vendor_ids_h_file + print "#include \"pci_names.h\"" > vendor_ids_h_file if (with_pci_db) { - print "#include \"pci_dev_ids.c\"" > names_c_file - print "" > names_c_file - print "static struct vendor_id_s vendor_ids[] = {" > names_c_file + print "#include \"pci_dev_ids.c\"" > vendor_ids_h_file + print "" > vendor_ids_h_file + print "static struct vendor_id_s vendor_ids[] = {" > vendor_ids_h_file } first_pass = 1; init_name_db(); @@ -67,7 +67,7 @@ BEGIN { printf("#define VENDOR_%s\t", svend_name) > vendors_h_file; if (length(svend_name) < 9) printf("\t") > vendors_h_file; printf("0x%s /*%s*/\n", field[2], name_field) > vendors_h_file; - if (with_pci_db) printf("{ 0x%s, \"%s\", dev_lst_%s },\n", field[2], name_field, field[2]) > names_c_file; + if (with_pci_db) printf("{ 0x%s, \"%s\", dev_lst_%s },\n", field[2], name_field, field[2]) > vendor_ids_h_file; printf("/* Vendor: %s: %s */\n", field[2], name_field) > ids_h_file if (first_pass == 1) first_pass = 0; else print "{ 0xFFFF, NULL }\n};" > dev_ids_c_file; @@ -100,10 +100,9 @@ BEGIN { } print_guards_end(vendors_h_file); print_guards_end(ids_h_file); - if (with_pci_db) print "};" > names_c_file + if (with_pci_db) print "};" > vendor_ids_h_file print "{ 0xFFFF, NULL }" > dev_ids_c_file; print "};" > dev_ids_c_file - print_func_bodies(names_c_file); } function construct_guard_name(out_file) @@ -135,41 +134,6 @@ function print_head(out_file) print "" > out_file } -function print_func_bodies(out_file) -{ - print "" > out_file - print "const char *pci_vendor_name(unsigned short id)" > out_file - print "{" > out_file - if (with_pci_db) { - print " unsigned i;" > out_file - print " for (i = 0; i < sizeof(vendor_ids) / sizeof(struct vendor_id_s); i++) {" > out_file - print " if (vendor_ids[i].id == id)" > out_file - print " return vendor_ids[i].name;" > out_file - print " }" > out_file - } - print " return NULL;" > out_file - print "}" > out_file - print "" > out_file - print "const char *pci_device_name(unsigned short vendor_id, unsigned short device_id)" > out_file - print "{" > out_file - if (with_pci_db) { - print " unsigned i, j;" > out_file - print " for (i = 0; i < sizeof(vendor_ids) / sizeof(struct vendor_id_s); i++) {" > out_file - print " if (vendor_ids[i].id == vendor_id) {" > out_file - print " j = 0;" > out_file - print " while (vendor_ids[i].dev_list[j].id != 0xFFFF) {" > out_file - print " if (vendor_ids[i].dev_list[j].id == device_id)" > out_file - print " return vendor_ids[i].dev_list[j].name;" > out_file - print " j++;" > out_file - print " };" > out_file - print " break;" > out_file - print " }" > out_file - print " }" > out_file - } - print " return NULL;" > out_file - print "}" > out_file -} - function kill_double_quoting(fld) { n = split(fld, phrases, "[\"]"); Added: trunk/vidix/pci_names.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/vidix/pci_names.c Sun Dec 20 22:11:39 2009 (r30094) @@ -0,0 +1,50 @@ +/* + * VIDIX - VIDeo Interface for *niX. + * + * 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 <stddef.h> +#include "pci_names.h" +#include "pci_vendor_ids.h" + +const char *pci_vendor_name(unsigned short id) +{ + unsigned i; + for (i = 0; i < sizeof(vendor_ids) / sizeof(struct vendor_id_s); i++) { + if (vendor_ids[i].id == id) + return vendor_ids[i].name; + } + return NULL; +} + +const char *pci_device_name(unsigned short vendor_id, unsigned short device_id) +{ + unsigned i, j; + for (i = 0; i < sizeof(vendor_ids) / sizeof(struct vendor_id_s); i++) { + if (vendor_ids[i].id == vendor_id) { + j = 0; + while (vendor_ids[i].dev_list[j].id != 0xFFFF) { + if (vendor_ids[i].dev_list[j].id == device_id) + return vendor_ids[i].dev_list[j].name; + j++; + }; + break; + } + } + return NULL; +}

2 2

r30140 - in trunk: codec-cfg.c fmt-conversion.c libmpcodecs/img_format.c libmpcodecs/img_format.h libmpcodecs/mp_image.h m_option.c
by reimar 31 Dec '09

31 Dec '09

Author: reimar Date: Wed Dec 30 13:03:17 2009 New Revision: 30140 Log: Add support for 440p colorspace. Modified: trunk/codec-cfg.c trunk/fmt-conversion.c trunk/libmpcodecs/img_format.c trunk/libmpcodecs/img_format.h trunk/libmpcodecs/mp_image.h trunk/m_option.c Modified: trunk/codec-cfg.c ============================================================================== --- trunk/codec-cfg.c Wed Dec 30 12:32:24 2009 (r30139) +++ trunk/codec-cfg.c Wed Dec 30 13:03:17 2009 (r30140) @@ -155,6 +155,7 @@ static int add_to_format(char *s, char * {"444P", IMGFMT_444P}, {"422P", IMGFMT_422P}, {"411P", IMGFMT_411P}, + {"440P", IMGFMT_440P}, {"Y800", IMGFMT_Y800}, {"Y8", IMGFMT_Y8}, Modified: trunk/fmt-conversion.c ============================================================================== --- trunk/fmt-conversion.c Wed Dec 30 12:32:24 2009 (r30139) +++ trunk/fmt-conversion.c Wed Dec 30 13:03:17 2009 (r30140) @@ -58,6 +58,7 @@ static const struct { {IMGFMT_411P, PIX_FMT_YUV411P}, {IMGFMT_422P, PIX_FMT_YUV422P}, {IMGFMT_444P, PIX_FMT_YUV444P}, + {IMGFMT_440P, PIX_FMT_YUV440P}, // YUVJ are YUV formats that use the full Y range and not just // 16 - 235 (see colorspaces.txt). @@ -65,6 +66,7 @@ static const struct { {IMGFMT_YV12, PIX_FMT_YUVJ420P}, {IMGFMT_422P, PIX_FMT_YUVJ422P}, {IMGFMT_444P, PIX_FMT_YUVJ444P}, + {IMGFMT_440P, PIX_FMT_YUVJ440P}, {IMGFMT_XVMC_MOCO_MPEG2, PIX_FMT_XVMC_MPEG2_MC}, {IMGFMT_XVMC_IDCT_MPEG2, PIX_FMT_XVMC_MPEG2_IDCT}, Modified: trunk/libmpcodecs/img_format.c ============================================================================== --- trunk/libmpcodecs/img_format.c Wed Dec 30 12:32:24 2009 (r30139) +++ trunk/libmpcodecs/img_format.c Wed Dec 30 13:03:17 2009 (r30140) @@ -108,6 +108,10 @@ int mp_get_chroma_shift(int format, int xs = 2; ys = 0; break; + case IMGFMT_440P: + xs = 0; + ys = 1; + break; default: err = 1; break; Modified: trunk/libmpcodecs/img_format.h ============================================================================== --- trunk/libmpcodecs/img_format.h Wed Dec 30 12:32:24 2009 (r30139) +++ trunk/libmpcodecs/img_format.h Wed Dec 30 13:03:17 2009 (r30140) @@ -71,6 +71,7 @@ #define IMGFMT_444P 0x50343434 #define IMGFMT_422P 0x50323234 #define IMGFMT_411P 0x50313134 +#define IMGFMT_440P 0x50303434 #define IMGFMT_HM12 0x32314D48 /* Packed YUV Formats */ Modified: trunk/libmpcodecs/mp_image.h ============================================================================== --- trunk/libmpcodecs/mp_image.h Wed Dec 30 12:32:24 2009 (r30139) +++ trunk/libmpcodecs/mp_image.h Wed Dec 30 13:03:17 2009 (r30140) @@ -151,6 +151,7 @@ static inline void mp_image_setfmt(mp_im case IMGFMT_444P: case IMGFMT_422P: case IMGFMT_411P: + case IMGFMT_440P: return; case IMGFMT_Y800: case IMGFMT_Y8: Modified: trunk/m_option.c ============================================================================== --- trunk/m_option.c Wed Dec 30 12:32:24 2009 (r30139) +++ trunk/m_option.c Wed Dec 30 13:03:17 2009 (r30140) @@ -1035,6 +1035,7 @@ static struct { {"444p", IMGFMT_444P}, {"422p", IMGFMT_422P}, {"411p", IMGFMT_411P}, + {"440p", IMGFMT_440P}, {"yuy2", IMGFMT_YUY2}, {"uyvy", IMGFMT_UYVY}, {"yvu9", IMGFMT_YVU9},

3 3

r30157 - in trunk: codec-cfg.c etc/codecs.conf fmt-conversion.c libmpcodecs/img_format.c libmpcodecs/img_format.h libmpcodecs/mp_image.c libmpcodecs/mp_image.h libmpcodecs/vf_scale.c m_option.c
by reimar 31 Dec '09

31 Dec '09

Author: reimar Date: Fri Jan 1 00:45:07 2010 New Revision: 30157 Log: Add support for YUV format with alpha and fix the codecs.conf entry for vp6a to use it. Fixes playback of samples in http://samples.mplayerhq.hu/FLV/flash_with_alpha/ 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/mp_image.h trunk/libmpcodecs/vf_scale.c trunk/m_option.c Modified: trunk/codec-cfg.c ============================================================================== --- trunk/codec-cfg.c Fri Jan 1 00:39:21 2010 (r30156) +++ trunk/codec-cfg.c Fri Jan 1 00:45:07 2010 (r30157) @@ -161,6 +161,7 @@ static int add_to_format(char *s, char * {"444P16", IMGFMT_444P16}, {"422P16", IMGFMT_422P16}, {"420P16", IMGFMT_420P16}, + {"420A", IMGFMT_420A}, {"444P", IMGFMT_444P}, {"422P", IMGFMT_422P}, {"411P", IMGFMT_411P}, Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Fri Jan 1 00:39:21 2010 (r30156) +++ trunk/etc/codecs.conf Fri Jan 1 00:45:07 2010 (r30157) @@ -2060,7 +2060,7 @@ videocodec ffvp6a fourcc VP6A driver ffmpeg dll "vp6a" - out I420,YUY2,YV12 + out 420A videocodec ffvp6f info "FFmpeg VP6 Flash" Modified: trunk/fmt-conversion.c ============================================================================== --- trunk/fmt-conversion.c Fri Jan 1 00:39:21 2010 (r30156) +++ trunk/fmt-conversion.c Fri Jan 1 00:45:07 2010 (r30157) @@ -59,6 +59,9 @@ static const struct { {IMGFMT_422P, PIX_FMT_YUV422P}, {IMGFMT_444P, PIX_FMT_YUV444P}, {IMGFMT_440P, PIX_FMT_YUV440P}, + + {IMGFMT_420A, PIX_FMT_YUVA420P}, + {IMGFMT_420P16_LE, PIX_FMT_YUV420P16LE}, {IMGFMT_420P16_BE, PIX_FMT_YUV420P16BE}, {IMGFMT_422P16_LE, PIX_FMT_YUV422P16LE}, Modified: trunk/libmpcodecs/img_format.c ============================================================================== --- trunk/libmpcodecs/img_format.c Fri Jan 1 00:39:21 2010 (r30156) +++ trunk/libmpcodecs/img_format.c Fri Jan 1 00:45:07 2010 (r30157) @@ -43,6 +43,7 @@ const char *vo_format_name(int format) case IMGFMT_422P16_BE: return "Planar 422P 16-bit big-endian"; case IMGFMT_444P16_LE: return "Planar 444P 16-bit little-endian"; case IMGFMT_444P16_BE: return "Planar 444P 16-bit big-endian"; + case IMGFMT_420A: return "Planar 420P with alpha"; case IMGFMT_444P: return "Planar 444P"; case IMGFMT_422P: return "Planar 422P"; case IMGFMT_411P: return "Planar 411P"; @@ -96,6 +97,7 @@ int mp_get_chroma_shift(int format, int case IMGFMT_420P16_LE: case IMGFMT_420P16_BE: bpp_factor = 2; + case IMGFMT_420A: case IMGFMT_I420: case IMGFMT_IYUV: case IMGFMT_YV12: @@ -136,6 +138,8 @@ int mp_get_chroma_shift(int format, int if (x_shift) *x_shift = xs; if (y_shift) *y_shift = ys; bpp = 8 + (16 >> (xs + ys)); + if (format == IMGFMT_420A) + bpp += 8; bpp *= bpp_factor; return err ? 0 : bpp; } Modified: trunk/libmpcodecs/img_format.h ============================================================================== --- trunk/libmpcodecs/img_format.h Fri Jan 1 00:39:21 2010 (r30156) +++ trunk/libmpcodecs/img_format.h Fri Jan 1 00:45:07 2010 (r30157) @@ -73,6 +73,10 @@ #define IMGFMT_411P 0x50313134 #define IMGFMT_440P 0x50303434 #define IMGFMT_HM12 0x32314D48 + +// 4:2:0 planar with alpha +#define IMGFMT_420A 0x41303234 + #define IMGFMT_444P16_LE 0x51343434 #define IMGFMT_444P16_BE 0x34343451 #define IMGFMT_422P16_LE 0x51323234 Modified: trunk/libmpcodecs/mp_image.c ============================================================================== --- trunk/libmpcodecs/mp_image.c Fri Jan 1 00:39:21 2010 (r30156) +++ trunk/libmpcodecs/mp_image.c Fri Jan 1 00:45:07 2010 (r30157) @@ -19,24 +19,26 @@ void mp_image_alloc_planes(mp_image_t *m if (mpi->imgfmt == IMGFMT_IF09) { mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8+ mpi->chroma_width*mpi->chroma_height); - /* export delta table */ - mpi->planes[3]=mpi->planes[0]+(mpi->width*mpi->height)+2*(mpi->chroma_width*mpi->chroma_height); } else mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8); if (mpi->flags&MP_IMGFLAG_PLANAR) { int bpp = IMGFMT_IS_YUVP16(mpi->imgfmt)? 2 : 1; // YV12/I420/YVU9/IF09. feel free to add other planar formats here... - mpi->stride[0]=bpp*mpi->width; + mpi->stride[0]=mpi->stride[3]=bpp*mpi->width; if(mpi->num_planes > 2){ mpi->stride[1]=mpi->stride[2]=bpp*mpi->chroma_width; if(mpi->flags&MP_IMGFLAG_SWAPPED){ // I420/IYUV (Y,U,V) mpi->planes[1]=mpi->planes[0]+mpi->stride[0]*mpi->height; mpi->planes[2]=mpi->planes[1]+mpi->stride[1]*mpi->chroma_height; + if (mpi->num_planes > 3) + mpi->planes[3]=mpi->planes[2]+mpi->stride[2]*mpi->chroma_height; } else { // YV12,YVU9,IF09 (Y,V,U) mpi->planes[2]=mpi->planes[0]+mpi->stride[0]*mpi->height; mpi->planes[1]=mpi->planes[2]+mpi->stride[1]*mpi->chroma_height; + if (mpi->num_planes > 3) + mpi->planes[3]=mpi->planes[1]+mpi->stride[1]*mpi->chroma_height; } } else { // NV12/NV21 Modified: trunk/libmpcodecs/mp_image.h ============================================================================== --- trunk/libmpcodecs/mp_image.h Fri Jan 1 00:39:21 2010 (r30156) +++ trunk/libmpcodecs/mp_image.h Fri Jan 1 00:45:07 2010 (r30157) @@ -145,6 +145,7 @@ static inline void mp_image_setfmt(mp_im mpi->flags|=MP_IMGFLAG_SWAPPED; case IMGFMT_YV12: return; + case IMGFMT_420A: case IMGFMT_IF09: mpi->num_planes=4; case IMGFMT_YVU9: @@ -210,6 +211,7 @@ static inline void free_mp_image(mp_imag } mp_image_t* alloc_mpi(int w, int h, unsigned long int fmt); +void mp_image_alloc_planes(mp_image_t *mpi); void copy_mpi(mp_image_t *dmpi, mp_image_t *mpi); #endif /* MPLAYER_MP_IMAGE_H */ Modified: trunk/libmpcodecs/vf_scale.c ============================================================================== --- trunk/libmpcodecs/vf_scale.c Fri Jan 1 00:39:21 2010 (r30156) +++ trunk/libmpcodecs/vf_scale.c Fri Jan 1 00:45:07 2010 (r30157) @@ -61,6 +61,7 @@ static unsigned int outfmt_list[]={ IMGFMT_I420, IMGFMT_420P16_LE, IMGFMT_420P16_BE, + IMGFMT_420A, IMGFMT_IYUV, IMGFMT_YVU9, IMGFMT_IF09, @@ -480,6 +481,7 @@ static int query_format(struct vf_instan case IMGFMT_422P: case IMGFMT_411P: case IMGFMT_440P: + case IMGFMT_420A: case IMGFMT_444P16_LE: case IMGFMT_444P16_BE: case IMGFMT_422P16_LE: Modified: trunk/m_option.c ============================================================================== --- trunk/m_option.c Fri Jan 1 00:39:21 2010 (r30156) +++ trunk/m_option.c Fri Jan 1 00:45:07 2010 (r30157) @@ -1041,6 +1041,7 @@ static struct { {"444p16", IMGFMT_444P16}, {"422p16", IMGFMT_422P16}, {"420p16", IMGFMT_420P16}, + {"420a", IMGFMT_420A}, {"444p", IMGFMT_444P}, {"422p", IMGFMT_422P}, {"411p", IMGFMT_411P},

1 0

r30156 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 31 Dec '09

31 Dec '09

Author: reimar Date: Fri Jan 1 00:39:21 2010 New Revision: 30156 Log: Also pass the 4th plane for planar formats on to libavcodec. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Fri Jan 1 00:25:21 2010 (r30155) +++ trunk/libmpcodecs/vd_ffmpeg.c Fri Jan 1 00:39:21 2010 (r30156) @@ -639,6 +639,7 @@ static int get_buffer(AVCodecContext *av pic->data[0]= mpi->planes[0]; pic->data[1]= mpi->planes[1]; pic->data[2]= mpi->planes[2]; + pic->data[3]= mpi->planes[3]; #if 0 assert(mpi->width >= ((width +align)&(~align))); @@ -663,6 +664,7 @@ static int get_buffer(AVCodecContext *av pic->linesize[0]= mpi->stride[0]; pic->linesize[1]= mpi->stride[1]; pic->linesize[2]= mpi->stride[2]; + pic->linesize[3]= mpi->stride[3]; pic->opaque = mpi; //printf("%X\n", (int)mpi->planes[0]); @@ -884,9 +886,11 @@ static mp_image_t *decode(sh_video_t *sh mpi->planes[0]=pic->data[0]; mpi->planes[1]=pic->data[1]; mpi->planes[2]=pic->data[2]; + mpi->planes[3]=pic->data[3]; mpi->stride[0]=pic->linesize[0]; mpi->stride[1]=pic->linesize[1]; mpi->stride[2]=pic->linesize[2]; + mpi->stride[3]=pic->linesize[3]; } if (!mpi->planes[0])

1 0

r30155 - trunk/libmpcodecs/vf_scale.c
by reimar 31 Dec '09

31 Dec '09

Author: reimar Date: Fri Jan 1 00:25:21 2010 New Revision: 30155 Log: Try to put the list of output formats for vf_scale in a more sensible order. While the 16-bit yuv formats should not be preferred over the 8-bit ones, it seems reasonable to probe them directly after the equivalent 8-bit formats. Modified: trunk/libmpcodecs/vf_scale.c Modified: trunk/libmpcodecs/vf_scale.c ============================================================================== --- trunk/libmpcodecs/vf_scale.c Fri Jan 1 00:09:35 2010 (r30154) +++ trunk/libmpcodecs/vf_scale.c Fri Jan 1 00:25:21 2010 (r30155) @@ -52,9 +52,15 @@ void sws_getFlagsAndFilterFromCmdLine(in static unsigned int outfmt_list[]={ // YUV: IMGFMT_444P, + IMGFMT_444P16_LE, + IMGFMT_444P16_BE, IMGFMT_422P, + IMGFMT_422P16_LE, + IMGFMT_422P16_BE, IMGFMT_YV12, IMGFMT_I420, + IMGFMT_420P16_LE, + IMGFMT_420P16_BE, IMGFMT_IYUV, IMGFMT_YVU9, IMGFMT_IF09, @@ -64,12 +70,6 @@ static unsigned int outfmt_list[]={ IMGFMT_YUY2, IMGFMT_UYVY, IMGFMT_440P, - IMGFMT_444P16_LE, - IMGFMT_444P16_BE, - IMGFMT_422P16_LE, - IMGFMT_422P16_BE, - IMGFMT_420P16_LE, - IMGFMT_420P16_BE, // RGB and grayscale (Y8 and Y800): IMGFMT_BGR32, IMGFMT_RGB32,

1 0

r30154 - in trunk/libmpcodecs: mp_image.c vf.c
by reimar 31 Dec '09

31 Dec '09

Author: reimar Date: Fri Jan 1 00:09:35 2010 New Revision: 30154 Log: Deduplicate the mp_image planes allocation code. The code in vf.c and mp_image.c is almost the same, though the one in vf.c is more up-to-date/has more bug fixes and thus is used as the basis (which is why the diff is so big). Modified: trunk/libmpcodecs/mp_image.c trunk/libmpcodecs/vf.c Modified: trunk/libmpcodecs/mp_image.c ============================================================================== --- trunk/libmpcodecs/mp_image.c Thu Dec 31 23:53:51 2009 (r30153) +++ trunk/libmpcodecs/mp_image.c Fri Jan 1 00:09:35 2010 (r30154) @@ -14,38 +14,48 @@ #include "libvo/fastmemcpy.h" -mp_image_t* alloc_mpi(int w, int h, unsigned long int fmt) { - mp_image_t* mpi = new_mp_image(w,h); - - mp_image_setfmt(mpi,fmt); +void mp_image_alloc_planes(mp_image_t *mpi) { // IF09 - allocate space for 4. plane delta info - unused - if (mpi->imgfmt == IMGFMT_IF09) - { - mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8+ - mpi->chroma_width*mpi->chroma_height); - /* delta table, just for fun ;) */ - mpi->planes[3]=mpi->planes[0]+2*(mpi->chroma_width*mpi->chroma_height); - } - else + if (mpi->imgfmt == IMGFMT_IF09) { + mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8+ + mpi->chroma_width*mpi->chroma_height); + /* export delta table */ + mpi->planes[3]=mpi->planes[0]+(mpi->width*mpi->height)+2*(mpi->chroma_width*mpi->chroma_height); + } else mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8); - if(mpi->flags&MP_IMGFLAG_PLANAR){ - int bpp = IMGFMT_IS_YUVP16(fmt)? 2 : 1; + if (mpi->flags&MP_IMGFLAG_PLANAR) { + int bpp = IMGFMT_IS_YUVP16(mpi->imgfmt)? 2 : 1; // YV12/I420/YVU9/IF09. feel free to add other planar formats here... - if(!mpi->stride[0]) mpi->stride[0]=bpp*mpi->width; - if(!mpi->stride[1]) mpi->stride[1]=mpi->stride[2]=bpp*mpi->chroma_width; - if(mpi->flags&MP_IMGFLAG_SWAPPED){ - // I420/IYUV (Y,U,V) - mpi->planes[1]=mpi->planes[0]+mpi->stride[0]*mpi->height; - mpi->planes[2]=mpi->planes[1]+mpi->stride[1]*mpi->chroma_height; + mpi->stride[0]=bpp*mpi->width; + if(mpi->num_planes > 2){ + mpi->stride[1]=mpi->stride[2]=bpp*mpi->chroma_width; + if(mpi->flags&MP_IMGFLAG_SWAPPED){ + // I420/IYUV (Y,U,V) + mpi->planes[1]=mpi->planes[0]+mpi->stride[0]*mpi->height; + mpi->planes[2]=mpi->planes[1]+mpi->stride[1]*mpi->chroma_height; + } else { + // YV12,YVU9,IF09 (Y,V,U) + mpi->planes[2]=mpi->planes[0]+mpi->stride[0]*mpi->height; + mpi->planes[1]=mpi->planes[2]+mpi->stride[1]*mpi->chroma_height; + } } else { - // YV12,YVU9,IF09 (Y,V,U) - mpi->planes[2]=mpi->planes[0]+mpi->stride[0]*mpi->height; - mpi->planes[1]=mpi->planes[2]+mpi->stride[1]*mpi->chroma_height; + // NV12/NV21 + mpi->stride[1]=mpi->chroma_width; + mpi->planes[1]=mpi->planes[0]+mpi->stride[0]*mpi->height; } } else { - if(!mpi->stride[0]) mpi->stride[0]=mpi->width*mpi->bpp/8; + mpi->stride[0]=mpi->width*mpi->bpp/8; + if (mpi->flags & MP_IMGFLAG_RGB_PALETTE) + mpi->planes[1] = memalign(64, 1024); } mpi->flags|=MP_IMGFLAG_ALLOCATED; +} + +mp_image_t* alloc_mpi(int w, int h, unsigned long int fmt) { + mp_image_t* mpi = new_mp_image(w,h); + + mp_image_setfmt(mpi,fmt); + mp_image_alloc_planes(mpi); return mpi; } Modified: trunk/libmpcodecs/vf.c ============================================================================== --- trunk/libmpcodecs/vf.c Thu Dec 31 23:53:51 2009 (r30153) +++ trunk/libmpcodecs/vf.c Fri Jan 1 00:09:35 2010 (r30154) @@ -372,47 +372,9 @@ mp_image_t* vf_get_image(vf_instance_t* } } - // IF09 - allocate space for 4. plane delta info - unused - if (mpi->imgfmt == IMGFMT_IF09) - { - mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8+ - mpi->chroma_width*mpi->chroma_height); - /* export delta table */ - mpi->planes[3]=mpi->planes[0]+(mpi->width*mpi->height)+2*(mpi->chroma_width*mpi->chroma_height); - } - else - mpi->planes[0]=memalign(64, mpi->bpp*mpi->width*(mpi->height+2)/8); - if(mpi->flags&MP_IMGFLAG_PLANAR){ - int bpp = IMGFMT_IS_YUVP16(mpi->imgfmt)? 2 : 1; - // YV12/I420/YVU9/IF09. feel free to add other planar formats here... - //if(!mpi->stride[0]) - mpi->stride[0]=bpp*mpi->width; - //if(!mpi->stride[1]) - if(mpi->num_planes > 2){ - mpi->stride[1]=mpi->stride[2]=bpp*mpi->chroma_width; - if(mpi->flags&MP_IMGFLAG_SWAPPED){ - // I420/IYUV (Y,U,V) - mpi->planes[1]=mpi->planes[0]+mpi->stride[0]*mpi->height; - mpi->planes[2]=mpi->planes[1]+mpi->stride[1]*mpi->chroma_height; - } else { - // YV12,YVU9,IF09 (Y,V,U) - mpi->planes[2]=mpi->planes[0]+mpi->stride[0]*mpi->height; - mpi->planes[1]=mpi->planes[2]+mpi->stride[1]*mpi->chroma_height; - } - } else { - // NV12/NV21 - mpi->stride[1]=mpi->chroma_width; - mpi->planes[1]=mpi->planes[0]+mpi->stride[0]*mpi->height; - } - } else { - //if(!mpi->stride[0]) - mpi->stride[0]=mpi->width*mpi->bpp/8; - if (mpi->flags & MP_IMGFLAG_RGB_PALETTE) - mpi->planes[1] = memalign(64, 1024); - } + mp_image_alloc_planes(mpi); // printf("clearing img!\n"); vf_mpi_clear(mpi,0,0,mpi->width,mpi->height); - mpi->flags|=MP_IMGFLAG_ALLOCATED; } } if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK)

1 0

r30153 - trunk/etc/codecs.conf
by reimar 31 Dec '09

31 Dec '09

Author: reimar Date: Thu Dec 31 23:53:51 2009 New Revision: 30153 Log: Add support for FFmpeg's ffv210 codec. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf Thu Dec 31 23:53:25 2009 (r30152) +++ trunk/etc/codecs.conf Thu Dec 31 23:53:51 2009 (r30153) @@ -2638,6 +2638,14 @@ videocodec qtsvq1 dll "QuickTime.qts" out YVU9 +videocodec ffv210 + info "FFmpeg V210 - 10-bit" + status untested + fourcc v210 + driver ffmpeg + dll v210 + out 422P16 + videocodec qtcine info "cinewave uncompressed 10-bit codec" status working

1 0