August 2017 - MPlayer-cvslog - lists.mplayerhq.hu

r37953 - trunk/mplayer.c
by reimar 30 Aug '17

30 Aug '17

Author: reimar Date: Wed Aug 30 23:16:40 2017 New Revision: 37953 Log: Restore frametime on seek. Fixes issue #2331. Modified: trunk/mplayer.c Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Wed Aug 30 22:49:50 2017 (r37952) +++ trunk/mplayer.c Wed Aug 30 23:16:40 2017 (r37953) @@ -3833,6 +3833,7 @@ goto_enable_cache: } else { frame_time = mpctx->sh_video->frametime; } + // mark as last frame. Note: needs to be reset on seeking mpctx->sh_video->frametime = -1; mpctx->sh_video->endpts = MP_NOPTS_VALUE; } @@ -4032,6 +4033,9 @@ goto_enable_cache: } } + // reset last frame marker + if (mpctx->sh_video->frametime < 0) + mpctx->sh_video->frametime = 1.0f / mpctx->sh_video->fps; rel_seek_secs = 0; abs_seek_pos = 0; loop_seek = 0;

1 0

r37952 - trunk/libmpcodecs/vd_ffmpeg.c
by reimar 30 Aug '17

30 Aug '17

Author: reimar Date: Wed Aug 30 22:49:50 2017 New Revision: 37952 Log: Work around FFmpeg get_buffer2 API change. Setting frame width/height to avctx width/height for hwaccel codecs results in cropping being applied twice. Fixes trac issue #2331. Modified: trunk/libmpcodecs/vd_ffmpeg.c Modified: trunk/libmpcodecs/vd_ffmpeg.c ============================================================================== --- trunk/libmpcodecs/vd_ffmpeg.c Sat Aug 26 23:51:25 2017 (r37951) +++ trunk/libmpcodecs/vd_ffmpeg.c Wed Aug 30 22:49:50 2017 (r37952) @@ -1159,7 +1159,7 @@ static int get_buffer2(AVCodecContext *a */ CompatReleaseBufPriv *priv = NULL; AVBufferRef *dummy_buf = NULL; - int planes, i, ret; + int planes, i, ret, w = avctx->width, h = avctx->height; ret = get_buffer(avctx, frame, flags & AV_GET_BUFFER_FLAG_REF); if (ret < 0) @@ -1209,8 +1209,14 @@ do { planes = av_pix_fmt_count_planes(frame->format); /* workaround for AVHWAccel plane count of 0, buf[0] is used as check for allocated buffers: make libavcodec happy */ - if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL) + /* newest FFmpeg versions in addition need to coded_width + * as frame width value in case of hwaccel codecs or they + * will apply the cropping amount twice */ + if (desc && desc->flags & AV_PIX_FMT_FLAG_HWACCEL) { planes = 1; + w = avctx->coded_width; + h = avctx->coded_height; + } if (!desc || planes <= 0) { ret = AVERROR(EINVAL); goto fail; @@ -1227,8 +1233,8 @@ do { av_buffer_unref(&dummy_buf); end0: - frame->width = avctx->width; - frame->height = avctx->height; + frame->width = w; + frame->height = h; return 0;

1 0

r37951 - trunk/libvo/vo_xv.c
by al 26 Aug '17

26 Aug '17

Author: al Date: Sat Aug 26 23:51:25 2017 New Revision: 37951 Log: vo_xv: Support NV12/21 Based-on-a-patch-by: Ville Syrjälä >syrjala sci fi< Modified: trunk/libvo/vo_xv.c Modified: trunk/libvo/vo_xv.c ============================================================================== --- trunk/libvo/vo_xv.c Sat Aug 26 23:44:15 2017 (r37950) +++ trunk/libvo/vo_xv.c Sat Aug 26 23:51:25 2017 (r37951) @@ -413,6 +413,18 @@ static int draw_slice(uint8_t * image[], memcpy_pic(dst, image[idx_p2], w, h, xvimage[current_buf]->pitches[2], stride[idx_p2]); break; + case IMGFMT_NV12: + case IMGFMT_NV21: + x &= ~1; + y /= 2; + w &= ~1; + h /= 2; + + dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + + xvimage[current_buf]->pitches[1] * y + x; + memcpy_pic(dst, image[idx_p1], w, h, xvimage[current_buf]->pitches[1], + stride[idx_p1]); + break; } return 0; @@ -496,6 +508,13 @@ static uint32_t get_image(mp_image_t * m mpi->stride[1] = xvimage[current_buf]->pitches[idx_p1]; mpi->stride[2] = xvimage[current_buf]->pitches[idx_p2]; break; + case IMGFMT_NV12: + case IMGFMT_NV21: + mpi->planes[1] = + xvimage[current_buf]->data + + xvimage[current_buf]->offsets[1]; + mpi->stride[1] = xvimage[current_buf]->pitches[1]; + break; } mpi->flags |= MP_IMGFLAG_DIRECT; mpi->priv = (void *)(intptr_t)current_buf; @@ -511,6 +530,8 @@ static int is_supported_format(uint32_t case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: + case IMGFMT_NV12: + case IMGFMT_NV21: return 1; default: return !mp_get_chroma_shift(image_format, NULL, NULL, NULL);

1 0

r37950 - trunk/libvo/vo_xv.c
by al 26 Aug '17

26 Aug '17

Author: al Date: Sat Aug 26 23:44:15 2017 New Revision: 37950 Log: vo xv: Limit output formats to what the vo actually supports Assumes the format IDs (FourCCs in this case) are the same in MPlayer and Xvideo. That assumption is nothing new, but it was never checked if in case of a match, we actually supported that image format in vo xv. Also fixes crashes for cases where the Xvideo driver actually supports more formats than the vo does like NV12. Modified: trunk/libvo/vo_xv.c Modified: trunk/libvo/vo_xv.c ============================================================================== --- trunk/libvo/vo_xv.c Sat Aug 26 23:39:18 2017 (r37949) +++ trunk/libvo/vo_xv.c Sat Aug 26 23:44:15 2017 (r37950) @@ -396,7 +396,8 @@ static int draw_slice(uint8_t * image[], switch (image_format) { case IMGFMT_YV12: idx_p1 = 2; idx_p2 = 1; - default: + case IMGFMT_I420: + case IMGFMT_IYUV: x /= 2; y /= 2; w /= 2; @@ -484,7 +485,8 @@ static uint32_t get_image(mp_image_t * m switch (image_format) { case IMGFMT_YV12: idx_p1 = 2; idx_p2 = 1; - default: + case IMGFMT_I420: + case IMGFMT_IYUV: mpi->planes[1] = xvimage[current_buf]->data + xvimage[current_buf]->offsets[idx_p1]; @@ -503,10 +505,25 @@ static uint32_t get_image(mp_image_t * m return VO_FALSE; } +static int is_supported_format(uint32_t format) +{ + switch (format) { + case IMGFMT_YV12: + case IMGFMT_I420: + case IMGFMT_IYUV: + return 1; + default: + return !mp_get_chroma_shift(image_format, NULL, NULL, NULL); + } +} + static int query_format(uint32_t format) { uint32_t i; int flag = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_HWSCALE_UP | VFCAP_HWSCALE_DOWN | VFCAP_OSD | VFCAP_ACCEPT_STRIDE; // FIXME! check for DOWN + if (!is_supported_format(format)) { + return 0; + } /* check image formats */ for (i = 0; i < formats; i++)

1 0

r37949 - trunk/libvo/vo_xv.c
by al 26 Aug '17

26 Aug '17

Author: al Date: Sat Aug 26 23:39:18 2017 New Revision: 37949 Log: vo_xv: cosmetics: Fix indentation after previous commits Modified: trunk/libvo/vo_xv.c Modified: trunk/libvo/vo_xv.c ============================================================================== --- trunk/libvo/vo_xv.c Sat Aug 26 23:36:28 2017 (r37948) +++ trunk/libvo/vo_xv.c Sat Aug 26 23:39:18 2017 (r37949) @@ -397,20 +397,20 @@ static int draw_slice(uint8_t * image[], case IMGFMT_YV12: idx_p1 = 2; idx_p2 = 1; default: - x /= 2; - y /= 2; - w /= 2; - h /= 2; + x /= 2; + y /= 2; + w /= 2; + h /= 2; - dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + - xvimage[current_buf]->pitches[1] * y + x; + dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + + xvimage[current_buf]->pitches[1] * y + x; memcpy_pic(dst, image[idx_p1], w, h, xvimage[current_buf]->pitches[1], - stride[idx_p1]); + stride[idx_p1]); - dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + - xvimage[current_buf]->pitches[2] * y + x; + dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + + xvimage[current_buf]->pitches[2] * y + x; memcpy_pic(dst, image[idx_p2], w, h, xvimage[current_buf]->pitches[2], - stride[idx_p2]); + stride[idx_p2]); break; } @@ -485,14 +485,14 @@ static uint32_t get_image(mp_image_t * m case IMGFMT_YV12: idx_p1 = 2; idx_p2 = 1; default: - mpi->planes[1] = - xvimage[current_buf]->data + - xvimage[current_buf]->offsets[idx_p1]; - mpi->planes[2] = - xvimage[current_buf]->data + - xvimage[current_buf]->offsets[idx_p2]; - mpi->stride[1] = xvimage[current_buf]->pitches[idx_p1]; - mpi->stride[2] = xvimage[current_buf]->pitches[idx_p2]; + mpi->planes[1] = + xvimage[current_buf]->data + + xvimage[current_buf]->offsets[idx_p1]; + mpi->planes[2] = + xvimage[current_buf]->data + + xvimage[current_buf]->offsets[idx_p2]; + mpi->stride[1] = xvimage[current_buf]->pitches[idx_p1]; + mpi->stride[2] = xvimage[current_buf]->pitches[idx_p2]; break; } mpi->flags |= MP_IMGFLAG_DIRECT;

1 0

r37948 - trunk/libvo/vo_xv.c
by al 26 Aug '17

26 Aug '17

Author: al Date: Sat Aug 26 23:36:28 2017 New Revision: 37948 Log: vo_xv: When copying planes use the associated pitch This probably never mattered as the chroma planes probably always had used the same pitch value in their layouts. Modified: trunk/libvo/vo_xv.c Modified: trunk/libvo/vo_xv.c ============================================================================== --- trunk/libvo/vo_xv.c Sat Aug 26 23:34:40 2017 (r37947) +++ trunk/libvo/vo_xv.c Sat Aug 26 23:36:28 2017 (r37948) @@ -409,7 +409,7 @@ static int draw_slice(uint8_t * image[], dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + xvimage[current_buf]->pitches[2] * y + x; - memcpy_pic(dst, image[idx_p2], w, h, xvimage[current_buf]->pitches[1], + memcpy_pic(dst, image[idx_p2], w, h, xvimage[current_buf]->pitches[2], stride[idx_p2]); break; }

1 0

r37947 - trunk/libvo/vo_xv.c
by al 26 Aug '17

26 Aug '17

Author: al Date: Sat Aug 26 23:34:40 2017 New Revision: 37947 Log: vo_xv: Simplify plane swapping Modified: trunk/libvo/vo_xv.c Modified: trunk/libvo/vo_xv.c ============================================================================== --- trunk/libvo/vo_xv.c Mon Jul 3 22:00:43 2017 (r37946) +++ trunk/libvo/vo_xv.c Sat Aug 26 23:34:40 2017 (r37947) @@ -386,12 +386,17 @@ static int draw_slice(uint8_t * image[], int x, int y) { uint8_t *dst; + int idx_p1 = 1, idx_p2 = 2; dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0] + xvimage[current_buf]->pitches[0] * y + x; memcpy_pic(dst, image[0], w, h, xvimage[current_buf]->pitches[0], stride[0]); + switch (image_format) { + case IMGFMT_YV12: + idx_p1 = 2; idx_p2 = 1; + default: x /= 2; y /= 2; w /= 2; @@ -399,21 +404,15 @@ static int draw_slice(uint8_t * image[], dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[1] + xvimage[current_buf]->pitches[1] * y + x; - if (image_format != IMGFMT_YV12) - memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], - stride[1]); - else - memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], - stride[2]); + memcpy_pic(dst, image[idx_p1], w, h, xvimage[current_buf]->pitches[1], + stride[idx_p1]); dst = xvimage[current_buf]->data + xvimage[current_buf]->offsets[2] + xvimage[current_buf]->pitches[2] * y + x; - if (image_format == IMGFMT_YV12) - memcpy_pic(dst, image[1], w, h, xvimage[current_buf]->pitches[1], - stride[1]); - else - memcpy_pic(dst, image[2], w, h, xvimage[current_buf]->pitches[1], - stride[2]); + memcpy_pic(dst, image[idx_p2], w, h, xvimage[current_buf]->pitches[1], + stride[idx_p2]); + break; + } return 0; } @@ -476,36 +475,25 @@ static uint32_t get_image(mp_image_t * m if ((mpi->flags & (MP_IMGFLAG_ACCEPT_STRIDE | MP_IMGFLAG_ACCEPT_WIDTH)) || (mpi->width * (mpi->bpp / 8) == xvimage[buf]->pitches[0])) { + int idx_p1 = 1, idx_p2 = 2; current_buf = buf; mpi->planes[0] = xvimage[current_buf]->data + xvimage[current_buf]->offsets[0]; mpi->stride[0] = xvimage[current_buf]->pitches[0]; mpi->width = mpi->stride[0] / (mpi->bpp / 8); - if (mpi->flags & MP_IMGFLAG_PLANAR) - { - if (mpi->flags & MP_IMGFLAG_SWAPPED) - { - // I420 - mpi->planes[1] = - xvimage[current_buf]->data + - xvimage[current_buf]->offsets[1]; - mpi->planes[2] = - xvimage[current_buf]->data + - xvimage[current_buf]->offsets[2]; - mpi->stride[1] = xvimage[current_buf]->pitches[1]; - mpi->stride[2] = xvimage[current_buf]->pitches[2]; - } else - { - // YV12 + switch (image_format) { + case IMGFMT_YV12: + idx_p1 = 2; idx_p2 = 1; + default: mpi->planes[1] = xvimage[current_buf]->data + - xvimage[current_buf]->offsets[2]; + xvimage[current_buf]->offsets[idx_p1]; mpi->planes[2] = xvimage[current_buf]->data + - xvimage[current_buf]->offsets[1]; - mpi->stride[1] = xvimage[current_buf]->pitches[2]; - mpi->stride[2] = xvimage[current_buf]->pitches[1]; - } + xvimage[current_buf]->offsets[idx_p2]; + mpi->stride[1] = xvimage[current_buf]->pitches[idx_p1]; + mpi->stride[2] = xvimage[current_buf]->pitches[idx_p2]; + break; } mpi->flags |= MP_IMGFLAG_DIRECT; mpi->priv = (void *)(intptr_t)current_buf;

1 0