Commit d8fe284a authored by Vincent Seguin's avatar Vincent Seguin

Temporaire (�a segfaulte si on le chatouille un peu).

YUV walken avec resize. Y et + seulement pour le moment.
parent fc6b9b04
...@@ -97,15 +97,17 @@ typedef struct picture_s ...@@ -97,15 +97,17 @@ typedef struct picture_s
typedef struct subpicture_s typedef struct subpicture_s
{ {
/* Type and flags - should NOT be modified except by the vout thread */ /* Type and flags - should NOT be modified except by the vout thread */
int i_type; /* spu type */ int i_type; /* type */
int i_status; /* spu flags */ int i_status; /* flags */
int i_size; /* data size */
/* Other properties */ /* Other properties */
mtime_t begin_date; /* beginning of display date */ mtime_t begin_date; /* beginning of display date */
mtime_t end_date; /* end of display date */ mtime_t end_date; /* end of display date */
/* Display properties - these properties are only indicative and may be /* Display properties - these properties are only indicative and may be
* changed by the video output thread */ * changed by the video output thread, or simply ignored depending of the
* subpicture type. */
int i_x; /* offset from alignment position */ int i_x; /* offset from alignment position */
int i_y; /* offset from alignment position */ int i_y; /* offset from alignment position */
int i_width; /* picture width */ int i_width; /* picture width */
...@@ -113,15 +115,30 @@ typedef struct subpicture_s ...@@ -113,15 +115,30 @@ typedef struct subpicture_s
int i_horizontal_align; /* horizontal alignment */ int i_horizontal_align; /* horizontal alignment */
int i_vertical_align; /* vertical alignment */ int i_vertical_align; /* vertical alignment */
/* Sub picture unit data - data can always be freely modified. p_data itself /* Additionnal properties depending of the subpicture type */
* (the pointer) should NEVER be modified. */ union
void * p_data; /* spu data */ {
/* Text subpictures properties - text is stored in data area, in ASCIIZ
* format */
struct
{
p_vout_font_t p_font; /* font, NULL for default */
int i_style; /* text style */
u32 i_char_color; /* character color */
u32 i_border_color; /* border color */
u32 i_bg_color; /* background color */
} text;
} type;
/* Subpicture data, format depends of type - data can always be freely
* modified. p_data itself (the pointer) should NEVER be modified. */
void * p_data; /* subpicture data */
} subpicture_t; } subpicture_t;
/* Subpicture type */ /* Subpicture type */
#define EMPTY_SUBPICTURE 0 /* subtitle slot is empty and available */ #define EMPTY_SUBPICTURE 0 /* subtitle slot is empty and available */
#define RLE_SUBPICTURE 100 /* RLE encoded subtitle */ #define RLE_SUBPICTURE 100 /* RLE encoded subtitle */
#define TEXT_SUBPICTURE 200 /* iso8859-1 text subtitle */ #define TEXT_SUBPICTURE 200 /* single line text */
/* Subpicture status */ /* Subpicture status */
#define FREE_SUBPICTURE 0 /* subpicture is free and not allocated */ #define FREE_SUBPICTURE 0 /* subpicture is free and not allocated */
......
...@@ -17,16 +17,13 @@ ...@@ -17,16 +17,13 @@
* p_pic picture address * p_pic picture address
* p_y, p_u, p_v Y,U,V samples addresses * p_y, p_u, p_v Y,U,V samples addresses
* i_width, i_height Y samples extension * i_width, i_height Y samples extension
* i_skip Y pixels to skip at the end of a line
* i_pic_width, i_pic_height picture extension * i_pic_width, i_pic_height picture extension
* i_pic_skip pixels to skip at the end of a line * i_pic_line_width picture total line width
* i_matrix_coefficients matrix coefficients * i_matrix_coefficients matrix coefficients
* Conditions:
* i_width % 16 == 0
*******************************************************************************/ *******************************************************************************/
typedef void (vout_yuv_convert_t)( p_vout_thread_t p_vout, void *p_pic, typedef void (vout_yuv_convert_t)( p_vout_thread_t p_vout, void *p_pic,
yuv_data_t *p_y, yuv_data_t *p_u, yuv_data_t *p_v, yuv_data_t *p_y, yuv_data_t *p_u, yuv_data_t *p_v,
int i_width, int i_height, int i_skip, int i_width, int i_height,
int i_pic_width, int i_pic_height, int i_pic_skip, int i_pic_width, int i_pic_height, int i_pic_skip,
int i_matrix_coefficients ); int i_matrix_coefficients );
......
...@@ -88,7 +88,7 @@ typedef struct video_synchro_s ...@@ -88,7 +88,7 @@ typedef struct video_synchro_s
} video_synchro_t; } video_synchro_t;
#define SYNC_TOLERATE 10000 /* 10 ms */ #define SYNC_TOLERATE 10000 /* 10 ms */
#define SYNC_DELAY 100000 #define SYNC_DELAY 500000
#endif #endif
/***************************************************************************** /*****************************************************************************
......
...@@ -10,36 +10,21 @@ ...@@ -10,36 +10,21 @@
/******************************************************************************* /*******************************************************************************
* Preamble * Preamble
*******************************************************************************/ *******************************************************************************/
#include "vlc.h"
/*
#include <errno.h> #include <errno.h>
#include <netinet/in.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <sys/soundcard.h>
#include <sys/uio.h>
#include "config.h" #include "config.h"
#include "common.h" #include "common.h"
#include "mtime.h" #include "mtime.h"
#include "vlc_thread.h" #include "vlc_thread.h"
#include "input.h"
#include "input_vlan.h"
#include "audio_output.h"
#include "video.h"
#include "video_output.h"
#include "xconsole.h"
#include "interface.h" #include "interface.h"
#include "intf_msg.h" #include "intf_msg.h"
#include "intf_cmd.h" #include "intf_cmd.h"
#include "intf_ctrl.h" #include "intf_ctrl.h"
*/ #include "main.h"
/* /*
* Local prototypes * Local prototypes
......
This diff is collapsed.
This diff is collapsed.
...@@ -380,9 +380,9 @@ mtime_t vpar_SynchroDate( vpar_thread_t * p_vpar ) ...@@ -380,9 +380,9 @@ mtime_t vpar_SynchroDate( vpar_thread_t * p_vpar )
{ {
mtime_t i_displaydate = p_vpar->synchro.i_last_display_pts; mtime_t i_displaydate = p_vpar->synchro.i_last_display_pts;
#if 0
static mtime_t i_delta = 0;
static mtime_t i_delta = 0;
#if 0
fprintf( stderr, fprintf( stderr,
"displaying type %i with delay %lli and delta %lli\n", "displaying type %i with delay %lli and delta %lli\n",
p_vpar->synchro.fifo[p_vpar->synchro.i_fifo_start].i_image_type, p_vpar->synchro.fifo[p_vpar->synchro.i_fifo_start].i_image_type,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment