Commit a8037049 authored by Christophe Massiot's avatar Christophe Massiot

* modules/access/pvr: Added keyint= and bframes= options.

parent 05e5b2ec
...@@ -95,6 +95,8 @@ struct access_sys_t ...@@ -95,6 +95,8 @@ struct access_sys_t
int i_height; int i_height;
int i_frequency; int i_frequency;
int i_framerate; int i_framerate;
int i_bframes;
int i_keyint;
int i_bitrate; int i_bitrate;
int i_bitrate_peak; int i_bitrate_peak;
int i_bitrate_mode; int i_bitrate_mode;
...@@ -135,6 +137,8 @@ static int Open( vlc_object_t * p_this ) ...@@ -135,6 +137,8 @@ static int Open( vlc_object_t * p_this )
p_sys->i_height = -1; p_sys->i_height = -1;
p_sys->i_frequency = -1; p_sys->i_frequency = -1;
p_sys->i_framerate = -1; p_sys->i_framerate = -1;
p_sys->i_keyint = -1;
p_sys->i_bframes = -1;
p_sys->i_bitrate = -1; p_sys->i_bitrate = -1;
p_sys->i_bitrate_peak = -1; p_sys->i_bitrate_peak = -1;
p_sys->i_bitrate_mode = -1; p_sys->i_bitrate_mode = -1;
...@@ -209,6 +213,20 @@ static int Open( vlc_object_t * p_this ) ...@@ -209,6 +213,20 @@ static int Open( vlc_object_t * p_this )
strtol( psz_parser + strlen( "framerate=" ), strtol( psz_parser + strlen( "framerate=" ),
&psz_parser, 0 ); &psz_parser, 0 );
} }
else if( !strncmp( psz_parser, "keyint=",
strlen( "keyint=" ) ) )
{
p_sys->i_keyint =
strtol( psz_parser + strlen( "keyint=" ),
&psz_parser, 0 );
}
else if( !strncmp( psz_parser, "bframes=",
strlen( "bframes=" ) ) )
{
p_sys->i_bframes =
strtol( psz_parser + strlen( "bframes=" ),
&psz_parser, 0 );
}
else if( !strncmp( psz_parser, "width=", else if( !strncmp( psz_parser, "width=",
strlen( "width=" ) ) ) strlen( "width=" ) ) )
{ {
...@@ -403,6 +421,8 @@ static int Open( vlc_object_t * p_this ) ...@@ -403,6 +421,8 @@ static int Open( vlc_object_t * p_this )
/* codec parameters */ /* codec parameters */
if ( p_sys->i_framerate != -1 if ( p_sys->i_framerate != -1
|| p_sys->i_keyint != -1
|| p_sys->i_bframes != -1
|| p_sys->i_bitrate_mode != -1 || p_sys->i_bitrate_mode != -1
|| p_sys->i_bitrate_peak != -1 || p_sys->i_bitrate_peak != -1
|| p_sys->i_bitrate != -1 || p_sys->i_bitrate != -1
...@@ -433,6 +453,16 @@ static int Open( vlc_object_t * p_this ) ...@@ -433,6 +453,16 @@ static int Open( vlc_object_t * p_this )
} }
} }
if ( p_sys->i_keyint != -1 )
{
codec.framespergop = p_sys->i_keyint;
}
if ( p_sys->i_bframes != -1 )
{
codec.bframes = p_sys->i_bframes;
}
if ( p_sys->i_bitrate != -1 ) if ( p_sys->i_bitrate != -1 )
{ {
codec.bitrate = p_sys->i_bitrate; codec.bitrate = p_sys->i_bitrate;
......
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