Changeset 57823d10590cb6c089a74293df217d2ba6af7610

Timestamp:

07/04/03 19:35:01 (6 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1049736901 +0000

git-parent:

[a8b6aa3724208fd6861ef9e2096572cf9b1a71ec]

git-author:

Gildas Bazin <gbazin@videolan.org> 1049736901 +0000

Message:

* po/fr.po: small update.
* modules/codec/libmpeg2.c: we now bypass libmpeg2 buffer management. As a nice side effect, still pictures in dvd menus are working now :)

Files:

• modules/codec/libmpeg2.c (modified) (6 diffs)
• po/fr.po (modified) (3 diffs)

modules/codec/libmpeg2.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-7 2003/04/05 12:43:39
+8 2003/04/07 17:35:01
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -76 +76 @@
-static void CloseDecoder ( dec_thread_t * );
-
+static picture_t *GetNewPicture( dec_thread_t *, uint8_t ** );
+
-/*****************************************************************************
- * Module descriptor
@@ -183 +185 @@
-
-        case STATE_SEQUENCE:
+        {
-            /* Initialize video output */
+            uint8_t *buf[3];
-
-            /* Check whether the input gives a particular aspect ratio */
@@ -224 +228 @@
-                                          p_dec->p_info->sequence->height,
-                                          i_chroma, i_aspect );
-
+
+
+
+
+
+
+
+
+
+
-
-        case STATE_PICTURE:
@@ -230 +243 @@
-            uint8_t *buf[3];
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            mpeg2_set_buf( p_dec->p_mpeg2dec, buf, p_pic );
-
@@ -363 +363 @@
-    }
-}
+
+/*****************************************************************************
+ * GetNewPicture: Get a new picture from the vout and set the buf struct
+ *****************************************************************************/
+static picture_t *GetNewPicture( dec_thread_t *p_dec, uint8_t **pp_buf )
+{
+    picture_t *p_pic;
+
+    /* Get a new picture */
+    while( !(p_pic = vout_CreatePicture( p_dec->p_vout, 0, 0, 0 ) ) )
+    {
+        if( p_dec->p_fifo->b_die || p_dec->p_fifo->b_error )
+            break;
+
+        msleep( VOUT_OUTMEM_SLEEP );
+    }
+    if( p_pic == NULL )
+        return NULL;
+
+    pp_buf[0] = p_pic->p[0].p_pixels;
+    pp_buf[1] = p_pic->p[1].p_pixels;
+    pp_buf[2] = p_pic->p[2].p_pixels;
+
+    return p_pic;
+}

po/fr.po

@@ -4054 +4054 @@
-#: modules/gui/wxwindows/interface.cpp:208
-msgid "About this program"
-Quitter l
+�propos de c
-
-#: modules/gui/wxwindows/interface.cpp:212
@@ -4066 +4066 @@
-#: modules/gui/wxwindows/interface.cpp:214
-msgid "&Network Stream..."
-
+&
-
-#: modules/gui/wxwindows/interface.cpp:216
@@ -4082 +4082 @@
-#: modules/gui/wxwindows/interface.cpp:226
-msgid "&Logs..."
-Disque
+&Messages
-
-#: modules/gui/wxwindows/interface.cpp:227
-msgid "&File info..."
-F
+Infos f
-
-#: modules/gui/wxwindows/interface.cpp:231