[MPlayer-dev-eng] [PATCH] bframes, dwStart: individual patches

Corey Hickey bugfood-ml at fatooh.org
Fri Feb 17 09:53:28 CET 2006


Corey Hickey wrote:
> I'm sending this in for review as one big patch because some of the changes
> I propose don't make much sense out of context of the other changes. Once
> all the changes look acceptable I intend to propose them as a few smaller,
> self-contained patches, so please don't tell me to separate them just yet.

Ok, here they are. The indentation in a couple added lines in the first
two patches are so that the additions in 03-ignore-start.diff look
pretty when they're all together.

For instance, this:
------------------------------------------
+if(sh_video){
+  sh_video->timer=0;
+    audio_delay += sh_video->stream_delay;
+}
------------------------------------------

gets this added:
------------------------------------------
 if(sh_video){
   sh_video->timer=0;
+  if (! ignore_start)
     audio_delay += sh_video->stream_delay;
 }
------------------------------------------



01-mplayer-dwStart.diff
* demux_avi sets stream_delay according to dwStart
* mplayer adjusts audio_delay according to stream_delay

02-mencoder-dwStart.diff
* -audio-delay option allows a negative argument (video delay)
* updated -audio-delay description in man page
* changed "AUDIO DELAY" in message to "audio delay"
* added "video delay" message
* muxer_avi applies stream delay to individual streams as dwStart

03-ignore-start.diff
* new option -ignore-start
* documented -ignore-start in man page
* mencoder and mplayer respect ignore_start

04-bframes-delay.diff
* lavc, xvid, xvid4, and x264 increment encoder_delay on empty frames
* mencoder adjusts AV_delay according to all encoder_delays
* lavc, xvid, xvid4, and x264 set decoder_delay appropriately
* muxer_avi adjusts dwStart according to the decoder_delays


These patches have been sitting around in combined form for a while,
minus a couple bugfixes, and the only comments are good (thanks to
Guillaume for testing). The changes are diverse, though, so I'm not
going to apply them all at once; instead, I will commit each patch, in
order, no less than 24 hours after the previous one... starting no less
than 24 hours from now.

-Corey
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 01-mplayer-dwStart.diff
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20060217/0a8b716b/attachment.txt>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 02-mencoder-dwStart.diff
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20060217/0a8b716b/attachment.asc>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 03-ignore-start.diff
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20060217/0a8b716b/attachment-0001.txt>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 04-bframes-delay.diff
URL: <http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/attachments/20060217/0a8b716b/attachment-0001.asc>


More information about the MPlayer-dev-eng mailing list