Changeset 5c0e385a484c1f28ebf9e2a4b33ecbdf07959a8f

Timestamp:

05/04/07 14:09:00 (2 years ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1175774940 +0000

git-parent:

[f4e4859fd74264e27f3e1c29fef6a46abc603610]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1175774940 +0000

Message:

Various compile fixes for modules/codec/xvmc

Files:

• modules/codec/xvmc/accel_xvmc.h (modified) (1 diff)
• modules/codec/xvmc/decode.c (modified) (4 diffs)
• modules/codec/xvmc/header.c (modified) (2 diffs)
• modules/codec/xvmc/mpeg2.h (modified) (1 diff)
• modules/codec/xvmc/slice_xvmc_vld.c (modified) (6 diffs)
• modules/codec/xvmc/xxmc.c (modified) (17 diffs)

modules/codec/xvmc/accel_xvmc.h

@@ -39 +39 @@
-extern "C" {
-#endif
-
-
-typedef struct vlc_macroblock_s

modules/codec/xvmc/decode.c

@@ -22 +22 @@
- */
-
+#include <vlc/vlc.h>
+#include <vlc_vout.h>
+
-#include "xxmc-config.h"
-
@@ -31 +34 @@
-#include "attributes.h"
-#include "mpeg2_internal.h"
+#include "xvmc_vld.h"
-
-static int mpeg2_accels = 0;
@@ -174 +178 @@
-    while(1)
-    {
-
+ 
-                 < mpeg2dec->nb_decode_slices )
-        {
@@ -204 +208 @@
-            }
-            mpeg2dec->bytes_since_tag += copied;
-&(mpeg2dec->decoder)
+mpeg2dec
-                              mpeg2dec->code,mpeg2dec->chunk_start,
-                              mpeg2dec->chunk_size);

modules/codec/xvmc/header.c

@@ -23 +23 @@
- */
-
+#include <vlc/vlc.h>
+
+#include <inttypes.h>
+#include <stdlib.h> /* defines NULL */
+#include <string.h> /* memcmp */
+
-#include "xxmc-config.h"
-
-#include <inttypes.h>
-#include <stdlib.h> /* defines NULL */
-#include <string.h> /* memcmp */
-
-#include "mpeg2.h"
@@ -661 +663 @@
-        picture->display_offset[i].x = mpeg2dec->display_offset_x = x >> 1;
-        picture->display_offset[i].y = mpeg2dec->display_offset_y = y >> 1;
-        }
-    }
-    for( ; i < 3; i++ )

modules/codec/xvmc/mpeg2.h

@@ -59 +59 @@
-    uint8_t transfer_characteristics;
-    uint8_t matrix_coefficients;
-    
+
-} mpeg2_sequence_t;
-

modules/codec/xvmc/slice_xvmc_vld.c

@@ -17 +17 @@
- *
- */
-
+
-#include <vlc/vlc.h>
-#include <vlc_vout.h>
@@ -48 +48 @@
-};
-
-
-
-
-
-
+
+
+
-{
-    if (picture)
@@ -58 +56 @@
-        //vlc_fourcc_t decoder_format = picture->format.i_chroma;
-        //if (decoder_format == VLC_FOURCC('X','x','M','C')) {
-accel_
+
-
-        /*
@@ -89 +87 @@
-}
-
- int code,
-
+
+
-{
-    mpeg2_decoder_t * const decoder = &(mpeg2dec->decoder);
-    picture = (picture_t *)mpeg2dec->fbuf[0]->id;
-accel_
+
-    vlc_vld_frame_t *vft = &xxmc->vld_frame;
-    unsigned mb_frame_height;
@@ -188 +186 @@
-    int i=0;
-    if ( vft->forward_reference_picture != NULL && ((vlc_xxmc_t *)
-accel_
+
-    {
-        printf("\nFORWARD SLICE DATA !!!! size=%d\n", ((vlc_xxmc_t *)
-accel_
+
-        for (i=0;i<10;i++)
-        {
-accel_
+
-        }
-        printf("\nFORWARD SLICE DATA END!!!!\n");
-    }
-    if ( vft->backward_reference_picture != NULL && ((vlc_xxmc_t *)
-accel_
+
-    {
-        printf("\nBACKWARD SLICE DATA !!!! size=%d\n", ((vlc_xxmc_t *)
-accel_
+
-        for (i=0;i<10;i++)
-        {
-accel_
+
-        }
-        printf("\nBACKWARD SLICE DATA END!!!!\n");
@@ -281 +279 @@
-void mpeg2_xxmc_vld_frame_complete(mpeg2dec_t *mpeg2dec, picture_t *picture, int code) 
-{
-accel_
+
-    vlc_vld_frame_t *vft = &xxmc->vld_frame;
-

modules/codec/xvmc/xxmc.c

@@ -29 +29 @@
-#include <vlc_vout.h>
-#include <vlc_codec.h>
-
+
+
+
+
-#include <mcheck.h>
-
@@ -36 +39 @@
-#include "mpeg2_internal.h"
-#include "xvmc_vld.h"
-
-#include "vout_synchro.h"
-
-/* Aspect ratio (ISO/IEC 13818-2 section 6.3.3, table 6-3) */
@@ -45 +46 @@
-#define AR_221_1_PICTURE        4                  /* 2.21:1 picture (movie) */
-
-#include <unistd.h>
-/*****************************************************************************
- * decoder_sys_t : libmpeg2 decoder descriptor
@@ -61 +61 @@
-     * Input properties
-     */
-    pes_packet_t     *p_pes;                  /* current PES we are decoding */
-    mtime_t          i_pts;
-    mtime_t          i_previous_pts;
-    mtime_t          i_current_pts;
-    mtime_t          i_previous_dts;
-    
+
-    int              i_current_rate;
-    picture_t *      p_picture_to_destroy;
@@ -78 +77 @@
-     */
-    vout_synchro_t *p_synchro;
-
-   
+           
+
-
-};
@@ -111 +110 @@
-
-    decoder_t *p_dec = (decoder_t*)p_this;
-
+ = NULL
-    uint32_t i_accel = 0;
-    FILE *f_wd_dec; 
@@ -131 +130 @@
-
-    /* Allocate the memory needed to store the decoder's structure */
-if( ( p_dec->p_sys = p_sys =
-      (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL
+p_dec->p_sys = p_sys = (decoder_sys_t *)malloc(sizeof(decoder_sys_t));
+if( !p_sys
-    {
-        msg_Err( p_dec, "out of memory" );
@@ -140 +139 @@
-    /* Initialize the thread properties */
-    memset( p_sys, 0, sizeof(decoder_sys_t) );
-    p_sys->p_pes      = NULL;
-    p_sys->p_mpeg2dec = NULL;
-    p_sys->p_synchro  = NULL;
@@ -155 +153 @@
-
-#if defined( __i386__ )
-
+_global
-    {
-        i_accel |= MPEG2_ACCEL_X86_MMX;
-    }
-
-
+_global
-    {
-        i_accel |= MPEG2_ACCEL_X86_3DNOW;
-    }
-
-
+_global
-    {
-        i_accel |= MPEG2_ACCEL_X86_MMXEXT;
@@ -171 +169 @@
-
-#elif defined( __powerpc__ ) || defined( SYS_DARWIN )
-
+_global
-    {
-        i_accel |= MPEG2_ACCEL_PPC_ALTIVEC;
@@ -275 +273 @@
-                    {
-                        vout_SynchroNewPicture( p_sys->p_synchro,
-
+
+
-                        vout_SynchroDecode( p_sys->p_synchro );
-                        vout_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 );
@@ -393 +392 @@
-                        p_sys->p_info->current_picture->flags & PIC_MASK_CODING_TYPE,
-                        p_sys->p_info->current_picture->nb_fields,
-
+
+
-
-                if( p_sys->b_skip )
@@ -418 +418 @@
-                    msg_Dbg( p_dec, "intra-slice refresh stream" );
-                    vout_SynchroNewPicture( p_sys->p_synchro,
-
+
+
-                    vout_SynchroDecode( p_sys->p_synchro );
-                    vout_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 );
@@ -452 +453 @@
-                    p_sys->p_info->current_picture->flags & PIC_MASK_CODING_TYPE,
-                    p_sys->p_info->current_picture->nb_fields, i_pts,
-
+
+
-
-                if ( !(p_sys->b_slice_i
@@ -460 +462 @@
-                                p_sys->p_info->current_picture->flags
-                                    & PIC_MASK_CODING_TYPE,
-
+
+
-                {
-                    mpeg2_skip( p_sys->p_mpeg2dec, 1 );
@@ -588 +591 @@
-                {
-                    vout_SynchroNewPicture( p_sys->p_synchro,
-
+
+
-                    vout_SynchroDecode( p_sys->p_synchro );
-                    vout_SynchroEnd( p_sys->p_synchro, I_CODING_TYPE, 0 );
@@ -669 +673 @@
-    decoder_sys_t *p_sys = p_dec->p_sys;
-    picture_t *p_pic;
-    static int nbpic = 0;
-
-    p_dec->fmt_out.video.i_width = p_sys->p_info->sequence->width;