Changeset 39f890d258770caae77e3b678fd47143ed06f7f6

Timestamp:

17/03/05 14:14:04 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1111065244 +0000

git-parent:

[21127514768ee12247709eda51ffca26e88a7303]

git-author:

Gildas Bazin <gbazin@videolan.org> 1111065244 +0000

Message:

* src/video_output/vout_intf.c, src/misc/image.c: proper aspect ratio for snapshots.

Files:

• src/misc/image.c (modified) (1 diff)
• src/video_output/vout_intf.c (modified) (1 diff)

src/misc/image.c

@@ -582 +582 @@
-        p_enc->fmt_in.video.i_height = fmt_out->i_height;
-    }
+    else if( fmt_out->i_sar_num && fmt_out->i_sar_den &&
+         fmt_out->i_sar_num * fmt_in->i_sar_den !=
+             fmt_out->i_sar_den * fmt_in->i_sar_num )
+    {
+        p_enc->fmt_in.video.i_width =
+        fmt_in->i_sar_num * (int64_t)fmt_out->i_sar_den * fmt_in->i_width /
+            fmt_in->i_sar_den / fmt_out->i_sar_num;
+    }
+
-    p_enc->fmt_in.video.i_frame_rate = 25;
-    p_enc->fmt_in.video.i_frame_rate_base = 1;

src/video_output/vout_intf.c

@@ -357 +357 @@
-    fmt_in.i_width = p_vout->render.i_width;
-    fmt_in.i_height = p_vout->render.i_height;
+    fmt_in.i_sar_num = p_vout->fmt_render.i_sar_num;
+    fmt_in.i_sar_den = p_vout->fmt_render.i_sar_den;
+    fmt_out.i_sar_num = fmt_out.i_sar_den = 1;
-    i_ret = image_WriteUrl( p_image, p_pic, &fmt_in, &fmt_out, psz_filename );
-    if( i_ret != VLC_SUCCESS )