Changeset a4056df25a32758069120e7749938397ee0e34b8

Timestamp:

05/17/08 19:42:16 (4 months ago)

Author:

Jean-Paul Saman <jpsaman@videolan.org>

git-committer:

Jean-Paul Saman <jpsaman@videolan.org> 1211046136 +0200

git-parent:

[453ff82acfa8ec4fb717fe71b094199d8659a1f5]

git-author:

Jean-Paul Saman <jpsaman@videolan.org> 1211028488 +0200

Message:

Use the same default values for i_frame_rate everywhere.

Files:

• modules/stream_out/transcode.c (modified) (11 diffs)

modules/stream_out/transcode.c

@@ -363 +363 @@
-#define TRANSCODE_FILTERS 10
-
+#define ENC_FRAMERATE (25 * 1000 + .5)
+#define ENC_FRAMERATE_BASE 1000
+
-struct sout_stream_sys_t
-{
@@ -1024 +1027 @@
-        {
-            id->p_encoder->fmt_out.video.i_frame_rate =
-
-
+
+
+
-        }
-    }
@@ -1779 +1783 @@
-        id->p_decoder->fmt_in.video.i_height ?
-        id->p_decoder->fmt_in.video.i_height : 16;
-25
-1
+ENC_FRAMERATE
+ENC_FRAMERATE_BASE
-
-    id->p_encoder->i_threads = p_sys->i_threads;
@@ -1834 +1838 @@
-                                         sout_stream_id_t *id )
-{
-
-
- */
-/
+ 
+
+
+ 
-     int i_src_width = id->p_decoder->fmt_out.video.i_width;
-     int i_src_height = id->p_decoder->fmt_out.video.i_height;
@@ -1924 +1928 @@
-         f_scale_width = (float)p_sys->i_maxwidth / p_sys->i_crop_width;
-     }
+
-     if( p_sys->i_maxheight && f_scale_height > (float)p_sys->i_maxheight /
-                                                       p_sys->i_crop_height )
@@ -2072 +2077 @@
-        {
-            /* Pick a sensible default value */
-25
-1
+ENC_FRAMERATE
+ENC_FRAMERATE_BASE
-        }
-    }
@@ -2089 +2094 @@
-    if( !id->p_encoder->fmt_out.video.i_aspect )
-    {
-
+
+
-    }
-    id->p_encoder->fmt_in.video.i_aspect =
-        id->p_encoder->fmt_out.video.i_aspect;
-
-
+
+
-
-    id->p_encoder->p_module =
@@ -2257 +2264 @@
-                id->pp_filter[id->i_filter] =
-                    transcode_video_filter_new( p_stream,
-
+
+
-                            p_sys->p_deinterlace_cfg,
-                            p_sys->psz_deinterlace );
@@ -2275 +2283 @@
-                id->pp_filter[id->i_filter] =
-                    transcode_video_filter_new( p_stream,
-
+
+
-                            NULL, "scale" );
-                if( !id->pp_filter[id->i_filter] )
@@ -2309 +2318 @@
-                id->pp_filter[id->i_filter] =
-                    transcode_video_filter_new( p_stream,
-
+
+
-                            NULL, "croppadd" );
-                if( id->pp_filter[id->i_filter] )
@@ -2343 +2353 @@
-                id->pp_filter[id->i_filter] =
-                    transcode_video_filter_new( p_stream,
-
+
+
-                            NULL, "crop padd" );
-                if( !id->pp_filter[id->i_filter] )