Changeset f6268f60f4d02aadbb8b14046f0aa96b39af63a8

Timestamp:

08/08/00 00:18:24 (8 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 965686704 +0000

git-parent:

[52d7937c89ef32288f99b79dcefd91dd48ae691a]

git-author:

Sam Hocevar <sam@videolan.org> 965686704 +0000

Message:

• vlc.init becomes ~/.vlcrc
  
• removed float operations in the video decoder, and all emms asm functions
  
• borrowed linuxvideo's MMX motion compensation
  
• fixed an undefined symbol in the MMX YUV plugin
  

Meuuh & Sam.

Files:

• AUTHORS (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• include/config.h.in (modified) (2 diffs)
• include/vpar_blocks.h (modified) (1 diff)
• include/vpar_headers.h (modified) (1 diff)
• include/vpar_synchro.h (modified) (2 diffs)
• plugins/yuvmmx/video_yuv.c (modified) (1 diff)
• plugins/yuvmmx/video_yuv.h (modified) (1 diff)
• src/interface/intf_cmd.c (modified) (2 diffs)
• src/video_decoder/video_decoder.c (modified) (2 diffs)
• src/video_output/video_output.c (modified) (4 diffs)
• src/video_parser/video_parser.c (modified) (1 diff)
• src/video_parser/vpar_blocks.c (modified) (30 diffs)
• src/video_parser/vpar_headers.c (modified) (6 diffs)
• src/video_parser/vpar_synchro.c (modified) (11 diffs)

AUTHORS

@@ -3 +3 @@
-  Michel Lespinasse <walken@wrs.com>
-
-
-
+
-
-  Jean-Philippe Grimaldi <jeanphi@via.ecp.fr>
@@ -15 +14 @@
-  Ga�Hendryckx <jimmy@via.ecp.fr>
-  Samuel Hocevar <sam@via.ecp.fr>
+  Brieuc Jeunhomme <bbp@via.ecp.fr>
-  Michel Kaempf <maxx@via.ecp.fr>
-
-  St�ane Borel <stef@via.ecp.fr>
-  Renaud Dartus <reno@via.ecp.fr>
-  Henri Fallon <henri@via.ecp.fr>
-
-  Contributors include Aaron Holtzman for his ac3dec decoder, and the
-  LiViD team for a few lines of code we borrowed here and there.

ChangeLog

@@ -6 +6 @@
-  * fixed functions that weren't properly inlined
-  * removed bloat from the MMX YUV plugin
+  * vlc.init becomes ~/.vlcrc
+  * removed float operations in the video decoder, and all emms asm functions
+  * borrowed linuxvideo's MMX motion compensation
+  * fixed an undefined symbol in the MMX YUV plugin
-
-Thu Jul 20 15:14:06 CEST 2000

Makefile.in

@@ -157 +157 @@
-# C Objects
-# 
-   
-       
-       
-       
-       
-       
-
-         
-       
-       
-       
-       
-       
-       
-       
-
-   
-
-   
-       
-       
-       
-
-   
-       
-       
-       
-       
-       
-       
-       
-       
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        
-   
-       
-
-   
-       
-       
-
-   
+
+
+
+
+
+
+
+
-
-#??generic_decoder_obj =        generic_decoder/generic_decoder.o
-# remeber to add it to OBJ 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

include/config.h.in

@@ -128 +128 @@
-
-/* Environment variable used to store startup script name and default value */
-_init
-vlc.init
+rc
+.vlcrc
-
-/* Environment variable used to store channels file and default value */
@@ -435 +435 @@
- *****************************************************************************/
-
-
-
+ << 10
+ << 10
-#define VOUT_SYNCHRO_HEAP_IDEAL_SIZE    5
+

include/vpar_blocks.h

@@ -167 +167 @@
-void vpar_InitCodedPattern( struct vpar_thread_s * p_vpar );
-void vpar_InitDCTTables( struct vpar_thread_s * p_vpar );
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+

include/vpar_headers.h

@@ -59 +59 @@
-    unsigned int        i_aspect_ratio;        /* height/width display ratio */
-    unsigned int        i_matrix_coefficients;/* coeffs of the YUV transform */
-float               r_frame_rate;       /* theoritical frame rate in fps
+int                 i_frame_rate;  /* theoritical frame rate in fps*1001
-    boolean_t           b_mpeg2;                                    /* guess */
-    boolean_t           b_progressive;              /* progressive (ie.

include/vpar_synchro.h

@@ -68 +68 @@
-    boolean_t     b_all_I;
-    boolean_t     b_all_P;
-double
+int   
-    boolean_t     b_all_B;
-double
+int   
-
-} video_synchro_t;
@@ -101 +101 @@
-
-    /* Dates needed to compute the date of the current frame
-r
+i
-    mtime_t     i_current_frame_date;
-    mtime_t     i_backward_frame_date;

plugins/yuvmmx/video_yuv.c

@@ -132 +132 @@
-void SetYUV( vout_thread_t *p_vout )
-{
-    int         pi_gamma[256];                                /* gamma table */
-    int         i_index;                                  /* index in tables */
-
-    /* Build gamma table */
-    SetGammaTable( pi_gamma, p_vout->f_gamma );
-
-    /*

plugins/yuvmmx/video_yuv.h

@@ -54 +54 @@
- * Local prototypes
- *****************************************************************************/
-void SetGammaTable        ( int *pi_table, double f_gamma );
-void SetYUV               ( vout_thread_t *p_vout );
-void SetOffset            ( int i_width, int i_height, int i_pic_width,

src/interface/intf_cmd.c

@@ -159 +159 @@
-    char    psz_line[INTF_MAX_CMD_SIZE];                             /* line */
-    char *  psz_index;                                    /* index in string */
+    char *  psz_vlcrc;                                 /* full path to vlcrc */
-    int     i_err;                                        /* error indicator */
-
-    /* Open file */
-    i_err = 0;
-
+
+
+
+
+
+
+
+
+
-    if( p_file == NULL )
-    {
-filename
+vlcrc
-        return( -1 );
-    }
@@ -195 +204 @@
-    if( !feof( p_file ) )
-    {
-filename
+vlcrc
-        return( -1 );
-    }

src/video_decoder/video_decoder.c

@@ -323 +323 @@
-            "movq       %%mm2,(%0)\n\t"
-
-
- 
+//
+
-}
-#endif
@@ -390 +390 @@
-            "packuswb   120(%1),%%mm0\n\t"
-            "movq        %%mm0,(%0)\n\t"
-
+//
-            :"+r" (p_data): "r" (p_block),"r" (i_incr+8));
-}

src/video_output/video_output.c

@@ -1692 +1692 @@
-    if( p_vout->c_fps_samples > VOUT_FPS_SAMPLES )
-    {
-", (double) VOUT_FPS_SAMPLES * 100000
+/10", VOUT_FPS_SAMPLES * 1000000 * 1
-                 ( p_vout->p_fps_sample[ (p_vout->c_fps_samples - 1) % VOUT_FPS_SAMPLES ] -
-                   p_vout->p_fps_sample[ p_vout->c_fps_samples % VOUT_FPS_SAMPLES ] ) );
@@ -1940 +1940 @@
-    static int i_panic_count = 0;
-    static int i_last_synchro_inc = 0;
-float r
+int i
-    static int i_truc = 10;
-
@@ -1966 +1966 @@
-    }
-
-*2*2*2*2*2
+ >> 5
-        i_synchro_inc*i_last_synchro_inc < 0 )
-    {
@@ -1986 +1986 @@
-    else if( i_delay > 100000 )
-    {
-r_synchro_level += 1
+i_synchro_level += 1 << 10
-        if( i_delay > 130000 )
-r_synchro_level += 1
-
-
-r_synchro_level += (float)i_synchro_inc
-int)(r_synchro_level+0.5
-
-r
-
-r
+i_synchro_level += 1 << 10
+
+
+i_synchro_level += ( i_synchro_inc << 10 )
+ i_synchro_level + (1 << 9) 
+
+i
+
+i
-    }
-

src/video_parser/video_parser.c

@@ -292 +292 @@
-    p_vpar->synchro.i_theorical_delay  = 40000; /* 25 fps */
-    /* assume we can display all Is and 2 Ps */
-
+ << 10
-    p_vpar->synchro.b_all_P = 0;
-
+ << 10
-    p_vpar->synchro.b_all_B = 0;
-    p_vpar->synchro.displayable_b = 0;
-    /* assume there were about 3 P and 6 B images between I's */
-
-
+ << 10
+ << 10
-#endif
-

src/video_parser/vpar_blocks.c

@@ -619 +619 @@
- * DecodeMPEG1NonIntra : decode MPEG-1 non-intra blocks
- *****************************************************************************/
-
+__inline__ 
-                                            macroblock_t * p_mb, int i_b,
-                                            int i_chroma_format )
@@ -730 +730 @@
- * DecodeMPEG1Intra : decode MPEG-1 intra blocks
- *****************************************************************************/
-
+__inline__ 
-                                         macroblock_t * p_mb, int i_b ,
-                                         int i_chroma_format )
@@ -877 +877 @@
- * DecodeMPEG2NonIntra : decode MPEG-2 non-intra blocks
- *****************************************************************************/
-
+__inline__ 
-                                            macroblock_t * p_mb, int i_b,
-                                            int i_chroma_format )
@@ -986 +986 @@
- * DecodeMPEG2Intra : decode MPEG-2 intra blocks
- *****************************************************************************/
-
+__inline__ 
-                                         macroblock_t * p_mb, int i_b,
-                                         int i_chroma_format )
@@ -1136 +1136 @@
- * MotionCode : Parse the next motion code
- ****************************************************************************/
-
+__inline__ 
-{
-    int i_code;
@@ -1185 +1185 @@
- * DecodeMotionVector : Decode a motion_vector
- ****************************************************************************/
-
+__inline__ 
-        int i_motion_code, int i_motion_residual, int i_full_pel )
-{
@@ -1212 +1212 @@
- * MotionVector : Parse the next motion_vector field
- ****************************************************************************/
-
+__inline__ 
-                                     macroblock_t * p_mb, int i_r,
-                                     int i_s, int i_full_pel, int i_structure )
@@ -1322 +1322 @@
- *****************************************************************************/
-static void DecodeMVMPEG1( vpar_thread_t * p_vpar,
- 
+
-{
-    MotionVector( p_vpar, p_mb, 0, i_s,
@@ -1332 +1332 @@
- *****************************************************************************/
-static void DecodeMVMPEG2( vpar_thread_t * p_vpar,
- 
+
-{
-    if( p_vpar->mb.i_mv_count == 1 )
@@ -1390 +1390 @@
- * IMBType : macroblock_type in I pictures
- *****************************************************************************/
-
+__inline__ 
-{
-    /* Take two bits for testing */
@@ -1408 +1408 @@
- * PMBType : macroblock_type in P pictures
- *****************************************************************************/
-
+__inline__ 
-{
-    /* Testing on 6 bits */
@@ -1422 +1422 @@
- * BMBType : macroblock_type in B pictures
- *****************************************************************************/
-
+__inline__ 
-{
-     /* Testing on 6 bits */
@@ -1437 +1437 @@
- * DMBType : macroblock_type in D pictures
- *****************************************************************************/
-
+__inline__ 
-{
-    return GetBits( &p_vpar->bit_stream, 1 );
@@ -1445 +1445 @@
- * CodedPattern420 : coded_block_pattern with 4:2:0 chroma
- *****************************************************************************/
-
+__inline__ 
-{
-    /* Take the max 9 bits length vlc code for testing */
@@ -1460 +1460 @@
- * CodedPattern422 : coded_block_pattern with 4:2:2 chroma
- *****************************************************************************/
-
+__inline__ 
-{
-    int      i_vlc = ShowBits( &p_vpar->bit_stream, 9 );
@@ -1474 +1474 @@
- * CodedPattern444 : coded_block_pattern with 4:4:4 chroma
- *****************************************************************************/
-
+__inline__ 
-{
-    int      i_vlc = ShowBits( &p_vpar->bit_stream, 9 );
@@ -1487 +1487 @@
- * InitMacroblock : Initialize macroblock values
- *****************************************************************************/
-
+__inline__ 
-                                       macroblock_t * p_mb, int i_coding_type,
-                                       int i_chroma_format,
@@ -1522 +1522 @@
- * UpdateContext : Update the p_vpar contextual values
- *****************************************************************************/
-
+__inline__ 
-{
-    /* Update macroblock real position. */
@@ -1540 +1540 @@
- * SkippedMacroblock : Generate a skipped macroblock with NULL motion vector
- *****************************************************************************/
-
+__inline__ 
-                                          int i_mb_base, int i_coding_type,
-                                          int i_chroma_format,
@@ -1600 +1600 @@
- * MacroblockModes : Get the macroblock_modes structure
- *****************************************************************************/
-
+__inline__ 
-                                        macroblock_t * p_mb,
-                                        int i_chroma_format,
@@ -1683 +1683 @@
-    return;                                                             \
-}
-
-
-#define PARSEBLOCKS( MPEG1FUNC, MPEG2FUNC )                             \
@@ -1747 +1746 @@
-}
-
-
+__inline__ 
-                           vpar_thread_t * p_vpar,
-                           int * pi_mb_address,     /* previous address to be
@@ -1979 +1978 @@
-
-/*****************************************************************************
+ * ParseMacroblockVWXYZ : Parse the next macroblock ; specific functions
+ *****************************************************************************
+ * V = MPEG2 ?
+ * W = coding type ?
+ * X = chroma format ?
+ * Y = structure ?
+ * Z = second field ?
+ *****************************************************************************/
+void ParseMacroblockGENERIC( vpar_thread_t * p_vpar, int * pi_mb_address,
+                             int i_mb_previous, int i_mb_base,
+                             boolean_t b_mpeg2, int i_coding_type,
+                             int i_chroma_format, int i_structure,
+                             boolean_t b_second_field )
+{
+/*    ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+                     b_mpeg2, i_coding_type, i_chroma_format,
+                     i_structure, b_second_field );*/
+}
+
+#if (VPAR_OPTIM_LEVEL > 0)
+/* Optimizations for frame pictures */
+void ParseMacroblock2I420F0( vpar_thread_t * p_vpar, int * pi_mb_address,                                    int i_mb_previous, int i_mb_base,
+                             boolean_t b_mpeg2, int i_coding_type,
+                             int i_chroma_format, int i_structure,
+                             boolean_t b_second_field )
+{
+    ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+                     1, I_CODING_TYPE, CHROMA_420,
+                     FRAME_STRUCTURE, 0 );
+}
+
+void ParseMacroblock2P420F0( vpar_thread_t * p_vpar, int * pi_mb_address,                                    int i_mb_previous, int i_mb_base,
+                             boolean_t b_mpeg2, int i_coding_type,
+                             int i_chroma_format, int i_structure,
+                             boolean_t b_second_field )
+{
+    ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+                     1, P_CODING_TYPE, CHROMA_420,
+                     FRAME_STRUCTURE, 0 );
+}
+
+void ParseMacroblock2B420F0( vpar_thread_t * p_vpar, int * pi_mb_address,                                    int i_mb_previous, int i_mb_base,
+                             boolean_t b_mpeg2, int i_coding_type,
+                             int i_chroma_format, int i_structure,
+                             boolean_t b_second_field )
+{
+    ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+                     1, B_CODING_TYPE, CHROMA_420,
+                     FRAME_STRUCTURE, 0 );
+}
+#endif
+
+#if (VPAR_OPTIM_LEVEL > 1)
+/* Optimizations for field pictures */
+void ParseMacroblock2I420TZ( vpar_thread_t * p_vpar, int * pi_mb_address,                                    int i_mb_previous, int i_mb_base,
+                             boolean_t b_mpeg2, int i_coding_type,
+                             int i_chroma_format, int i_structure,
+                             boolean_t b_second_field )
+{
+    ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+                     1, I_CODING_TYPE, CHROMA_420,
+                     TOP_FIELD, (p_vpar->picture.i_structure !=
+                                 p_vpar->picture.i_current_structure) );
+}
+
+void ParseMacroblock2P420TZ( vpar_thread_t * p_vpar, int * pi_mb_address,                                    int i_mb_previous, int i_mb_base,
+                             boolean_t b_mpeg2, int i_coding_type,
+                             int i_chroma_format, int i_structure,
+                             boolean_t b_second_field )
+{
+    ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+                     1, P_CODING_TYPE, CHROMA_420,
+                     TOP_FIELD, (p_vpar->picture.i_structure !=
+                                 p_vpar->picture.i_current_structure) );
+}
+
+void ParseMacroblock2B420TZ( vpar_thread_t * p_vpar, int * pi_mb_address,                                    int i_mb_previous, int i_mb_base,
+                             boolean_t b_mpeg2, int i_coding_type,
+                             int i_chroma_format, int i_structure,
+                             boolean_t b_second_field )
+{
+    ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+                     1, B_CODING_TYPE, CHROMA_420,
+                     TOP_FIELD, (p_vpar->picture.i_structure !=
+                                 p_vpar->picture.i_current_structure) );
+}
+
+void ParseMacroblock2I420BZ( vpar_thread_t * p_vpar, int * pi_mb_address,                                    int i_mb_previous, int i_mb_base,
+                             boolean_t b_mpeg2, int i_coding_type,
+                             int i_chroma_format, int i_structure,
+                             boolean_t b_second_field )
+{
+    ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+                     1, I_CODING_TYPE, CHROMA_420,
+                     BOTTOM_FIELD, (p_vpar->picture.i_structure !=
+                                    p_vpar->picture.i_current_structure) );
+}
+
+void ParseMacroblock2P420BZ( vpar_thread_t * p_vpar, int * pi_mb_address,                                    int i_mb_previous, int i_mb_base,
+                             boolean_t b_mpeg2, int i_coding_type,
+                             int i_chroma_format, int i_structure,
+                             boolean_t b_second_field )
+{
+    ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+                     1, P_CODING_TYPE, CHROMA_420,
+                     BOTTOM_FIELD, (p_vpar->picture.i_structure !=
+                                    p_vpar->picture.i_current_structure) );
+}
+
+void ParseMacroblock2B420BZ( vpar_thread_t * p_vpar, int * pi_mb_address,                                    int i_mb_previous, int i_mb_base,
+                             boolean_t b_mpeg2, int i_coding_type,
+                             int i_chroma_format, int i_structure,
+                             boolean_t b_second_field )
+{
+    ParseMacroblock( p_vpar, pi_mb_address, i_mb_previous, i_mb_base,
+                     1, B_CODING_TYPE, CHROMA_420,
+                     BOTTOM_FIELD, (p_vpar->picture.i_structure !=
+                                    p_vpar->picture.i_current_structure) );
+}
+#endif
+
+/*****************************************************************************
- * SliceHeader : Parse the next slice structure
- *****************************************************************************/
-
+
+
+
+
+
+
-                                    int * pi_mb_address, int i_mb_base,
-                                    u32 i_vert_code, boolean_t b_high,
@@ -1989 +2115 @@
-                                    boolean_t b_second_field )
-{
+    static f_parse_mb_t ppf_parse_mb[4][4] =
+    {
+        {
+            NULL, NULL, NULL, NULL
+        },
+        {
+            /* TOP_FIELD */
+#if (VPAR_OPTIM_LEVEL > 1)
+            NULL, ParseMacroblock2I420TZ, ParseMacroblock2P420TZ,
+            ParseMacroblock2B420TZ
+#else
+            NULL, ParseMacroblockGENERIC, ParseMacroblockGENERIC,
+            ParseMacroblockGENERIC
+#endif
+        },
+        {
+            /* BOTTOM_FIELD */
+#if (VPAR_OPTIM_LEVEL > 1)
+            NULL, ParseMacroblock2I420BZ, ParseMacroblock2P420BZ,
+            ParseMacroblock2B420BZ
+#else
+            NULL, ParseMacroblockGENERIC, ParseMacroblockGENERIC,
+            ParseMacroblockGENERIC
+#endif
+        },
+        {
+            /* FRAME_PICTURE */
+#if (VPAR_OPTIM_LEVEL > 0)
+            NULL, ParseMacroblock2I420F0, ParseMacroblock2P420F0,
+            ParseMacroblock2B420F0
+#else
+            NULL, ParseMacroblockGENERIC, ParseMacroblockGENERIC,
+            ParseMacroblockGENERIC
+#endif
+        }
+    };
+
-    int                     i_mb_address_save = *pi_mb_address;
-
@@ -2040 +2203 @@
-            return;
-        }
-
+
+
+
+
+
+
+
-                         i_mb_base, b_mpeg2, i_coding_type,
-                         i_chroma_format, i_structure,
-                         b_second_field );
+        }
+        else
+        {
+            /* Try to find an optimized function. */
+            if( ppf_parse_mb[p_vpar->picture.i_structure]
+                            [p_vpar->picture.i_coding_type] == NULL )
+            {
+                intf_ErrMsg( "vpar error: bad ppf_parse_mb function pointer (struct:%d, coding type:%d)\n",
+                         p_vpar->picture.i_structure, p_vpar->picture.i_coding_type );
+            }
+            else
+            {
+                ppf_parse_mb[p_vpar->picture.i_structure]
+                            [p_vpar->picture.i_coding_type]
+                       ( p_vpar, pi_mb_address, i_mb_address_save,
+                         i_mb_base, b_mpeg2, i_coding_type,
+                         i_chroma_format, i_structure,
+                         b_second_field );
+            }
+        }
+
-        i_mb_address_save = *pi_mb_address;
-        if( p_vpar->picture.b_error )
@@ -2057 +2247 @@
- * PictureData : Parse off all macroblocks (ISO/IEC 13818-2 6.2.3.7)
- *****************************************************************************/
-
-
-
-
-
+
-{
-    int         i_mb_address = 0;