Commit aae23381 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* pass the orignal movie size from es_format_t to subpicture_t

parent e9ba2ffe
...@@ -253,12 +253,14 @@ struct subpicture_t ...@@ -253,12 +253,14 @@ struct subpicture_t
* changed by the video output thread, or simply ignored depending of the * changed by the video output thread, or simply ignored depending of the
* subtitle type. */ * subtitle 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 */
int i_height; /**< picture height */ int i_height; /**< picture height */
int b_absolute; /**< position is absolute */ int i_original_picture_width; /**< original width of the movie */
int i_flags; /**< position flags */ int i_original_picture_height;/**< original height of the movie */
int b_absolute; /**< position is absolute */
int i_flags; /**< position flags */
/**@}*/ /**@}*/
/** Pointer to function that renders this subtitle in a picture */ /** Pointer to function that renders this subtitle in a picture */
......
...@@ -90,6 +90,9 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec ) ...@@ -90,6 +90,9 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec )
/* Get display time now. If we do it later, we may miss the PTS. */ /* Get display time now. If we do it later, we may miss the PTS. */
p_spu_data->i_pts = p_sys->i_pts; p_spu_data->i_pts = p_sys->i_pts;
p_spu->i_original_picture_width = p_dec->fmt_in.subs.spu.i_original_frame_width;
p_spu->i_original_picture_height = p_dec->fmt_in.subs.spu.i_original_frame_height;
/* Getting the control part */ /* Getting the control part */
if( ParseControlSeq( p_dec, p_spu, p_spu_data ) ) if( ParseControlSeq( p_dec, p_spu, p_spu_data ) )
{ {
...@@ -98,7 +101,7 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec ) ...@@ -98,7 +101,7 @@ subpicture_t * E_(ParsePacket)( decoder_t *p_dec )
return NULL; return NULL;
} }
/* We try to display it */ /* We try to display it */
if( ParseRLE( p_dec, p_spu, p_spu_data ) ) if( ParseRLE( p_dec, p_spu, p_spu_data ) )
{ {
/* There was a parse error, delete the subpicture */ /* There was a parse error, delete the subpicture */
......
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