Changeset 23f9442398a0a7a7b2f4a7b163fada125bfdc148

Timestamp:

17/03/05 17:59:16 (4 years ago)

Author:

Christophe Massiot <massiot@videolan.org>

git-committer:

Christophe Massiot <massiot@videolan.org> 1111078756 +0000

git-parent:

[05c786b6f3234f0b70952add5263f3446f5da217]

git-author:

Christophe Massiot <massiot@videolan.org> 1111078756 +0000

Message:

* modules/stream_out/switcher.c: Fixed aspect ratio.

Files:

• modules/stream_out/switcher.c (modified) (5 diffs)

modules/stream_out/switcher.c

@@ -132 +132 @@
-    int             i_gop;
-    int             i_qscale;
-AVRational      sample_aspect_ratio
+int             i_aspect
-    sout_stream_id_t *pp_audio_ids[MAX_AUDIO];
-
@@ -234 +234 @@
-        {
-            *psz_parser++ = '\0';
-sample_aspect_ratio.num = atoi( val.psz_string );
-p_sys->sample_aspect_ratio.den =
+i_aspect = atoi( val.psz_string ) * VOUT_ASPECT_FACTOR
+    /
-        }
-        else
-        {
-            msg_Warn( p_stream, "bad aspect ratio %s", val.psz_string );
-
-
+
-        }
-
@@ -248 +247 @@
-    else
-    {
-
-
+
-    }
-
@@ -696 +694 @@
-        /* Create a new encoder. */
-        int i_ff_codec = CODEC_ID_MPEG2VIDEO;
+        int i_aspect_num, i_aspect_den;
+
-        if( i_ff_codec == 0 )
-        {
@@ -733 +733 @@
-        id->ff_enc_c->width = p_sys->p_pictures[p_sys->i_cmd-1].format.i_width;
-        id->ff_enc_c->height = p_sys->p_pictures[p_sys->i_cmd-1].format.i_height;
+        av_reduce( &i_aspect_num, &i_aspect_den,
+                   p_sys->i_aspect,
+                   VOUT_ASPECT_FACTOR, 1 << 30 /* something big */ );
+        av_reduce( &id->ff_enc_c->sample_aspect_ratio.num,
+                   &id->ff_enc_c->sample_aspect_ratio.den,
+                   i_aspect_num * (int64_t)id->ff_enc_c->height,
+                   i_aspect_den * (int64_t)id->ff_enc_c->width, 1 << 30 );
-
-        id->ff_enc_c->frame_rate    = 25; /* FIXME */
-        id->ff_enc_c->frame_rate_base = 1;
-        memcpy( &id->ff_enc_c->sample_aspect_ratio, &p_sys->sample_aspect_ratio,
-                sizeof(AVRational) );
-
-        id->ff_enc_c->gop_size = 200;