March 2021 - MPlayer-dev-eng - lists.mplayerhq.hu

[PATCH] configure: Do not try to detect GnuTLS if OpenSSL was enabled
by Alexander Strasser 24 Feb '22

24 Feb '22

Enabling GnuTLS via auto detection could have us end up with both libraries enabled. This won't build anymore. IIRC at some point it did build, though it was not easy to figure out which implementation would be used in the end. This change is done in the light of having no auto detection for OpenSSL and probably never will, because of the OpenSSL license. --- Also Cc to mplayer-users. I hoped the original reporter of the build problem would test it, but it seems it didn't happen. So now I am posting it for review. This needs some more testing, I had this in my tree for a while, but forgot about testing it further, so I will only push after a bit more testing. Probably in a week or so. As explained in the commit message this change is assuming quite a bit. I think the risk of OpenSSL auto detection being added in the future is very low, so I feel it is worth it, because of the lower complexity and smaller patch. Comments welcome! configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index d21df0ff7..91b6f9534 100755 --- a/configure +++ b/configure @@ -4531,7 +4531,7 @@ fi echocheck "GnuTLS" -if test "$_gnutls" = auto ; then +if test "$_gnutls" = auto && test "$_openssl" != "yes" ; then _gnutls=no if $_pkg_config --exists gnutls ; then statement_check gnutls/gnutls.h 'gnutls_global_init()' $($_pkg_config --libs --cflags gnutls) && --

1 2

[PATCH] tests/faterun: Use single-threaded decoding for mov/empty_edit_5s.mp4
by Alexander Strasser 28 Mar '21

28 Mar '21

This sample resulted in changing checksums when decoding with 4 threads. I couldn't find anything wrong about testing this sample with valgrind, thus I concluded it is because of using multi-threaded decoding when error concealing happens. --- tests/faterun.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/faterun.sh b/tests/faterun.sh index 7df8ade67..acba45aa2 100755 --- a/tests/faterun.sh +++ b/tests/faterun.sh @@ -7,11 +7,17 @@ fi sample="$1" md5out="tests/res/$sample.md5" ref_file="tests/ref/$sample.md5" -options="-noconfig all -lavdopts threads=4:bitexact:idct=2 -really-quiet -noconsolecontrols -nosound -benchmark" +options="-noconfig all -really-quiet -noconsolecontrols -nosound -benchmark" if [ -z ${sample##h264-conformance/*} ] ; then # these files generally only work when a fps is given explicitly options="$options -fps 25" fi +if [ -z ${sample##mov/empty_edit_5s.mp4} ] ; then + # these do error concealing and yield non-deterministic results with threads + options="$options -lavdopts threads=1:bitexact:idct=2" +else + options="$options -lavdopts threads=4:bitexact:idct=2" +fi echo "testing $sample" # create necessary files and run --

1 0

Preparing MPlayer 1.5 Release
by Alexander Strasser 27 Mar '21

27 Mar '21

Hi all, I intent to do an MPlayer release in the next weeks. I would be grateful for any help. Please consider compiling latest MPlayer SVN on supported platforms and compilers available to you. Some additional testing would be awesome. Also if you know or come to know about issues that seem important to you please mention them here in this thread. Thanks in advance, Alexander

3 3

[PATCH 1/6] vo_png: switch to new FFmpeg API.
by Reimar Döffinger 27 Mar '21

27 Mar '21

--- libvo/vo_png.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/libvo/vo_png.c b/libvo/vo_png.c index 5696a1f3e..7523dca74 100644 --- a/libvo/vo_png.c +++ b/libvo/vo_png.c @@ -150,8 +150,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin static uint32_t draw_image(mp_image_t* mpi){ AVFrame *pic; - int buffersize; - int res, got_pkt; + int res; char buf[100]; FILE *outfile; AVPacket pkt; @@ -174,26 +173,25 @@ static uint32_t draw_image(mp_image_t* mpi){ pic->format = imgfmt2pixfmt(png_format); pic->data[0] = mpi->planes[0]; pic->linesize[0] = mpi->stride[0]; - buffersize = mpi->w * mpi->h * 8; - if (outbuffer_size < buffersize) { - av_freep(&outbuffer); - outbuffer = av_malloc(buffersize); - outbuffer_size = buffersize; - } av_init_packet(&pkt); - pkt.data = outbuffer; - pkt.size = outbuffer_size; - res = avcodec_encode_video2(avctx, &pkt, pic, &got_pkt); + res = avcodec_send_frame(avctx, pic); + if (res >= 0) { + res = avcodec_receive_packet(avctx, &pkt); + if (res == AVERROR(EAGAIN)) { + avcodec_send_frame(avctx, NULL); + res = avcodec_receive_packet(avctx, &pkt); + } + } av_frame_free(&pic); - if (res < 0 || !got_pkt) { + if (res < 0) { mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_PNG_ErrorInCreatePng); } else { - fwrite(outbuffer, pkt.size, 1, outfile); + fwrite(pkt.data, pkt.size, 1, outfile); } fclose(outfile); - av_free_packet(&pkt); + av_packet_unref(&pkt); return VO_TRUE; } @@ -251,7 +249,6 @@ static int preinit(const char *arg) if (subopt_parse(arg, subopts) != 0) { return -1; } - avcodec_register_all(); return 0; } -- 2.29.2

4 17

[PATCH] kva: support -geometry option
by KO Myung-Hun 15 Mar '21

15 Mar '21

--- libvo/vo_kva.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/libvo/vo_kva.c b/libvo/vo_kva.c index 04333c64f..42b273dd7 100644 --- a/libvo/vo_kva.c +++ b/libvo/vo_kva.c @@ -812,12 +812,21 @@ static int config(uint32_t width, uint32_t height, d_height++; } - m_int.rclDst.xLeft = ((LONG)vo_screenwidth - (LONG)d_width) / 2; - m_int.rclDst.yBottom = ((LONG)vo_screenheight - (LONG)d_height) / 2; + vo_dx = (vo_screenwidth - d_width) / 2; + vo_dy = (vo_screenheight - d_height ) / 2; + geometry(&vo_dx, &vo_dy, &d_width, &d_height, + vo_screenwidth, vo_screenheight); + + m_int.rclDst.xLeft = vo_dx; + // invert Y + m_int.rclDst.yBottom = vo_screenheight - (vo_dy + d_height); m_int.rclDst.xRight = m_int.rclDst.xLeft + d_width; m_int.rclDst.yTop = m_int.rclDst.yBottom + d_height; if (vo_fs) { + vo_dx = 0; + vo_dy = 0; + d_width = vo_screenwidth; d_height = vo_screenheight; @@ -831,10 +840,11 @@ static int config(uint32_t width, uint32_t height, setAspectRatio(KVAR_FORCEANY); } - rcl.xLeft = ((LONG)vo_screenwidth - (LONG)d_width) / 2; - rcl.yBottom = ((LONG)vo_screenheight - (LONG)d_height) /2 ; - rcl.xRight = rcl.xLeft + d_width; - rcl.yTop = rcl.yBottom + d_height; + rcl.xLeft = vo_dx; + // invert Y + rcl.yBottom = vo_screenheight - (vo_dy + d_height); + rcl.xRight = rcl.xLeft + d_width; + rcl.yTop = rcl.yBottom + d_height; } else { vo_fs = 0; -- 2.30.0

2 3