Commit 1e2f42cb authored by Laurent Aimar's avatar Laurent Aimar

Modified demux_vaControlHelper to take bitrate in an int64_t

parent fdf11136
......@@ -151,7 +151,7 @@ enum demux_query_e
DEMUX_CAN_SEEK, /* arg1= bool* can fail (assume false)*/
};
VLC_EXPORT( int, demux_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args ) );
VLC_EXPORT( int, demux_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int64_t i_bitrate, int i_align, int i_query, va_list args ) );
/*************************************************************************
* Miscellaneous helpers for demuxers
......
......@@ -446,12 +446,12 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
{
demux_sys_t *p_sys = p_demux->p_sys;
/* NB, demux_vaControlHelper only takes int for i_bps currently;
* (2**31)-1 is insufficient to store 1080p50 4:4:4. */
int64_t i_bps = 8LL * p_sys->frame_size * p_sys->pcr.i_divider_num
/ p_sys->pcr.i_divider_den;
/* (2**31)-1 is insufficient to store 1080p50 4:4:4. */
const int64_t i_bps = 8LL * p_sys->frame_size * p_sys->pcr.i_divider_num /
p_sys->pcr.i_divider_den;
/* XXX: DEMUX_SET_TIME is precise here */
return demux_vaControlHelper( p_demux->s, 0, -1, i_bps,
p_sys->frame_size, i_query, args );
}
......@@ -206,7 +206,7 @@ void demux_Delete( demux_t *p_demux )
*****************************************************************************/
int demux_vaControlHelper( stream_t *s,
int64_t i_start, int64_t i_end,
int i_bitrate, int i_align,
int64_t i_bitrate, int i_align,
int i_query, va_list args )
{
int64_t i_tell;
......
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