Release 0.3.4

No real problem.

DOCS/man/en/af.rst

@@ -147,7 +147,7 @@ Available filters are:
     0    no matrix decoding (default)
     ==== ===================================
 
-``equalizer=[g1:g2:g3:...:g10]``
+``equalizer=g1:g2:g3:...:g10``
     10 octave band graphic equalizer, implemented using 10 IIR band-pass
     filters. This means that it works regardless of what type of audio is
     being played back. The center frequencies for the 10 bands are:

DOCS/man/en/options.rst

@@ -1746,6 +1746,15 @@ OPTIONS
 
     Also see ``--really-quiet`` and ``--msglevel``.
 
+``--quvi-fetch-subtitles=<yes|no>``
+    Toggles fetching of subtitles from streaming sites with libquvi. Disabled
+    by default, because it's unreliable and slow. Note that when enabled,
+    subtitles will always be fetched, even if subtitles are explicitly
+    disabled with ``--no-sub`` (because you might want to enable subtitles
+    at runtime).
+
+    Supported when using libquvi 0.9.x.
+
 ``--quvi-format=<best|default|...>``
     Video format/quality that is directly passed to libquvi (default: ``best``).
     This is used when opening links to streaming sites like YouTube. The

VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

audio/filter/af.c

@@ -345,26 +345,28 @@ static int af_count_filters(struct af_stream *s)
 // (So we know what conversion filter with what format to insert next.)
 static char *af_find_conversion_filter(int srcfmt, int *dstfmt)
 {
-#define NUM_FMT 64
-#define NUM_FILT 32
-#define NUM_NODES (NUM_FMT * NUM_FILT)
+#define MAX_NODES (64 * 32)
+    int num_fmt = 0, num_filt = 0;
     for (int n = 0; filter_list[n]; n++)
-        assert(n < NUM_FILT);
+        num_filt = n + 1;
     for (int n = 0; af_fmtstr_table[n].format; n++)
-        assert(n < NUM_FMT);
+        num_fmt = n + 1;
 
-    bool visited[NUM_NODES] = {0};
-    unsigned char distance[NUM_NODES];
-    short previous[NUM_NODES] = {0};
-    for (int n = 0; n < NUM_NODES; n++) {
+    int num_nodes = num_fmt * num_filt;
+    assert(num_nodes < MAX_NODES);
+
+    bool visited[MAX_NODES] = {0};
+    unsigned char distance[MAX_NODES];
+    short previous[MAX_NODES] = {0};
+    for (int n = 0; n < num_nodes; n++) {
         distance[n] = 255;
-        if (af_fmtstr_table[n % NUM_FMT].format == srcfmt)
+        if (af_fmtstr_table[n % num_fmt].format == srcfmt)
             distance[n] = 0;
     }
 
     while (1) {
         int next = -1;
-        for (int n = 0; n < NUM_NODES; n++) {
+        for (int n = 0; n < num_nodes; n++) {
             if (!visited[n] && (next < 0 || (distance[n] < distance[next])))
                 next = n;
         }
@@ -372,13 +374,13 @@ static char *af_find_conversion_filter(int srcfmt, int *dstfmt)
             return NULL;
         visited[next] = true;
 
-        int fmt = next % NUM_FMT;
+        int fmt = next % num_fmt;
         if (af_fmtstr_table[fmt].format == *dstfmt) {
             // Best match found
             for (int cur = next; cur >= 0; cur = previous[cur] - 1) {
                 if (distance[cur] == 1) {
-                    *dstfmt = af_fmtstr_table[cur % NUM_FMT].format;
-                    return (char *)filter_list[cur / NUM_FMT]->name;
+                    *dstfmt = af_fmtstr_table[cur % num_fmt].format;
+                    return (char *)filter_list[cur / num_fmt]->name;
                 }
             }
             return NULL;
@@ -392,7 +394,7 @@ static char *af_find_conversion_filter(int srcfmt, int *dstfmt)
                 if (i != fmt && af->test_conversion(af_fmtstr_table[fmt].format,
                                                     af_fmtstr_table[i].format))
                 {
-                    int other = n * NUM_FMT + i;
+                    int other = n * num_fmt + i;
                     int ndist = distance[next] + 1;
                     if (ndist < distance[other]) {
                         distance[other] = ndist;
@@ -403,9 +405,7 @@ static char *af_find_conversion_filter(int srcfmt, int *dstfmt)
         }
     }
     assert(0);
-#undef NUM_FMT
-#undef NUM_FILT
-#undef NODE_N
+#undef MAX_NODES
 }
 
 static bool af_is_conversion_filter(struct af_instance *af)

audio/filter/af_pan.c

@@ -153,13 +153,13 @@ static int af_open(struct af_instance* af){
     int   j,k;
 
     int nch = s->nch;
-    if(AF_OK != control(af,AF_CONTROL_SET_PAN_NOUT, &nch))
+    if(nch && AF_OK != control(af,AF_CONTROL_SET_PAN_NOUT, &nch))
         return AF_ERROR;
 
     // Read pan values
     char *cp = s->matrixstr;
     j = 0; k = 0;
-    while(k < AF_NCH){
+    while(cp && k < AF_NCH){
         sscanf(cp, "%f%n" , &s->level[j][k], &n);
         MP_VERBOSE(af, "[pan] Pan level from channel %i to"
                 " channel %i = %f\n",k,j,s->level[j][k]);

audio/out/ao_wasapi.c

@@ -36,10 +36,6 @@
 #include "misc/ring.h"
 #include "ao.h"
 
-#ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE
-#define BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE 0x00000001
-#endif
-
 #ifndef PKEY_Device_FriendlyName
 DEFINE_PROPERTYKEY(PKEY_Device_FriendlyName,
                    0xa45c254e, 0xdf1c, 0x4efd, 0x80, 0x20,
@@ -136,17 +132,6 @@ static int fill_VistaBlob(wasapi_state *state)
 {
     if (!state)
         return 1;
-    HMODULE hkernel32 = GetModuleHandleW(L"kernel32.dll");
-    if (!hkernel32)
-        return 1;
-    WINBOOL (WINAPI *pSetDllDirectory)(LPCWSTR lpPathName) =
-        (WINBOOL (WINAPI *)(LPCWSTR))GetProcAddress(hkernel32, "SetDllDirectoryW");
-    WINBOOL (WINAPI *pSetSearchPathMode)(DWORD Flags) =
-        (WINBOOL (WINAPI *)(DWORD))GetProcAddress(hkernel32, "SetSearchPathMode");
-    if (pSetSearchPathMode)
-        pSetDllDirectory(L"");  /* Attempt to use safe search paths */
-    if (pSetSearchPathMode)
-        pSetSearchPathMode(BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE);
     state->VistaBlob.hAvrt = LoadLibraryW(L"avrt.dll");
     if (!state->VistaBlob.hAvrt)
         goto exit_label;
@@ -160,8 +145,6 @@ static int fill_VistaBlob(wasapi_state *state)
 exit_label:
     if (state->VistaBlob.hAvrt)
         FreeLibrary(state->VistaBlob.hAvrt);
-    if (pSetSearchPathMode)
-        pSetDllDirectory(NULL);
     return 1;
 }
 

demux/demux_lavf.c

@@ -90,12 +90,16 @@ struct format_hack {
     const char *mime_type;
     int probescore;
     float analyzeduration;
+    bool max_probe;         // use probescore only if max. probe size reached
 };
 
 static const struct format_hack format_hacks[] = {
+    // for webradios
     {"aac", "audio/aacp", 25, 0.5},
     {"aac", "audio/aac",  25, 0.5},
     {"mp3", "audio/mpeg", 25, 0.5},
+    // some mp3 files don't detect correctly
+    {"mp3", NULL,         24, .max_probe = true},
     {0}
 };
 
@@ -104,15 +108,6 @@ static const char *format_blacklist[] = {
     0
 };
 
-static const struct format_hack *find_format_from_mime_type(char *mime_type)
-{
-    for (int n = 0; format_hacks[n].ff_name; n++) {
-        if (strcasecmp(format_hacks[n].mime_type, mime_type) == 0)
-            return &format_hacks[n];
-    }
-    return NULL;
-}
-
 static int mp_read(void *opaque, uint8_t *buf, int size)
 {
     struct demuxer *demuxer = opaque;
@@ -223,17 +218,9 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
         priv->filename = sep + 1;
     }
 
-    const char *expected_format = NULL;
-    int expected_format_probescore = AVPROBE_SCORE_MAX;
     char *mime_type = demuxer->stream->mime_type;
-
-    if (lavfdopts->allow_mimetype && mime_type) {
-        priv->format_hack = find_format_from_mime_type(mime_type);
-        if (priv->format_hack) {
-            expected_format = priv->format_hack->ff_name;
-            expected_format_probescore = priv->format_hack->probescore;
-        }
-    }
+    if (!lavfdopts->allow_mimetype || !mime_type)
+        mime_type = "";
 
     const char *format = lavfdopts->format;
     if (!format)
@@ -264,17 +251,18 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
 
     AVProbeData avpd = {
         // Disable file-extension matching with normal checks
-        .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : NULL,
+        .filename = check <= DEMUX_CHECK_REQUEST ? priv->filename : "",
         .buf_size = 0,
         .buf = av_mallocz(PROBE_BUF_SIZE + FF_INPUT_BUFFER_PADDING_SIZE),
     };
 
-    while (avpd.buf_size < PROBE_BUF_SIZE) {
+    bool final_probe = false;
+    do {
         int nsize = av_clip(avpd.buf_size * 2, INITIAL_PROBE_SIZE,
                             PROBE_BUF_SIZE);
         bstr buf = stream_peek(s, nsize);
         if (buf.len <= avpd.buf_size)
-            break;
+            final_probe = true;
         memcpy(avpd.buf, buf.start, buf.len);
         avpd.buf_size = buf.len;
 
@@ -283,20 +271,32 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check)
 
         if (priv->avif) {
             MP_VERBOSE(demuxer, "Found '%s' at score=%d size=%d.\n",
-                   priv->avif->name, score, avpd.buf_size);
+                       priv->avif->name, score, avpd.buf_size);
+
+            priv->format_hack = NULL;
+            for (int n = 0; format_hacks[n].ff_name; n++) {
+                const struct format_hack *entry = &format_hacks[n];
+                if (strcmp(entry->ff_name, priv->avif->name) != 0)
+                    continue;
+                if (entry->mime_type && strcasecmp(entry->mime_type, mime_type) != 0)
+                    continue;
+                priv->format_hack = entry;
+                break;
+            }
 
             if (score >= min_probe)
                 break;
 
-            if (expected_format) {
-                if (strcmp(priv->avif->name, expected_format) == 0 &&
-                    score >= expected_format_probescore)
+            if (priv->format_hack) {
+                if (score >= priv->format_hack->probescore &&
+                    (!priv->format_hack->max_probe || final_probe))
                     break;
             }
         }
 
         priv->avif = NULL;
-    }
+        priv->format_hack = NULL;
+    } while (!final_probe);
 
     av_free(avpd.buf);
 

etc/mpv.desktop

@@ -23,5 +23,5 @@ Exec=mpv --really-quiet --force-window -- %F
 Terminal=false
 NoDisplay=true
 Categories=AudioVideo;Audio;Video;Player;TV;
-MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;video/webm;audio/x-flac;
+MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/mp4;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-flv;video/x-theora;video/x-matroska;video/webm;audio/x-flac;audio/x-vorbis+ogg;video/x-ogm+ogg;
 X-KDE-Protocols=ftp,http,https,mms,rtmp,rtsp,sftp,smb

options/options.c

@@ -316,6 +316,7 @@ const m_option_t mp_opts[] = {
                ({"no", 0}, {"attachment", 1})),
 
     OPT_STRING("quvi-format", quvi_format, 0),
+    OPT_FLAG("quvi-fetch-subtitles", quvi_fetch_subtitles, 0),
 
 #if HAVE_CDDA
     { "cdda", (void *)&cdda_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
@@ -718,6 +719,7 @@ const struct MPOpts mp_default_opts = {
     .sub_visibility = 1,
     .sub_pos = 100,
     .sub_speed = 1.0,
+    .quvi_fetch_subtitles = 0,
     .audio_output_channels = MP_CHMAP_INIT_STEREO,
     .audio_output_format = 0,  // AF_FORMAT_UNKNOWN
     .playback_speed = 1.,

options/options.h

@@ -158,6 +158,7 @@ typedef struct MPOpts {
     int forced_subs_only;
     int stretch_dvd_subs;
     char *quvi_format;
+    int quvi_fetch_subtitles;
 
     // subreader.c
     int suboverlap_enabled;

player/main.c

@@ -78,6 +78,14 @@
 
 #if defined(__MINGW32__) || defined(__CYGWIN__)
 #include <windows.h>
+
+#ifndef BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE
+#define BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE (0x0001)
+#endif
+
+#ifndef BASE_SEARCH_PATH_PERMANENT
+#define BASE_SEARCH_PATH_PERMANENT (0x8000)
+#endif
 #endif
 
 const char mp_help_text[] =
@@ -260,7 +268,23 @@ static void osdep_preinit(int *p_argc, char ***p_argv)
 
 #if defined(__MINGW32__) || defined(__CYGWIN__)
     // stop Windows from showing all kinds of annoying error dialogs
-    SetErrorMode(0x8003);
+    SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
+
+    // Enable heap corruption detection
+    HeapSetInformation(NULL, HeapEnableTerminationOnCorruption, NULL, 0);
+
+    HMODULE kernel32 = GetModuleHandleW(L"kernel32.dll");
+    WINBOOL (WINAPI *pSetDllDirectory)(LPCWSTR lpPathName) =
+        (WINBOOL (WINAPI *)(LPCWSTR))GetProcAddress(kernel32, "SetDllDirectoryW");
+    WINBOOL (WINAPI *pSetSearchPathMode)(DWORD Flags) =
+        (WINBOOL (WINAPI *)(DWORD))GetProcAddress(kernel32, "SetSearchPathMode");
+
+    // Always use safe search paths for DLLs and other files, ie. never use the
+    // current directory
+    if (pSetSearchPathMode)
+        pSetDllDirectory(L"");
+    if (pSetSearchPathMode)
+        pSetSearchPathMode(BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE);
 #endif
 
     terminal_init();

stream/cache.c

@@ -33,6 +33,9 @@
 // the cache is active.
 #define CACHE_UPDATE_CONTROLS_TIME 2.0
 
+// Time in seconds the cache prints a new message at all.
+#define CACHE_NO_SPAM 5.0
+
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -77,6 +80,7 @@ struct priv {
 
     // Owned by the main thread
     stream_t *cache;        // wrapper stream, used by demuxer etc.
+    double last_warn_time;
 
     // Owned by the cache thread
     stream_t *stream;       // "real" stream, used to read from the source media
@@ -142,15 +146,19 @@ static int cache_wakeup_and_wait(struct priv *s, double *retry_time)
     if (stream_check_interrupt(0))
         return CACHE_INTERRUPTED;
 
-    // Print a "more severe" warning after waiting 1 second and no new data
-    if ((*retry_time) >= 1.0) {
-        MP_ERR(s, "Cache keeps not responding.\n");
-    } else if (*retry_time > 0.1) {
-        MP_WARN(s, "Cache is not responding - slow/stuck network connection?\n");
-    }
-
     double start = mp_time_sec();
 
+    if (!s->last_warn_time || start - s->last_warn_time >= CACHE_NO_SPAM) {
+        // Print a "more severe" warning after waiting 1 second and no new data
+        if ((*retry_time) >= 1.0) {
+            MP_ERR(s, "Cache keeps not responding.\n");
+            s->last_warn_time = start;
+        } else if (*retry_time > 0.1) {
+            MP_WARN(s, "Cache is not responding - slow/stuck network connection?\n");
+            s->last_warn_time = start;
+        }
+    }
+
     pthread_cond_signal(&s->wakeup);
     mpthread_cond_timed_wait(&s->wakeup, &s->mutex, CACHE_WAIT_TIME);
 

stream/cookies.c

@@ -61,7 +61,7 @@ static char *col_dup(void *talloc_ctx, const char *src)
 }
 
 /* Finds the start of all the columns */
-static int parse_line(char **ptr, char *cols[6])
+static int parse_line(char **ptr, char *cols[7])
 {
     int col;
     cols[0] = *ptr;

stream/resolve/resolve_quvi9.c

@@ -111,7 +111,7 @@ struct mp_resolve_result *mp_resolve_quvi(const char *url,
         quvi_media_free(media);
     }
 
-    if (quvi_supports(q, url, mode, QUVI_SUPPORTS_TYPE_SUBTITLE)) {
+    if (opts->quvi_fetch_subtitles && quvi_supports(q, url, mode, QUVI_SUPPORTS_TYPE_SUBTITLE)) {
         mp_info(log, "Getting subtitles...\n");
         quvi_subtitle_t qsub = quvi_subtitle_new(q, url);
         if (mp_quvi_ok(q, log)) {

stream/stream_pvr.c

@@ -190,7 +190,7 @@ pvr_uninit (struct pvr_t *pvr)
     return;
 
   /* close device */
-  if (pvr->dev_fd)
+  if (pvr->dev_fd != -1)
     close (pvr->dev_fd);
 
   free (pvr->video_dev);

stream/vcd_read.h

@@ -126,7 +126,7 @@ static mp_vcd_priv_t* vcd_read_toc(stream_t *stream, int fd){
 
 static int vcd_read(mp_vcd_priv_t* vcd,char *mem){
 #ifndef sun
-  memcpy(vcd->buf,&vcd->entry.cdte_addr.msf,sizeof(struct cdrom_msf));
+  memcpy(vcd->buf,&vcd->entry.cdte_addr.msf,sizeof(vcd->entry.cdte_addr.msf));
   if(ioctl(vcd->fd,CDROMREADRAW,vcd->buf)==-1) return 0; // EOF?
   memcpy(mem,&vcd->buf[VCD_SECTOR_OFFS],VCD_SECTOR_DATA);
 #else

sub/sd_ass.c

@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <string.h>
+#include <math.h>
 
 #include <libavutil/common.h>
 #include <ass/ass.h>
@@ -142,9 +143,11 @@ static void get_bitmaps(struct sd *sd, struct mp_osd_res dim, double pts,
                                opts->ass_vsfilter_aspect_compat))
     {
         // Let's use the original video PAR for vsfilter compatibility:
-        scale = scale
+        double par = scale
             * (ctx->video_params.d_w / (double)ctx->video_params.d_h)
             / (ctx->video_params.w   / (double)ctx->video_params.h);
+        if (isnormal(par))
+            scale = par;
     }
     mp_ass_configure(renderer, opts, &dim);
     ass_set_aspect_ratio(renderer, scale, 1);

sub/sd_lavc.c

@@ -17,6 +17,7 @@
 
 #include <stdlib.h>
 #include <assert.h>
+#include <math.h>
 
 #include <libavcodec/avcodec.h>
 #include <libavutil/common.h>
@@ -182,11 +183,13 @@ static void decode(struct sd *sd, struct demux_packet *packet)
                                       sub.num_rects);
             for (int i = 0; i < sub.num_rects; i++) {
                 struct AVSubtitleRect *r = sub.rects[i];
-                struct sub_bitmap *b = &priv->inbitmaps[i];
-                struct osd_bmp_indexed *img = &priv->imgs[i];
+                struct sub_bitmap *b = &priv->inbitmaps[priv->count];
+                struct osd_bmp_indexed *img = &priv->imgs[priv->count];
                 if (!(r->flags & AV_SUBTITLE_FLAG_FORCED) &&
                     opts->forced_subs_only)
                     continue;
+                if (r->w == 0 || r->h == 0)
+                    continue;
                 img->bitmap = r->pict.data[0];
                 assert(r->nb_colors > 0);
                 assert(r->nb_colors * 4 <= sizeof(img->palette));
@@ -234,9 +237,11 @@ static void get_bitmaps(struct sd *sd, struct mp_osd_res d, double pts,
     if (priv->avctx->codec_id == AV_CODEC_ID_DVD_SUBTITLE &&
             opts->stretch_dvd_subs) {
         // For DVD subs, try to keep the subtitle PAR at display PAR.
-        video_par =
+        double par =
               (priv->video_params.d_w / (double)priv->video_params.d_h)
             / (priv->video_params.w   / (double)priv->video_params.h);
+        if (isnormal(par))
+            video_par = par;
     }
     int insize[2];
     get_resolution(sd, insize);

sub/sd_spu.c

@@ -26,7 +26,6 @@
 
 struct sd_spu_priv {
     void *spudec;
-    struct mp_image_params video_params;
 };
 
 static bool is_dvd_sub(const char *t)
@@ -72,22 +71,8 @@ static void get_bitmaps(struct sd *sd, struct mp_osd_res d, double pts,
     spudec_set_forced_subs_only(priv->spudec, opts->forced_subs_only);
     spudec_heartbeat(priv->spudec, pts * 90000);
 
-    if (spudec_visible(priv->spudec)) {
-        double xscale = 1;
-        double yscale = 1;
-        if (opts->stretch_dvd_subs) {
-            // For DVD subs, try to keep the subtitle PAR at display PAR.
-            double video_par =
-                  (priv->video_params.d_w / (double)priv->video_params.d_h)
-                / (priv->video_params.w   / (double)priv->video_params.h);
-            if (video_par > 1.0) {
-                xscale /= video_par;
-            } else {
-                yscale *= video_par;
-            }
-        }
-        spudec_get_indexed(priv->spudec, &d, xscale, yscale, res);
-    }
+    if (spudec_visible(priv->spudec))
+        spudec_get_indexed(priv->spudec, &d, 1, 1, res);
 }
 
 static void reset(struct sd *sd)
@@ -105,25 +90,12 @@ static void uninit(struct sd *sd)
     talloc_free(priv);
 }
 
-static int control(struct sd *sd, enum sd_ctrl cmd, void *arg)
-{
-    struct sd_spu_priv *priv = sd->priv;
-    switch (cmd) {
-    case SD_CTRL_SET_VIDEO_PARAMS:
-        priv->video_params = *(struct mp_image_params *)arg;
-        return CONTROL_OK;
-    default:
-        return CONTROL_UNKNOWN;
-    }
-}
-
 const struct sd_functions sd_spu = {
     .name = "spu",
     .supports_format = supports_format,
     .init = init,
     .decode = decode,
     .get_bitmaps = get_bitmaps,
-    .control = control,
     .reset = reset,
     .uninit = uninit,
 };

video/mp_image.c

@@ -175,6 +175,10 @@ static int mp_chroma_div_up(int size, int shift)
 // Caller has to make sure this doesn't exceed the allocated plane data/strides.
 void mp_image_set_size(struct mp_image *mpi, int w, int h)
 {
+    // av_image_check_size has similar checks and triggers around 16000*16000
+    if (w >= (1 << 14) || h >= (1 << 14) || w < 0 || h < 0)
+        abort();
+
     mpi->w = mpi->display_w = w;
     mpi->h = mpi->display_h = h;
     for (int n = 0; n < mpi->num_planes; n++) {

video/out/vo_wayland.c

@@ -149,7 +149,7 @@ struct priv {
 
     // options
     int enable_alpha;
-    int use_default;
+    int use_rgb565;
 };
 
 /* copied from weston clients */
@@ -232,6 +232,21 @@ static bool is_alpha_format(const struct fmtentry *fmt)
     return !!(mp_imgfmt_get_desc(fmt->mp_fmt).flags & MP_IMGFLAG_ALPHA);
 }
 
+static const struct fmtentry * is_wayland_format_supported(struct priv *p,
+                                                           enum wl_shm_format fmt)
+{
+    struct supported_format *sf;
+
+    // find the matching format first
+    wl_list_for_each(sf, &p->format_list, link) {
+        if (sf->fmt->wl_fmt == fmt) {
+            return sf->fmt;
+        }
+    }
+
+    return NULL;
+}
+
 static void buffer_swap(struct priv *p)
 {
     if (!p->back_buffer->is_new)
@@ -466,27 +481,7 @@ static void frame_handle_redraw(void *data,
     struct buffer *buf = buffer_get_front(p);
 
     if (buf) {
-        if (p->resize_attach) {
-            wl_surface_attach(wl->window.surface, buf->wlbuf, p->x, p->y);
-            wl_surface_damage(wl->window.surface, 0, 0, p->dst_w, p->dst_h);
-            wl_surface_commit(wl->window.surface);
-
-            if (callback)
-                wl_callback_destroy(callback);
-
-            p->redraw_callback = NULL;
-            buffer_finalise_front(buf);
-            p->resize_attach = false;
-
-            destroy_shm_buffer(&p->tmp_buffer);
-
-            // I have to destroy the callback and return early to avoid black flickers
-            // I don't exactly know why this, but I guess the back buffer is still
-            // empty. The callback loop will be restored on the next flip_page call
-            return;
-        }
-
-        wl_surface_attach(wl->window.surface, buf->wlbuf, 0, 0);
+        wl_surface_attach(wl->window.surface, buf->wlbuf, p->x, p->y);
         wl_surface_damage(wl->window.surface, 0, 0, p->dst_w, p->dst_h);
 
         if (callback)
@@ -496,6 +491,12 @@ static void frame_handle_redraw(void *data,
         wl_callback_add_listener(p->redraw_callback, &frame_listener, p);
         wl_surface_commit(wl->window.surface);
         buffer_finalise_front(buf);
+
+        // to avoid multiple resizes of non-shown frames
+        if (p->resize_attach) {
+            destroy_shm_buffer(&p->tmp_buffer);
+            p->resize_attach = false;
+        }
     }
     else {
         if (callback)
@@ -595,13 +596,13 @@ static int reconfig(struct vo *vo, struct mp_image_params *fmt, int flags)
     struct priv *p = vo->priv;
     mp_image_unrefp(&p->original_image);
 
-    p->width = vo->dwidth;
-    p->height = vo->dheight;
+    p->width = fmt->w;
+    p->height = fmt->h;
     p->in_format = *fmt;
 
     struct supported_format *sf;
 
-    // find the same format first
+    // find the matching format first
     wl_list_for_each(sf, &p->format_list, link) {
         if (sf->fmt->mp_fmt == fmt->imgfmt && (p->enable_alpha == sf->is_alpha)) {
             p->pref_format = sf->fmt;
@@ -609,25 +610,22 @@ static int reconfig(struct vo *vo, struct mp_image_params *fmt, int flags)
         }
     }
 
-    // if the format is not supported choose one of the fancy formats next
-    // the default formats are always last
     if (!p->pref_format) {
-        wl_list_for_each(sf, &p->format_list, link) {
-            if (p->enable_alpha == sf->is_alpha) {
-                p->pref_format = sf->fmt;
-                break;
-            }
-        }
-    }
-
-    // if use default is enable overwrite the auto selected one
-    if (p->use_default) {
+        // if use default is enable overwrite the auto selected one
         if (p->enable_alpha)
             p->pref_format = &fmttable[DEFAULT_ALPHA_FORMAT_ENTRY];
         else
             p->pref_format = &fmttable[DEFAULT_FORMAT_ENTRY];
     }
 
+    // overides alpha
+    // use rgb565 if performance is your main concern
+    if (p->use_rgb565) {
+        const struct fmtentry *mp_fmt =
+            is_wayland_format_supported(p, WL_SHM_FORMAT_RGB565);
+        if (mp_fmt)
+            p->pref_format = mp_fmt;
+    }
 
     p->bytes_per_pixel = mp_imgfmt_get_desc(p->pref_format->mp_fmt).bytes[0];
     MP_VERBOSE(p->wl, "bytes per pixel: %d\n", p->bytes_per_pixel);
@@ -732,7 +730,7 @@ const struct vo_driver video_out_wayland = {
     .uninit = uninit,
     .options = (const struct m_option[]) {
         OPT_FLAG("alpha", enable_alpha, 0),
-        OPT_FLAG("default-format", use_default, 0),
+        OPT_FLAG("rgb565", use_rgb565, 0),
         {0}
     },
 };

waftools/generators/headers.py

@@ -6,7 +6,7 @@ def __get_version__(ctx):
                                cwd=ctx.srcnode.abspath())
     process.wait()
     (version, err) = process.communicate()
-    return version.strip()
+    return version.strip().decode("utf-8")
 
 def __get_build_date__():
     import time