[MPlayer-dev-eng] [PATCH] big vf_osd update

[Jason Tackaberry]

On Thu, 2005-09-15 at 15:39 +0200, Diego Biurrun wrote:
> These look like things that you might wish to submit as separate patches.
> It would make reviewing them easier and speed up the integration of
> vf_overlay.

I've made a diff of diffs and grouped most of the changes into separate
files.  This diff compares the two patches before the rename from vf_osd
to vf_overlay, otherwise the SNR would have been pretty low and would
have made reviewing difficult.

The attached patches aren't useful for anything except reviewing, of
course.  The vf_overlay patch is largely the same except it's more or
less just s/osd/overlay/g.  (Not quite, but almost.)

Here's the relevant excerpt from my last changelog:

  memalign.diff:
      * Ensure all buffers and strides are aligned to 16 byte
        boundaries.

  timer.diff:
      * Removed gettimeofday() in favor of GetTimer()

  rect-parse.diff:
      * Adding new invalidated rectangles is now O(1) instead of O(n)
      * Improve slave command argument parsing to properly deal with
        malformed commands.
      * Fixed a bug where colorspace conversion was being done
        needlessly for global alpha changes.

  control.diff:
      * control() returns CONTROL_OK for VFCTRL_PAUSE_UPDATE; mplayer.c
        checks this return value in the pause loop and will sleep longer
        if it is not handled.  (Pause loop now sleeps the same amount of
        time as before if no osd filter is loaded.)  Tested gmplayer to
        ensure pause loop changes created no ill effects.

  asm.diff:
      * Use %%"REG_c" instead of %%ecx

  swscaler.diff (this patch represents the most serious changes):
      * Removed custom colorspace conversion code and rewrote to use
        Swscaler.
      * Removed optional width/height filter parameters.  Now the OSD is
        always the display size and will get scaled to mpi size for
        blending.  If the user needs a fixed and known OSD size, he can
        specify scale/expand/dsize on the filter chain before vf_osd.

  doc.diff:
      * Merged most of the documentation suggestions from Wanderer, but
        rewrote some paragraphs and the man page entry to reflect above
        design changes, so those could benefit from review.

      (The man page diff includes the changes made with the vf_overlay
       rename, since I made some non-trivial changes there.)


Hopefully this is some help.  Again these patches don't include the
rename from vf_osd to vf_overlay.  They're only provided to make
reviewing easier.

Cheers,
Jason.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: memalign.diff
Type: text/x-patch
Size: 2035 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20050915/8b0a19d2/attachment.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: timer.diff
Type: text/x-patch
Size: 2132 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20050915/8b0a19d2/attachment-0001.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: rect-parse.diff
Type: text/x-patch
Size: 5975 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20050915/8b0a19d2/attachment-0002.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: control.diff
Type: text/x-patch
Size: 1086 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20050915/8b0a19d2/attachment-0003.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: asm.diff
Type: text/x-patch
Size: 2464 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20050915/8b0a19d2/attachment-0004.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: swscaler.diff
Type: text/x-patch
Size: 20241 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20050915/8b0a19d2/attachment-0005.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: doc.diff
Type: text/x-patch
Size: 14631 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20050915/8b0a19d2/attachment-0006.bin>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 229 bytes
Desc: This is a digitally signed message part
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20050915/8b0a19d2/attachment.pgp>