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

diff --git a/modules/access/pvr/pvr.c b/modules/access/pvr/pvr.c
index cb1376ec685c6bb169c675be5850afb4f6824a18..fdda029b567513ecba5a4d575a3281d9523381e3 100644 (file)
--- a/modules/access/pvr/pvr.c
+++ b/modules/access/pvr/pvr.c
@@ -95,6 +95,8 @@ struct access_sys_t
     int i_height;
     int i_frequency;
     int i_framerate;
+    int i_bframes;
+    int i_keyint;
     int i_bitrate;
     int i_bitrate_peak;
     int i_bitrate_mode;
@@ -135,6 +137,8 @@ static int Open( vlc_object_t * p_this )
     p_sys->i_height = -1;
     p_sys->i_frequency = -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_peak = -1;
     p_sys->i_bitrate_mode = -1;
@@ -209,6 +213,20 @@ static int Open( vlc_object_t * p_this )
                     strtol( psz_parser + strlen( "framerate=" ),
                             &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=",
                                strlen( "width=" ) ) )
             {
@@ -403,6 +421,8 @@ static int Open( vlc_object_t * p_this )
 
     /* codec parameters */
     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_peak != -1
             || p_sys->i_bitrate != -1
@@ -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 )
             {
                 codec.bitrate = p_sys->i_bitrate;