summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Moutte <julien@moutte.net>2006-01-26 19:17:38 +0000
committerJulien Moutte <julien@moutte.net>2006-01-26 19:17:38 +0000
commitd1a56c2cb2f538a7f541d0128e942c7310450541 (patch)
treecaa71ecaa503b208d13e9ac5bfa8e7159f8f19c0
parentefd9da3dd099b766d80bb08d9b07adc6ac0f7b6d (diff)
sys/: Handle some more cases of pixel aspect ratio.
Original commit message from CVS: 2006-01-26 Julien MOUTTE <julien@moutte.net> * sys/ximage/ximagesink.c: (gst_ximagesink_calculate_pixel_aspect_ratio): * sys/xvimage/xvimagesink.c: (gst_xvimagesink_calculate_pixel_aspect_ratio): Handle some more cases of pixel aspect ratio.
-rw-r--r--ChangeLog8
-rw-r--r--sys/ximage/ximagesink.c5
-rw-r--r--sys/xvimage/xvimagesink.c5
3 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 40c887ab..73bb54e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-01-26 Julien MOUTTE <julien@moutte.net>
+
+ * sys/ximage/ximagesink.c:
+ (gst_ximagesink_calculate_pixel_aspect_ratio):
+ * sys/xvimage/xvimagesink.c:
+ (gst_xvimagesink_calculate_pixel_aspect_ratio): Handle some
+ more cases of pixel aspect ratio.
+
2006-01-26 Edward Hervey <edward@fluendo.com>
* gst/playback/gstdecodebin.c: (pad_probe):
diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c
index f0be51c3..3fa3be29 100644
--- a/sys/ximage/ximagesink.c
+++ b/sys/ximage/ximagesink.c
@@ -925,7 +925,10 @@ gst_ximagesink_calculate_pixel_aspect_ratio (GstXContext * xcontext)
{1, 1}, /* regular screen */
{16, 15}, /* PAL TV */
{11, 10}, /* 525 line Rec.601 video */
- {54, 59} /* 625 line Rec.601 video */
+ {54, 59}, /* 625 line Rec.601 video */
+ {64, 45}, /* 1280x1024 on 16:9 display */
+ {5, 3}, /* 1280x1024 on 4:3 display */
+ {4, 3} /* 800x600 on 16:9 display */
};
gint i;
gint index;
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index b884849c..ba885080 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -1184,7 +1184,10 @@ gst_xvimagesink_calculate_pixel_aspect_ratio (GstXContext * xcontext)
{1, 1}, /* regular screen */
{16, 15}, /* PAL TV */
{11, 10}, /* 525 line Rec.601 video */
- {54, 59} /* 625 line Rec.601 video */
+ {54, 59}, /* 625 line Rec.601 video */
+ {64, 45}, /* 1280x1024 on 16:9 display */
+ {5, 3}, /* 1280x1024 on 4:3 display */
+ {4, 3} /* 800x600 on 16:9 display */
};
gint i;
gint index;