Release 0.1.3

cocoa_common contains some locking calls to support video outputs that support
live resizing (at this moment only vo=opengl).

These should not be used unless the VO declares it is multithreaded by
registering the resize_redraw callback used for live resizing.

Fixes #200

DOCS/man/en/ao.rst

@@ -17,8 +17,8 @@ in the list. Suboptions are optional and can mostly be omitted.
 .. admonition:: Examples
 
     - ``--ao=alsa,oss,`` Try the ALSA driver, then the OSS driver, then others.
-    - ``--ao=alsa:noblock:device=hw=0.3`` Sets noblock-mode and the device-name
-      as first card, fourth device.
+    - ``--ao=alsa:no-block:device=[hw:0,3]`` Sets noblock-mode and the
+      device-name as first card, fourth device.
 
 Available audio output drivers are:
 
@@ -48,6 +48,10 @@ Available audio output drivers are:
 
             ``--ao=alsa:device=[plug:surround50]``
 
+        Note that the ``[`` and ``]`` simply quote the device name. With some
+        shells (like zsh), you have to quote the option string to prevent the
+        shell from interpreting the brackets instead of passing them to mpv.
+
 ``oss``
     OSS audio output driver
 

DOCS/man/en/changes.rst

@@ -27,7 +27,8 @@ General Changes for MPlayer to mplayer2
 * Use libass for subtitle rendering by default (better quality)
 * Generally preferring ffmpeg/libav over internal demuxers and decoders
 * Improvements when playing multiple files (``--fixed-vo``)
-* Screenshot improvements (instant screenshots without 1-frame delay)
+* Screenshot improvements (instant screenshots without 1-frame delay, allow
+  taking screenshots even with hardware decoding)
 * Improved support for PulseAudio
 * General code cleanups
 * Many more changes
@@ -55,6 +56,9 @@ General Changes for mplayer2 to mpv
   ``screenshot`` video filter is not needed anymore, and should not be put
   into the mpv config file)
 * Removal of teletext support
+* Removal of most builtin demuxers, using libavformat instead
+* Removal of builtin network support, using libavformat instead (also,
+  support https via libavformat)
 * Replace image VOs (``--vo=jpeg`` etc.) with ``--vo=image``
 * Do not lose settings when playing a new file in the same player instance
 * New location for config files, new name for the binary.
@@ -68,7 +72,35 @@ General Changes for mplayer2 to mpv
 * Wayland support
 * Support for precise scrolling which scales the parameter of commands. If the
   input doesn't support precise scrolling the scale factor stays 1.
-* General code cleanups
+* OSX: Cocoa event loop is independent from mplayer's event loop, so user
+  actions like accessing menus and live resizing do not block the playback.
+* OSX: Apple Remote support.
+* OSX: Media Keys support.
+* Windows: Added WASAPI audio output.
+* New OSD bar with chapter marks and not positioned in the middle of the video
+  (though this can be customized with the ``--osd-bar-align-y`` option).
+* Allow customizing whether a key binding for seeking shows the video time, the
+  OSD bar, or nothing (see section `Input Command Prefixes`_).
+* Display list of chapters and audio/subtitle tracks on OSD (see section
+  `Properties`_).
+* ``--keep-open`` option to stop the player from closing the window and
+  exiting after playback ends.
+* Re-enable screensaver while the player is paused.
+* Matroska edition switching at runtime.
+* Support for libavfilter (for video->video and audio->audio). This allows
+  using most of FFmpeg's filters, which improve greatly on the old MPlayer
+  filters in features, performance, and correctness.
+* Improved downmixing and output of surround audio. Instead of using hardcoded
+  pan filters to do remixing, use libavresample. Channel maps are used to
+  identify the channel layout, so e.g. ``3.0`` and ``2.1`` audio can be
+  distinguished.
+* Allow resuming playback at a later point with ``Shift+q``, also see
+  ``quit_watch_later`` input command.
+* Support mapping multiple commands to one key.
+* Allow changing/adjusting video filters at runtime. (This is also used to make
+  the ``D`` key insert vf_yadif if deinterlacing is not supported otherwise.)
+* General bug fixes and removal of long-standing issues
+* General code cleanups (including refactoring or rewrites of many parts)
 * Many more changes
 
 Detailed Listing of User-visible Changes
@@ -136,6 +168,7 @@ Command Line Switches
     ``-rawvideo ...``           ``--demuxer-rawvideo-...``
     ``--mixer``                 AO suboptions (``alsa``, ``oss``)
     ``--mixer-channel``         AO suboptions (``alsa``, ``oss``)
+    ``--ao=alsa:device=hw=0.3`` ``--ao=alsa:device=[hw:0,3]``
     =========================== ========================================
 
 .. note::

VERSION

@@ -0,0 +1 @@
+0.1.3

demux/demux.c

@@ -77,12 +77,12 @@ const demuxer_desc_t *const demuxer_list[] = {
 #endif
     &demuxer_desc_matroska,
     &demuxer_desc_lavf,
-    &demuxer_desc_subreader,
+    &demuxer_desc_mf,
 #ifdef CONFIG_MNG
     &demuxer_desc_mng,
 #endif
-    // auto-probe last, because it checks file-extensions only
-    &demuxer_desc_mf,
+    // Pretty aggressive, so should be last.
+    &demuxer_desc_subreader,
     /* Please do not add any new demuxers here. If you want to implement a new
      * demuxer, add it to libavformat, except for wrappers around external
      * libraries and demuxers requiring binary support. */
@@ -466,7 +466,7 @@ struct demux_packet *demux_read_packet(struct sh_stream *sh)
 // packets from the queue.
 double demux_get_next_pts(struct sh_stream *sh)
 {
-    if (sh) {
+    if (sh && sh->ds->selected) {
         ds_get_packets(sh);
         if (sh->ds->head)
             return sh->ds->head->pts;

demux/demux_raw.c

@@ -35,6 +35,7 @@
 
 struct priv {
     int frame_size;
+    int read_frames;
     double frame_rate;
 };
 
@@ -107,6 +108,7 @@ static int demux_rawaudio_open(demuxer_t *demuxer, enum demux_check check)
     *p = (struct priv) {
         .frame_size = samplesize * sh_audio->channels.num,
         .frame_rate = samplerate,
+        .read_frames = samplerate,
     };
 
     return 0;
@@ -191,6 +193,7 @@ static int demux_rawvideo_open(demuxer_t *demuxer, enum demux_check check)
     *p = (struct priv) {
         .frame_size = imgsize,
         .frame_rate = fps,
+        .read_frames = 1,
     };
 
     return 0;
@@ -203,7 +206,7 @@ static int raw_fill_buffer(demuxer_t *demuxer)
     if (demuxer->stream->eof)
         return 0;
 
-    struct demux_packet *dp = new_demux_packet(p->frame_size);
+    struct demux_packet *dp = new_demux_packet(p->frame_size * p->read_frames);
     dp->pos = stream_tell(demuxer->stream) - demuxer->movi_start;
     dp->pts = (dp->pos  / p->frame_size) / p->frame_rate;
 

demux/demux_subreader.c

@@ -1341,6 +1341,8 @@ static int d_open_file(struct demuxer *demuxer, enum demux_check check)
     if (!res)
         return -1;
 
+    demuxer->filetype = sr.name;
+
     sub_data *sd = sub_read_file(demuxer->stream, &sr);
     if (!sd)
         return -1;

mpvcore/m_option.c

@@ -651,6 +651,7 @@ const m_option_type_t m_option_type_double = {
     .pretty_print = print_double_f3,
     .copy  = copy_opt,
     .clamp = clamp_double,
+    .add = add_double,
 };
 
 #undef VAL

mpvcore/mplayer.c

@@ -739,12 +739,12 @@ static void load_per_output_config(m_config_t *conf, char *cfg, char *out)
  * Tries to load a config file (in file local mode)
  * @return 0 if file was not found, 1 otherwise
  */
-static int try_load_config(m_config_t *conf, const char *file)
+static int try_load_config(m_config_t *conf, const char *file, bool local)
 {
     if (!mp_path_exists(file))
         return 0;
     mp_tmsg(MSGT_CPLAYER, MSGL_INFO, "Loading config '%s'\n", file);
-    m_config_parse_config_file(conf, file, M_SETOPT_BACKUP);
+    m_config_parse_config_file(conf, file, local ? M_SETOPT_BACKUP : 0);
     return 1;
 }
 
@@ -767,14 +767,14 @@ static void load_per_file_config(m_config_t *conf, const char * const file,
         char dircfg[MP_PATH_MAX];
         strcpy(dircfg, cfg);
         strcpy(dircfg + (name - cfg), "mpv.conf");
-        try_load_config(conf, dircfg);
+        try_load_config(conf, dircfg, true);
 
-        if (try_load_config(conf, cfg))
+        if (try_load_config(conf, cfg, true))
             return;
     }
 
     if ((confpath = mp_find_user_config_file(name)) != NULL) {
-        try_load_config(conf, confpath);
+        try_load_config(conf, confpath, true);
 
         talloc_free(confpath);
     }
@@ -889,7 +889,9 @@ static void load_playback_resume(m_config_t *conf, const char *file)
 {
     char *fname = get_playback_resume_config_filename(file);
     if (fname) {
-        try_load_config(conf, fname);
+        // Never apply the saved start position to following files
+        m_config_backup_opt(conf, "start");
+        try_load_config(conf, fname, false);
         unlink(fname);
     }
     talloc_free(fname);

stream/stream_bluray.c

@@ -65,12 +65,8 @@ struct bluray_priv_s {
     char *cfg_device;
 };
 
-static const struct stream_priv_s {
-    int title;
-    char *device;
-} bluray_stream_priv_dflts = {
-    BLURAY_DEFAULT_TITLE,
-    NULL
+static struct bluray_priv_s bluray_stream_priv_dflts = {
+    .cfg_title = BLURAY_DEFAULT_TITLE
 };
 
 #define OPT_BASE_STRUCT struct bluray_priv_s

sub/dec_sub.c

@@ -302,6 +302,8 @@ static void multiply_timings(struct packet_list *subs, double factor)
     }
 }
 
+#define MS_TS(f_ts) ((int)((f_ts) * 1000 + 0.5))
+
 // Remove overlaps and fill gaps between adjacent subtitle packets. This is done
 // by adjusting the duration of the earlier packet. If the gaps or overlap are
 // larger than the threshold, or if the durations are close to the threshold,
@@ -322,7 +324,10 @@ static void fix_overlaps_and_gaps(struct packet_list *subs)
             if (fabs(next->pts - end) <= threshold && cur->duration >= keep &&
                 next->duration >= keep)
             {
-                cur->duration = next->pts - cur->pts;
+                // Conceptually: cur->duration = next->pts - cur->pts;
+                // But make sure the rounding and conversion to integers in
+                // sd_ass.c can't produce overlaps.
+                cur->duration = (MS_TS(next->pts) - MS_TS(cur->pts)) / 1000.0;
             }
         }
     }

video/decode/vdpau.c

@@ -18,6 +18,7 @@
 #include <stddef.h>
 #include <assert.h>
 
+#include <libavcodec/avcodec.h>
 #include <libavcodec/vdpau.h>
 #include <libavutil/common.h>
 
@@ -41,33 +42,22 @@ struct priv {
 
 struct profile_entry {
     enum AVCodecID av_codec;
-    int ff_profile;
     VdpDecoderProfile vdp_profile;
     int maxrefs;
 };
 
-#define PE(av_codec_id, ff_profile, vdp_dcoder_profile, maxrefs) \
+#define PE(av_codec_id, vdp_dcoder_profile, maxrefs)             \
     {AV_CODEC_ID_ ## av_codec_id,                                \
-     FF_PROFILE_ ## ff_profile,                                  \
      VDP_DECODER_PROFILE_ ## vdp_dcoder_profile,                 \
      maxrefs}
 
 static const struct profile_entry profiles[] = {
-    PE(MPEG1VIDEO,  UNKNOWN,                    MPEG1,          2),
-    PE(MPEG2VIDEO,  MPEG2_SIMPLE,               MPEG2_SIMPLE,   2),
-    PE(MPEG2VIDEO,  UNKNOWN,                    MPEG2_MAIN,     2),
-    PE(H264,        H264_BASELINE,              H264_BASELINE,  16),
-    PE(H264,        H264_CONSTRAINED_BASELINE,  H264_BASELINE,  16),
-    PE(H264,        H264_MAIN,                  H264_MAIN,      16),
-    PE(H264,        UNKNOWN,                    H264_HIGH,      16),
-    PE(WMV3,        VC1_SIMPLE,                 VC1_SIMPLE,     2),
-    PE(WMV3,        VC1_MAIN,                   VC1_MAIN,       2),
-    PE(WMV3,        UNKNOWN,                    VC1_ADVANCED,   2),
-    PE(VC1,         VC1_SIMPLE,                 VC1_SIMPLE,     2),
-    PE(VC1,         VC1_MAIN,                   VC1_MAIN,       2),
-    PE(VC1,         UNKNOWN,                    VC1_ADVANCED,   2),
-    PE(MPEG4,       MPEG4_SIMPLE,               MPEG4_PART2_SP, 2),
-    PE(MPEG4,       UNKNOWN,                    MPEG4_PART2_ASP,2),
+    PE(MPEG1VIDEO,  MPEG1,          2),
+    PE(MPEG2VIDEO,  MPEG2_MAIN,     2),
+    PE(H264,        H264_HIGH,      16),
+    PE(WMV3,        VC1_MAIN,       2),
+    PE(VC1,         VC1_ADVANCED,   2),
+    PE(MPEG4,       MPEG4_PART2_ASP,2),
 };
 
 // libavcodec absolutely wants a non-NULL render callback
@@ -123,15 +113,11 @@ static bool create_vdp_decoder(struct lavc_ctx *ctx)
 
     const struct profile_entry *pe = NULL;
     for (int n = 0; n < MP_ARRAY_SIZE(profiles); n++) {
-        if (profiles[n].av_codec == ctx->avctx->codec_id &&
-            (profiles[n].ff_profile == ctx->avctx->profile ||
-             profiles[n].ff_profile == FF_PROFILE_UNKNOWN))
-        {
+        if (profiles[n].av_codec == ctx->avctx->codec_id) {
             pe = &profiles[n];
             break;
         }
     }
-
     if (!pe) {
         mp_msg(MSGT_VO, MSGL_ERR, "[vdpau] Unknown codec!\n");
         goto fail;

video/filter/vf_eq.c

@@ -72,6 +72,8 @@ typedef struct vf_priv_s {
   unsigned      buf_w[3];
   unsigned      buf_h[3];
   unsigned char *buf[3];
+
+  int gamma_i, contrast_i, brightness_i, saturation_i;
 } vf_eq2_t;
 
 
@@ -381,18 +383,22 @@ int control (vf_instance_t *vf, int request, void *data)
 
       if (strcmp (eq->item, "gamma") == 0) {
         set_gamma (vf->priv, exp (log (8.0) * eq->value / 100.0));
+        vf->priv->gamma_i = eq->value;
         return CONTROL_TRUE;
       }
       else if (strcmp (eq->item, "contrast") == 0) {
         set_contrast (vf->priv, (1.0 / 100.0) * (eq->value + 100));
+        vf->priv->contrast_i = eq->value;
         return CONTROL_TRUE;
       }
       else if (strcmp (eq->item, "brightness") == 0) {
         set_brightness (vf->priv, (1.0 / 100.0) * eq->value);
+        vf->priv->brightness_i = eq->value;
         return CONTROL_TRUE;
       }
       else if (strcmp (eq->item, "saturation") == 0) {
         set_saturation (vf->priv, (double) (eq->value + 100) / 100.0);
+        vf->priv->saturation_i = eq->value;
         return CONTROL_TRUE;
       }
       break;
@@ -400,19 +406,19 @@ int control (vf_instance_t *vf, int request, void *data)
     case VFCTRL_GET_EQUALIZER:
       eq = (vf_equalizer_t *) data;
       if (strcmp (eq->item, "gamma") == 0) {
-        eq->value = (int) (100.0 * log (vf->priv->gamma) / log (8.0));
+        eq->value = vf->priv->gamma_i;
         return CONTROL_TRUE;
       }
       else if (strcmp (eq->item, "contrast") == 0) {
-        eq->value = (int) (100.0 * vf->priv->contrast) - 100;
+        eq->value = vf->priv->contrast_i;
         return CONTROL_TRUE;
       }
       else if (strcmp (eq->item, "brightness") == 0) {
-        eq->value = (int) (100.0 * vf->priv->brightness);
+        eq->value = vf->priv->brightness_i;
         return CONTROL_TRUE;
       }
       else if (strcmp (eq->item, "saturation") == 0) {
-        eq->value = (int) (100.0 * vf->priv->saturation) - 100;
+        eq->value = vf->priv->saturation_i;
         return CONTROL_TRUE;
       }
       break;
@@ -503,9 +509,13 @@ int vf_open(vf_instance_t *vf, char *args)
     eq2->gamma_weight = par[7];
 
     set_gamma (eq2, par[0]);
+    eq2->gamma_i = (int) (100.0 * log (vf->priv->gamma) / log (8.0));
     set_contrast (eq2, par[1]);
+    eq2->contrast_i = (int) (100.0 * vf->priv->contrast) - 100;
     set_brightness (eq2, par[2]);
+    eq2->brightness_i = (int) (100.0 * vf->priv->brightness);
     set_saturation (eq2, par[3]);
+    eq2->saturation_i = (int) (100.0 * vf->priv->saturation) - 100;
   }
 
   return 1;

video/out/cocoa_common.m

@@ -523,7 +523,7 @@ int vo_cocoa_check_events(struct vo *vo)
 
 void vo_cocoa_fullscreen(struct vo *vo)
 {
-    if (![NSThread isMainThread]) {
+    if (![NSThread isMainThread] && resize_callback_registered(vo)) {
         // This is the secondary thread, unlock since we are going to invoke a
         // method synchronously on the GUI thread using Cocoa.
         vo_cocoa_set_current_context(vo, false);
@@ -535,7 +535,7 @@ void vo_cocoa_fullscreen(struct vo *vo)
                              waitUntilDone:YES];
 
 
-    if (![NSThread isMainThread]) {
+    if (![NSThread isMainThread] && resize_callback_registered(vo)) {
         // Now lock again!
         vo_cocoa_set_current_context(vo, true);
     }
@@ -762,20 +762,15 @@ int vo_cocoa_cgl_color_size(struct vo *vo)
     CGFloat dx = (f.size.width  - ns.width) / 2;
     CGFloat dy = (f.size.height - ns.height - [self titleHeight]) / 2;
     NSRect nf  = NSRectFromCGRect(CGRectInset(NSRectToCGRect(f), dx, dy));
-
-    struct vo *vo = self.videoOutput;
-    if (!(vo && !vo->opts->border)) {
-        NSRect s = [[self screen] visibleFrame];
-        if (nf.origin.y + nf.size.height > s.origin.y + s.size.height)
-            nf.origin.y = s.size.height - nf.size.height;
-    }
-
     [self setFrame:nf display:NO animate:NO];
 }
 
-- (NSRect)constrainFrameRect:(NSRect)rect toScreen:(NSScreen *)screen
+- (NSRect)constrainFrameRect:(NSRect)nf toScreen:(NSScreen *)screen
 {
-    return rect;
+    NSRect s = [[self screen] visibleFrame];
+    if (nf.origin.y + nf.size.height > s.origin.y + s.size.height)
+        nf.origin.y = s.origin.y + s.size.height - nf.size.height;
+    return nf;
 }
 
 @end

video/out/vo_vdpau.c

@@ -206,7 +206,8 @@ static uint64_t convert_to_vdptime(struct vo *vo, uint64_t t)
 
 static int render_video_to_output_surface(struct vo *vo,
                                           VdpOutputSurface output_surface,
-                                          VdpRect *output_rect)
+                                          VdpRect *output_rect,
+                                          VdpRect *video_rect)
 {
     struct vdpctx *vc = vo->priv;
     struct vdp_functions *vdp = vc->vdp;
@@ -238,7 +239,7 @@ static int render_video_to_output_surface(struct vo *vo,
     vdp_st = vdp->video_mixer_render(vc->video_mixer, VDP_INVALID_HANDLE,
                                      0, field, 2, past_fields,
                                      bv[dp/2].surface, 1, future_fields,
-                                     &vc->src_rect_vid, output_surface,
+                                     video_rect, output_surface,
                                      NULL, output_rect, 0, NULL);
     CHECK_ST_WARNING("Error when calling vdp_video_mixer_render");
     return 0;
@@ -250,7 +251,7 @@ static int video_to_output_surface(struct vo *vo)
 
     return render_video_to_output_surface(vo,
                                           vc->output_surfaces[vc->surface_num],
-                                          &vc->out_rect_vid);
+                                          &vc->out_rect_vid, &vc->src_rect_vid);
 }
 
 static int next_deint_queue_pos(struct vo *vo, bool eof)
@@ -1261,7 +1262,7 @@ static struct mp_image *get_screenshot(struct vo *vo)
     }
 
     VdpRect rc = { .x1 = vc->vid_width, .y1 = vc->vid_height };
-    render_video_to_output_surface(vo, vc->screenshot_surface, &rc);
+    render_video_to_output_surface(vo, vc->screenshot_surface, &rc, &rc);
 
     struct mp_image *image = read_output_surface(vc, vc->screenshot_surface,
                                                  vc->vid_width, vc->vid_height);

video/out/x11_common.c

@@ -1040,9 +1040,6 @@ void vo_x11_config_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y,
     if (flags & VOFLAG_HIDDEN)
         return;
 
-    if (opts->ontop)
-        vo_x11_setlayer(vo, x11->window, opts->ontop);
-
     bool reset_size = !(x11->old_dwidth == width && x11->old_dheight == height);
     if (x11->window_hidden) {
         x11->nofs_x = x;
@@ -1075,6 +1072,9 @@ void vo_x11_config_vo_window(struct vo *vo, XVisualInfo *vis, int x, int y,
         }
     }
 
+    if (opts->ontop)
+        vo_x11_setlayer(vo, x11->window, opts->ontop);
+
     vo_x11_fullscreen(vo);
 
     XSync(x11->display, False);