Changeset 3be7c61b0db43282fb51cc73d74a68c0d278328f

Timestamp:

06/29/08 21:08:20 (2 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1214766500 +0000

git-parent:

[7544774bffebd4ae162d7aebd7f3f57bf62e573e]

git-author:

Laurent Aimar <fenrir@videolan.org> 1214766500 +0000

Message:

Added reget_buffer implementation for correct PTS for codec using it.
This allows playing of MS Video 1 file but it is not yet correct because
of the way VLC handles RGB (it won't work on big endian, and the colors
seem broken).

Files:

• modules/codec/avcodec/video.c (modified) (6 diffs)

modules/codec/avcodec/video.c

@@ -92 +92 @@
-static void ffmpeg_CopyPicture    ( decoder_t *, picture_t *, AVFrame * );
-static int  ffmpeg_GetFrameBuf    ( struct AVCodecContext *, AVFrame * );
+static int  ffmpeg_ReGetFrameBuf( struct AVCodecContext *, AVFrame * );
-static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
-
@@ -357 +358 @@
-     * PTS correctly */
-    p_sys->p_context->get_buffer = ffmpeg_GetFrameBuf;
+    p_sys->p_context->reget_buffer = ffmpeg_ReGetFrameBuf;
-    p_sys->p_context->release_buffer = ffmpeg_ReleaseFrameBuf;
-    p_sys->p_context->opaque = p_dec;
@@ -386 +388 @@
-        p_sys->p_context->palctrl =
-            (AVPaletteControl *)p_dec->fmt_in.video.p_palette;
-
+ if( p_sys->i_codec_id != CODEC_ID_MSVIDEO1 )
-        p_sys->p_context->palctrl = &palette_control;
-
@@ -885 +887 @@
- * decoded picture (even in indirect rendering mode).
- *****************************************************************************/
+static void ffmpeg_SetFrameBufferPts( decoder_t *p_dec, AVFrame *p_ff_pic );
+
-static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
-                               AVFrame *p_ff_pic )
@@ -893 +897 @@
-
-    /* Set picture PTS */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    p_ff_pic->opaque = 0;
-
@@ -965 +950 @@
-    return 0;
-}
+static int  ffmpeg_ReGetFrameBuf( struct AVCodecContext *p_context, AVFrame *p_ff_pic )
+{
+    decoder_t *p_dec = (decoder_t *)p_context->opaque;
+
+    /* Set picture PTS */
+    ffmpeg_SetFrameBufferPts( p_dec, p_ff_pic );
+
+    /* We always use default reget function, it works perfectly fine */
+    return avcodec_default_reget_buffer( p_context, p_ff_pic );
+}
+
+static void ffmpeg_SetFrameBufferPts( decoder_t *p_dec, AVFrame *p_ff_pic )
+{
+    decoder_sys_t *p_sys = p_dec->p_sys;
+
+    /* Set picture PTS */
+    if( p_sys->input_pts )
+    {
+        p_ff_pic->pts = p_sys->input_pts;
+    }
+    else if( p_sys->input_dts )
+    {
+        /* Some demuxers only set the dts so let's try to find a useful
+         * timestamp from this */
+        if( !p_sys->p_context->has_b_frames || !p_sys->b_has_b_frames ||
+            !p_ff_pic->reference || !p_sys->i_pts )
+        {
+            p_ff_pic->pts = p_sys->input_dts;
+        }
+        else p_ff_pic->pts = 0;
+    }
+    else p_ff_pic->pts = 0;
+
+    if( p_sys->i_pts ) /* make sure 1st frame has a pts > 0 */
+    {
+        p_sys->input_pts = p_sys->input_dts = 0;
+    }
+}
-
-static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *p_context,