diff options
| author | Heinrich Fink <hfink@toolsonair.com> | 2015-05-11 12:02:47 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-05-11 13:14:15 +0300 |
| commit | e6d82dec327730274c6a24dbd8f6f901dbfa9288 (patch) | |
| tree | 847e62bad8cdba5fd213613c605a298917416be0 /sys/decklink | |
| parent | 6b0a9af0beaeb7d3267b178a5aabaf86dcee08a0 (diff) | |
| download | gstreamer-plugins-bad-e6d82dec327730274c6a24dbd8f6f901dbfa9288.tar.gz | |
decklink: Rename mode 3184p to 2160p
https://bugzilla.gnome.org/show_bug.cgi?id=749218
Diffstat (limited to 'sys/decklink')
| -rw-r--r-- | sys/decklink/gstdecklink.cpp | 34 | ||||
| -rw-r--r-- | sys/decklink/gstdecklink.h | 16 |
2 files changed, 25 insertions, 25 deletions
diff --git a/sys/decklink/gstdecklink.cpp b/sys/decklink/gstdecklink.cpp index a5ccc221d..7a22bea63 100644 --- a/sys/decklink/gstdecklink.cpp +++ b/sys/decklink/gstdecklink.cpp @@ -68,14 +68,14 @@ gst_decklink_mode_get_type (void) {GST_DECKLINK_MODE_2048p24, "2048p24", "2k 24p"}, {GST_DECKLINK_MODE_2048p25, "2048p25", "2k 25p"}, - {GST_DECKLINK_MODE_3184p2398, "3184p2398", "4k 23.98p"}, - {GST_DECKLINK_MODE_3184p24, "3184p24", "4k 24p"}, - {GST_DECKLINK_MODE_3184p25, "3184p25", "4k 25p"}, - {GST_DECKLINK_MODE_3184p2997, "3184p2997", "4k 29.97p"}, - {GST_DECKLINK_MODE_3184p30, "3184p30", "4k 30p"}, - {GST_DECKLINK_MODE_3184p50, "3184p50", "4k 50p"}, - {GST_DECKLINK_MODE_3184p5994, "3184p5994", "4k 59.94p"}, - {GST_DECKLINK_MODE_3184p60, "3184p60", "4k 60p"}, + {GST_DECKLINK_MODE_2160p2398, "2160p2398", "4k 23.98p"}, + {GST_DECKLINK_MODE_2160p24, "2160p24", "4k 24p"}, + {GST_DECKLINK_MODE_2160p25, "2160p25", "4k 25p"}, + {GST_DECKLINK_MODE_2160p2997, "2160p2997", "4k 29.97p"}, + {GST_DECKLINK_MODE_2160p30, "2160p30", "4k 30p"}, + {GST_DECKLINK_MODE_2160p50, "2160p50", "4k 50p"}, + {GST_DECKLINK_MODE_2160p5994, "2160p5994", "4k 59.94p"}, + {GST_DECKLINK_MODE_2160p60, "2160p60", "4k 60p"}, {0, NULL, NULL} }; @@ -186,7 +186,7 @@ static const GstDecklinkMode modes[] = { const GstDecklinkMode * gst_decklink_get_mode (GstDecklinkModeEnum e) { - if (e < GST_DECKLINK_MODE_AUTO || e > GST_DECKLINK_MODE_3184p60) + if (e < GST_DECKLINK_MODE_AUTO || e > GST_DECKLINK_MODE_2160p60) return NULL; return &modes[e]; } @@ -263,28 +263,28 @@ gst_decklink_get_mode_enum_from_bmd (BMDDisplayMode mode) displayMode = GST_DECKLINK_MODE_2048p25; break; case bmdMode4K2160p2398: - displayMode = GST_DECKLINK_MODE_3184p2398; + displayMode = GST_DECKLINK_MODE_2160p2398; break; case bmdMode4K2160p24: - displayMode = GST_DECKLINK_MODE_3184p24; + displayMode = GST_DECKLINK_MODE_2160p24; break; case bmdMode4K2160p25: - displayMode = GST_DECKLINK_MODE_3184p25; + displayMode = GST_DECKLINK_MODE_2160p25; break; case bmdMode4K2160p2997: - displayMode = GST_DECKLINK_MODE_3184p2997; + displayMode = GST_DECKLINK_MODE_2160p2997; break; case bmdMode4K2160p30: - displayMode = GST_DECKLINK_MODE_3184p30; + displayMode = GST_DECKLINK_MODE_2160p30; break; case bmdMode4K2160p50: - displayMode = GST_DECKLINK_MODE_3184p50; + displayMode = GST_DECKLINK_MODE_2160p50; break; case bmdMode4K2160p5994: - displayMode = GST_DECKLINK_MODE_3184p5994; + displayMode = GST_DECKLINK_MODE_2160p5994; break; case bmdMode4K2160p60: - displayMode = GST_DECKLINK_MODE_3184p60; + displayMode = GST_DECKLINK_MODE_2160p60; break; default: g_assert_not_reached (); diff --git a/sys/decklink/gstdecklink.h b/sys/decklink/gstdecklink.h index 51071e704..b2f8dc0fb 100644 --- a/sys/decklink/gstdecklink.h +++ b/sys/decklink/gstdecklink.h @@ -74,14 +74,14 @@ typedef enum { GST_DECKLINK_MODE_2048p24, GST_DECKLINK_MODE_2048p25, - GST_DECKLINK_MODE_3184p2398, - GST_DECKLINK_MODE_3184p24, - GST_DECKLINK_MODE_3184p25, - GST_DECKLINK_MODE_3184p2997, - GST_DECKLINK_MODE_3184p30, - GST_DECKLINK_MODE_3184p50, - GST_DECKLINK_MODE_3184p5994, - GST_DECKLINK_MODE_3184p60 + GST_DECKLINK_MODE_2160p2398, + GST_DECKLINK_MODE_2160p24, + GST_DECKLINK_MODE_2160p25, + GST_DECKLINK_MODE_2160p2997, + GST_DECKLINK_MODE_2160p30, + GST_DECKLINK_MODE_2160p50, + GST_DECKLINK_MODE_2160p5994, + GST_DECKLINK_MODE_2160p60 } GstDecklinkModeEnum; #define GST_TYPE_DECKLINK_MODE (gst_decklink_mode_get_type ()) GType gst_decklink_mode_get_type (void); |