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

r37784 - trunk/libmpcodecs/mp_image.c
by rtogni 21 Feb '16

21 Feb '16

Author: rtogni Date: Sun Feb 21 01:59:05 2016 New Revision: 37784 Log: Add support for YUV440P12, YUV440P10, and GBRP10 colorspaces Add allocation part missing from r37783 Modified: trunk/libmpcodecs/mp_image.c Modified: trunk/libmpcodecs/mp_image.c ============================================================================== --- trunk/libmpcodecs/mp_image.c Sun Feb 21 01:50:57 2016 (r37783) +++ trunk/libmpcodecs/mp_image.c Sun Feb 21 01:59:05 2016 (r37784) @@ -144,6 +144,10 @@ void mp_image_setfmt(mp_image_t* mpi,uns mpi->bpp=24; mpi->flags|=MP_IMGFLAG_PLANAR; return; + } else if (out_fmt == IMGFMT_GBR10P) { + mpi->bpp=30; + mpi->flags|=MP_IMGFLAG_PLANAR; + return; } else if (out_fmt == IMGFMT_GBR12P) { mpi->bpp=36; mpi->flags|=MP_IMGFLAG_PLANAR; @@ -206,6 +210,10 @@ void mp_image_setfmt(mp_image_t* mpi,uns case IMGFMT_420P10_BE: case IMGFMT_420P9_LE: case IMGFMT_420P9_BE: + case IMGFMT_440P12_LE: + case IMGFMT_440P12_BE: + case IMGFMT_440P10_LE: + case IMGFMT_440P10_BE: return; case IMGFMT_Y16_LE: case IMGFMT_Y16_BE:

1 0

r37783 - in trunk: codec-cfg.c fmt-conversion.c libmpcodecs/img_format.c libmpcodecs/img_format.h libmpcodecs/vf_scale.c m_option.c
by rtogni 21 Feb '16

21 Feb '16

Author: rtogni Date: Sun Feb 21 01:50:57 2016 New Revision: 37783 Log: Add support for YUV440P12, YUV440P10, and GBRP10 colorspaces Modified: trunk/codec-cfg.c trunk/fmt-conversion.c trunk/libmpcodecs/img_format.c trunk/libmpcodecs/img_format.h trunk/libmpcodecs/vf_scale.c trunk/m_option.c Modified: trunk/codec-cfg.c ============================================================================== --- trunk/codec-cfg.c Sun Feb 21 01:43:18 2016 (r37782) +++ trunk/codec-cfg.c Sun Feb 21 01:50:57 2016 (r37783) @@ -189,6 +189,8 @@ static const struct { {"422P12", IMGFMT_422P12}, {"422P10", IMGFMT_422P10}, {"422P9", IMGFMT_422P9}, + {"440P12", IMGFMT_440P12}, + {"440P10", IMGFMT_440P10}, {"420P16", IMGFMT_420P16}, {"420P14", IMGFMT_420P14}, {"420P12", IMGFMT_420P12}, @@ -241,6 +243,7 @@ static const struct { {"GBR24P", IMGFMT_GBR24P}, {"GBR12P", IMGFMT_GBR12P}, {"GBR14P", IMGFMT_GBR14P}, + {"GBR10P", IMGFMT_GBR10P}, {"MPES", IMGFMT_MPEGPES}, {"ZRMJPEGNI", IMGFMT_ZRMJPEGNI}, Modified: trunk/fmt-conversion.c ============================================================================== --- trunk/fmt-conversion.c Sun Feb 21 01:43:18 2016 (r37782) +++ trunk/fmt-conversion.c Sun Feb 21 01:50:57 2016 (r37783) @@ -69,6 +69,8 @@ static const struct { { IMGFMT_422A, AV_PIX_FMT_YUVA422P }, { IMGFMT_444A, AV_PIX_FMT_YUVA444P }, { IMGFMT_GBR24P, AV_PIX_FMT_GBRP }, + { IMGFMT_GBR10PLE, AV_PIX_FMT_GBRP10LE }, + { IMGFMT_GBR10PBE, AV_PIX_FMT_GBRP10BE }, { IMGFMT_GBR12PLE, AV_PIX_FMT_GBRP12LE }, { IMGFMT_GBR12PBE, AV_PIX_FMT_GBRP12BE }, { IMGFMT_GBR14PLE, AV_PIX_FMT_GBRP14LE }, @@ -77,6 +79,8 @@ static const struct { { IMGFMT_420P14_BE, AV_PIX_FMT_YUV420P14BE }, { IMGFMT_420P12_LE, AV_PIX_FMT_YUV420P12LE }, { IMGFMT_420P12_BE, AV_PIX_FMT_YUV420P12BE }, + { IMGFMT_440P12_LE, AV_PIX_FMT_YUV440P12LE }, + { IMGFMT_440P12_BE, AV_PIX_FMT_YUV440P12BE }, { IMGFMT_422P14_LE, AV_PIX_FMT_YUV422P14LE }, { IMGFMT_422P14_BE, AV_PIX_FMT_YUV422P14BE }, { IMGFMT_422P12_LE, AV_PIX_FMT_YUV422P12LE }, @@ -112,6 +116,8 @@ static const struct { { IMGFMT_420P10_BE, AV_PIX_FMT_YUV420P10BE }, { IMGFMT_420P9_LE, AV_PIX_FMT_YUV420P9LE }, { IMGFMT_420P9_BE, AV_PIX_FMT_YUV420P9BE }, + { IMGFMT_440P10_LE, AV_PIX_FMT_YUV440P10LE }, + { IMGFMT_440P10_BE, AV_PIX_FMT_YUV440P10BE }, { IMGFMT_422P16_LE, AV_PIX_FMT_YUV422P16LE }, { IMGFMT_422P16_BE, AV_PIX_FMT_YUV422P16BE }, { IMGFMT_422P10_LE, AV_PIX_FMT_YUV422P10LE }, Modified: trunk/libmpcodecs/img_format.c ============================================================================== --- trunk/libmpcodecs/img_format.c Sun Feb 21 01:43:18 2016 (r37782) +++ trunk/libmpcodecs/img_format.c Sun Feb 21 01:50:57 2016 (r37783) @@ -57,6 +57,7 @@ const char *vo_format_name(int format) case IMGFMT_XYZ12LE: return "XYZ 36-bit LE"; case IMGFMT_XYZ12BE: return "XYZ 36-bit BE"; case IMGFMT_GBR24P: return "Planar GBR 24-bit"; + case IMGFMT_GBR10P: return "Planar GBR 30-bit"; case IMGFMT_GBR12P: return "Planar GBR 36-bit"; case IMGFMT_GBR14P: return "Planar GBR 42-bit"; case IMGFMT_YVU9: return "Planar YVU9"; @@ -80,6 +81,10 @@ const char *vo_format_name(int format) case IMGFMT_420P10_BE: return "Planar 420P 10-bit big-endian"; case IMGFMT_420P9_LE: return "Planar 420P 9-bit little-endian"; case IMGFMT_420P9_BE: return "Planar 420P 9-bit big-endian"; + case IMGFMT_440P12_LE: return "Planar 440P 12-bit little-endian"; + case IMGFMT_440P12_BE: return "Planar 440P 12-bit big-endian"; + case IMGFMT_440P10_LE: return "Planar 440P 10-bit little-endian"; + case IMGFMT_440P10_BE: return "Planar 440P 10-bit big-endian"; case IMGFMT_422P16_LE: return "Planar 422P 16-bit little-endian"; case IMGFMT_422P16_BE: return "Planar 422P 16-bit big-endian"; case IMGFMT_422P14_LE: return "Planar 422P 14-bit little-endian"; Modified: trunk/libmpcodecs/img_format.h ============================================================================== --- trunk/libmpcodecs/img_format.h Sun Feb 21 01:43:18 2016 (r37782) +++ trunk/libmpcodecs/img_format.h Sun Feb 21 01:50:57 2016 (r37783) @@ -59,6 +59,8 @@ #define IMGFMT_XYZ12BE (IMGFMT_XYZ|12|128) #define IMGFMT_GBR24P (('G'<<24)|('B'<<16)|('R'<<8)|24) +#define IMGFMT_GBR10PLE (('G'<<24)|('B'<<16)|('R'<<8)|30) +#define IMGFMT_GBR10PBE (('G'<<24)|('B'<<16)|('R'<<8)|30|128) #define IMGFMT_GBR12PLE (('G'<<24)|('B'<<16)|('R'<<8)|36) #define IMGFMT_GBR12PBE (('G'<<24)|('B'<<16)|('R'<<8)|36|128) #define IMGFMT_GBR14PLE (('G'<<24)|('B'<<16)|('R'<<8)|42) @@ -85,6 +87,7 @@ #define IMGFMT_BGR16BE IMGFMT_BGR16 #define IMGFMT_BGR16LE (IMGFMT_BGR16|128) #define IMGFMT_XYZ12 IMGFMT_XYZ12BE +#define IMGFMT_GBR10P IMGFMT_GBR10PBE #define IMGFMT_GBR12P IMGFMT_GBR12PBE #define IMGFMT_GBR14P IMGFMT_GBR14PBE #else @@ -108,6 +111,7 @@ #define IMGFMT_BGR16BE (IMGFMT_BGR16|128) #define IMGFMT_BGR16LE IMGFMT_BGR16 #define IMGFMT_XYZ12 IMGFMT_XYZ12LE +#define IMGFMT_GBR10P IMGFMT_GBR10PLE #define IMGFMT_GBR12P IMGFMT_GBR12PLE #define IMGFMT_GBR14P IMGFMT_GBR14PLE #endif @@ -176,6 +180,10 @@ #define IMGFMT_422P10_BE 0x34323252 #define IMGFMT_422P9_LE 0x53323234 #define IMGFMT_422P9_BE 0x34323253 +#define IMGFMT_440P12_LE 0x55303434 +#define IMGFMT_440P12_BE 0x34343055 +#define IMGFMT_440P10_LE 0x52303434 +#define IMGFMT_440P10_BE 0x34343052 #define IMGFMT_420P16_LE 0x51303234 #define IMGFMT_420P16_BE 0x34323051 #define IMGFMT_420P14_LE 0x54303234 @@ -197,6 +205,8 @@ #define IMGFMT_422P12 IMGFMT_422P12_BE #define IMGFMT_422P10 IMGFMT_422P10_BE #define IMGFMT_422P9 IMGFMT_422P9_BE +#define IMGFMT_440P12 IMGFMT_440P12_BE +#define IMGFMT_440P10 IMGFMT_440P10_BE #define IMGFMT_420P16 IMGFMT_420P16_BE #define IMGFMT_420P14 IMGFMT_420P14_BE #define IMGFMT_420P12 IMGFMT_420P12_BE @@ -215,6 +225,8 @@ #define IMGFMT_422P12 IMGFMT_422P12_LE #define IMGFMT_422P10 IMGFMT_422P10_LE #define IMGFMT_422P9 IMGFMT_422P9_LE +#define IMGFMT_440P12 IMGFMT_440P12_LE +#define IMGFMT_440P10 IMGFMT_440P10_LE #define IMGFMT_420P16 IMGFMT_420P16_LE #define IMGFMT_420P14 IMGFMT_420P14_LE #define IMGFMT_420P12 IMGFMT_420P12_LE Modified: trunk/libmpcodecs/vf_scale.c ============================================================================== --- trunk/libmpcodecs/vf_scale.c Sun Feb 21 01:43:18 2016 (r37782) +++ trunk/libmpcodecs/vf_scale.c Sun Feb 21 01:50:57 2016 (r37783) @@ -99,6 +99,10 @@ static const unsigned int outfmt_list[]= IMGFMT_420P10_BE, IMGFMT_420P9_LE, IMGFMT_420P9_BE, + IMGFMT_440P12_LE, + IMGFMT_440P12_BE, + IMGFMT_440P10_LE, + IMGFMT_440P10_BE, IMGFMT_420A, IMGFMT_422A, IMGFMT_444A, @@ -117,6 +121,8 @@ static const unsigned int outfmt_list[]= IMGFMT_BGR24, IMGFMT_RGB24, IMGFMT_GBR24P, + IMGFMT_GBR10PLE, + IMGFMT_GBR10PBE, IMGFMT_GBR12PLE, IMGFMT_GBR12PBE, IMGFMT_GBR14PLE, Modified: trunk/m_option.c ============================================================================== --- trunk/m_option.c Sun Feb 21 01:43:18 2016 (r37782) +++ trunk/m_option.c Sun Feb 21 01:50:57 2016 (r37783) @@ -1091,6 +1091,10 @@ static struct { {"422p10be", IMGFMT_422P10_BE}, {"422p9le", IMGFMT_422P9_LE}, {"422p9be", IMGFMT_422P9_BE}, + {"440p12le", IMGFMT_440P12_LE}, + {"440p12be", IMGFMT_440P12_BE}, + {"440p10le", IMGFMT_440P10_LE}, + {"440p10be", IMGFMT_440P10_BE}, {"420p16le", IMGFMT_420P16_LE}, {"420p16be", IMGFMT_420P16_BE}, {"420p14le", IMGFMT_420P14_LE}, @@ -1166,6 +1170,8 @@ static struct { {"gbr14ple", IMGFMT_GBR14PBE}, {"gbr12pbe", IMGFMT_GBR12PLE}, {"gbr12ple", IMGFMT_GBR12PBE}, + {"gbr10pbe", IMGFMT_GBR10PLE}, + {"gbr10ple", IMGFMT_GBR10PBE}, {"gbr24p", IMGFMT_GBR24P}, {"mjpeg", IMGFMT_MJPEG}, {"mjpg", IMGFMT_MJPEG},

1 0

r37782 - trunk/m_option.c
by rtogni 21 Feb '16

21 Feb '16

Author: rtogni Date: Sun Feb 21 01:43:18 2016 New Revision: 37782 Log: Add missing 420p14 and 420p12 image formats Modified: trunk/m_option.c Modified: trunk/m_option.c ============================================================================== --- trunk/m_option.c Sun Feb 21 01:17:00 2016 (r37781) +++ trunk/m_option.c Sun Feb 21 01:43:18 2016 (r37782) @@ -1093,6 +1093,10 @@ static struct { {"422p9be", IMGFMT_422P9_BE}, {"420p16le", IMGFMT_420P16_LE}, {"420p16be", IMGFMT_420P16_BE}, + {"420p14le", IMGFMT_420P14_LE}, + {"420p14be", IMGFMT_420P14_BE}, + {"420p12le", IMGFMT_420P12_LE}, + {"420p12be", IMGFMT_420P12_BE}, {"420p10le", IMGFMT_420P10_LE}, {"420p10be", IMGFMT_420P10_BE}, {"420p9le", IMGFMT_420P9_LE},

1 0

r37780 - in trunk/libmpcodecs: img_format.c img_format.h
by rtogni 21 Feb '16

21 Feb '16

Author: rtogni Date: Sun Feb 21 01:04:42 2016 New Revision: 37780 Log: Fix playback of YUV4xxP12 and YUV4xxP14 Set the correct bpp value for the formats, and make them recognized as YUV4xxP16-like formats Modified: trunk/libmpcodecs/img_format.c trunk/libmpcodecs/img_format.h Modified: trunk/libmpcodecs/img_format.c ============================================================================== --- trunk/libmpcodecs/img_format.c Sat Feb 20 23:16:03 2016 (r37779) +++ trunk/libmpcodecs/img_format.c Sun Feb 21 01:04:42 2016 (r37780) @@ -169,6 +169,12 @@ int mp_get_chroma_shift(int format, int case 0x53: bits = 9; break; + case 0x54: + bits = 14; + break; + case 0x55: + bits = 12; + break; default: err = 1; break; Modified: trunk/libmpcodecs/img_format.h ============================================================================== --- trunk/libmpcodecs/img_format.h Sat Feb 20 23:16:03 2016 (r37779) +++ trunk/libmpcodecs/img_format.h Sun Feb 21 01:04:42 2016 (r37780) @@ -224,8 +224,8 @@ #define IMGFMT_IS_YUVP16_NE(fmt) IMGFMT_IS_YUVP16_LE(fmt) #endif -#define IMGFMT_IS_YUVP16_LE(fmt) (((fmt - 0x51000034) & 0xfc0000ff) == 0) -#define IMGFMT_IS_YUVP16_BE(fmt) (((fmt - 0x34000051) & 0xff0000fc) == 0) +#define IMGFMT_IS_YUVP16_LE(fmt) (((fmt - 0x51000034) & 0xf80000ff) == 0) +#define IMGFMT_IS_YUVP16_BE(fmt) (((fmt - 0x34000051) & 0xff0000f8) == 0) #define IMGFMT_IS_YUVP16(fmt) (IMGFMT_IS_YUVP16_LE(fmt) || IMGFMT_IS_YUVP16_BE(fmt)) /**

1 0

r37779 - trunk/configure
by rtogni 21 Feb '16

21 Feb '16

Author: rtogni Date: Sat Feb 20 23:16:03 2016 New Revision: 37779 Log: Fix compilation if v4l2_query_ext_ctrl is not defined in linux/videodev2.h The attached patch fixes a build error if the header linux/videodev2.h defines struct v4l2_ext_controls, but not struct v4l2_query_ext_ctrl. This is the case on Ubuntu 14.04.4 LTS, for example. Fixes compilation after r37746 for affected systems. Patch by Erik Auerswald auerswal at unix-ag uni-kl de Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Feb 20 17:08:39 2016 (r37778) +++ trunk/configure Sat Feb 20 23:16:03 2016 (r37779) @@ -7760,7 +7760,11 @@ if test "$_pvr" = auto && test "$_tv_v4l cat > $TMPC <<EOF #include <sys/time.h> #include <linux/videodev2.h> -int main(void) { struct v4l2_ext_controls ext; return ext.controls->value; } +int main(void) { + struct v4l2_ext_controls ext; + struct v4l2_query_ext_ctrl qctrl; + return ext.controls->value; +} EOF cc_check && _pvr=yes fi

1 0

r37778 - trunk/libmpdemux/demuxer.c
by reimar 20 Feb '16

20 Feb '16

Author: reimar Date: Sat Feb 20 17:08:39 2016 New Revision: 37778 Log: demuxer: fall back to audio pts if all others are unavailable. Fixes issue #1928. Modified: trunk/libmpdemux/demuxer.c Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c Sat Feb 20 14:30:50 2016 (r37777) +++ trunk/libmpdemux/demuxer.c Sat Feb 20 17:08:39 2016 (r37778) @@ -1524,10 +1524,13 @@ double demuxer_get_current_time(demuxer_ { double get_time_ans = 0; sh_video_t *sh_video = demuxer->video->sh; + sh_audio_t *sh_audio = demuxer->audio->sh; if (demuxer->stream_pts != MP_NOPTS_VALUE) get_time_ans = demuxer->stream_pts; - else if (sh_video) + else if (sh_video && sh_video->pts != MP_NOPTS_VALUE) get_time_ans = sh_video->pts; + else if (sh_audio && sh_audio->pts != MP_NOPTS_VALUE) + get_time_ans = sh_audio->pts; return get_time_ans; }

1 0

r37777 - trunk/libvo/mga_template.c
by reimar 20 Feb '16

20 Feb '16

Author: reimar Date: Sat Feb 20 14:30:50 2016 New Revision: 37777 Log: mga_template: Check for ioctl failure. Modified: trunk/libvo/mga_template.c Modified: trunk/libvo/mga_template.c ============================================================================== --- trunk/libvo/mga_template.c Sat Feb 20 14:28:58 2016 (r37776) +++ trunk/libvo/mga_template.c Sat Feb 20 14:30:50 2016 (r37777) @@ -479,8 +479,7 @@ static int preinit(const char *vo_subdev // check whether the mga_vid driver has the same // version as we expect - ioctl(f,MGA_VID_GET_VERSION,&ver); - if(MGA_VID_VERSION != ver) + if(ioctl(f,MGA_VID_GET_VERSION,&ver) == -1 || MGA_VID_VERSION != ver) { mp_msg(MSGT_VO, MSGL_ERR, MSGTR_LIBVO_MGA_mgavidVersionMismatch, ver, MGA_VID_VERSION); return -1;

1 0

r37776 - trunk/input/appleir.c
by reimar 20 Feb '16

20 Feb '16

Author: reimar Date: Sat Feb 20 14:28:58 2016 New Revision: 37776 Log: appleir: check for ioctl error. Modified: trunk/input/appleir.c Modified: trunk/input/appleir.c ============================================================================== --- trunk/input/appleir.c Sat Feb 20 14:26:38 2016 (r37775) +++ trunk/input/appleir.c Sat Feb 20 14:28:58 2016 (r37776) @@ -103,8 +103,8 @@ int mp_input_appleir_init (char *dev) if (fd < 0) continue; - ioctl (fd, EVIOCGID, &id); - if (id.bustype == BUS_USB && + if (ioctl(fd, EVIOCGID, &id) != -1 && + id.bustype == BUS_USB && id.vendor == USB_VENDOR_APPLE && (id.product == USB_DEV_APPLE_IR ||id.product == USB_DEV_APPLE_IR_2)) {

1 0

r37775 - trunk/sub/font_load_ft.c
by reimar 20 Feb '16

20 Feb '16

Author: reimar Date: Sat Feb 20 14:26:38 2016 New Revision: 37775 Log: font_load_ft: check FcPatternGet* return values. Avoids Coverity warnings. Modified: trunk/sub/font_load_ft.c Modified: trunk/sub/font_load_ft.c ============================================================================== --- trunk/sub/font_load_ft.c Sat Feb 20 14:21:49 2016 (r37774) +++ trunk/sub/font_load_ft.c Sat Feb 20 14:26:38 2016 (r37775) @@ -1137,8 +1137,8 @@ void load_font_ft(int width, int height, fc_pattern = FcFontMatch(0, fc_pattern, &result); if (fc_pattern) { FcPatternDestroy(fc_pattern2); - FcPatternGetBool(fc_pattern, FC_SCALABLE, 0, &scalable); - if (scalable != FcTrue) { + if (FcPatternGetBool(fc_pattern, FC_SCALABLE, 0, &scalable) == FcResultMatch && + scalable != FcTrue) { FcPatternDestroy(fc_pattern); fc_pattern = FcNameParse("sans-serif"); FcConfigSubstitute(0, fc_pattern, FcMatchPattern); @@ -1148,11 +1148,13 @@ void load_font_ft(int width, int height, FcPatternDestroy(fc_pattern2); } // s doesn't need to be freed according to fontconfig docs - FcPatternGetString(fc_pattern, FC_FILE, 0, &s); - FcPatternGetInteger(fc_pattern, FC_INDEX, 0, &face_index); - *fontp=read_font_desc_ft(s, face_index, width, height, font_scale_factor); + if (FcPatternGetString(fc_pattern, FC_FILE, 0, &s) == FcResultMatch && + FcPatternGetInteger(fc_pattern, FC_INDEX, 0, &face_index) == FcResultMatch) { + *fontp=read_font_desc_ft(s, face_index, width, height, font_scale_factor); + FcPatternDestroy(fc_pattern); + return; + } FcPatternDestroy(fc_pattern); - return; } // Failed to match any font, try without fontconfig mp_msg(MSGT_OSD, MSGL_ERR, MSGTR_LIBVO_FONT_LOAD_FT_FontconfigNoMatch);

1 0

r37774 - trunk/stream/stream_dvdnav.c
by reimar 20 Feb '16

20 Feb '16

Author: reimar Date: Sat Feb 20 14:21:49 2016 New Revision: 37774 Log: stream_dvdnav: check dvdnav_current_title_info return value. Modified: trunk/stream/stream_dvdnav.c Modified: trunk/stream/stream_dvdnav.c ============================================================================== --- trunk/stream/stream_dvdnav.c Sat Feb 20 14:19:24 2016 (r37773) +++ trunk/stream/stream_dvdnav.c Sat Feb 20 14:21:49 2016 (r37774) @@ -668,8 +668,7 @@ void mp_dvdnav_handle_input(stream_t *st case MP_CMD_DVDNAV_PREVMENU: { int title=0, part=0; - dvdnav_current_title_info(nav, &title, &part); - if(title) { + if(dvdnav_current_title_info(nav, &title, &part) == DVDNAV_STATUS_OK && title) { if((status=dvdnav_menu_call(nav, DVD_MENU_Part)) == DVDNAV_STATUS_OK) break; }

1 0