mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-25 07:26:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

ksvideosrc: fix support for DV devices

Browse source
This commit is contained in:
Andoni Morales Alastruey 2015-04-08 18:51:50 +02:00
parent 7bc0fa5d70
commit 83a54e07fd
3 changed files with 39 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/winks/gstksvideodevice.c
View file

@ -752,13 +752,11 @@ gst_ks_video_device_set_caps (GstKsVideoDevice * self, GstCaps * caps)
if (!gst_structure_get_int (s, "width", &width) || if (!gst_structure_get_int (s, "width", &width) ||
!gst_structure_get_int (s, "height", &height) || !gst_structure_get_int (s, "height", &height) ||
!gst_structure_get_fraction (s, "framerate", &fps_n, &fps_d)) { !gst_structure_get_fraction (s, "framerate", &fps_n, &fps_d)) {
GST_ERROR ("Failed to get width/height/fps"); } else {
goto error;
}
if (!ks_video_fixate_media_type (media_type->range, if (!ks_video_fixate_media_type (media_type->range,
media_type->format, width, height, fps_n, fps_d)) media_type->format, width, height, fps_n, fps_d))
goto error; goto error;
}
if (priv->cur_media_type != NULL) { if (priv->cur_media_type != NULL) {
if (media_type->format_size == priv->cur_media_type->format_size && if (media_type->format_size == priv->cur_media_type->format_size &&

24
sys/winks/ksvideohelpers.c
View file

@ -446,7 +446,8 @@ ks_video_probe_filter_for_caps (HANDLE filter_handle)
guint i; guint i;
for (i = 0; i < items->Count; i++) { for (i = 0; i < items->Count; i++) {
if (IsEqualGUID (&range->MajorFormat, &KSDATAFORMAT_TYPE_VIDEO)) { if (IsEqualGUID (&range->MajorFormat, &MEDIATYPE_Video)
|| IsEqualGUID (&range->MajorFormat, &MEDIATYPE_Interleaved)) {
KsVideoMediaType *entry; KsVideoMediaType *entry;
gpointer src_vscc, src_format; gpointer src_vscc, src_format;
GstStructure *media_structure; GstStructure *media_structure;
@ -485,16 +486,22 @@ ks_video_probe_filter_for_caps (HANDLE filter_handle)
entry->sample_size = entry->sample_size =
vr->VideoInfoHeader.hdr.bmiHeader.biSizeImage; vr->VideoInfoHeader.hdr.bmiHeader.biSizeImage;
} else if (IsEqualGUID (&range->Specifier, &FORMAT_MPEG2Video)) { } else if (IsEqualGUID (&range->Specifier, &FORMAT_MPEG2Video)) {
/* Untested and probably wrong... */
KS_DATARANGE_MPEG2_VIDEO *vr = KS_DATARANGE_MPEG2_VIDEO *vr =
(KS_DATARANGE_MPEG2_VIDEO *) entry->range; (KS_DATARANGE_MPEG2_VIDEO *) entry->range;
src_vscc = &vr->ConfigCaps; src_vscc = &vr->ConfigCaps;
src_format = &vr->VideoInfoHeader; src_format = &vr->VideoInfoHeader;
entry->format_size = sizeof (vr->VideoInfoHeader); entry->format_size = sizeof (vr->VideoInfoHeader);
entry->sample_size = entry->sample_size =
vr->VideoInfoHeader.hdr.bmiHeader.biSizeImage; vr->VideoInfoHeader.hdr.bmiHeader.biSizeImage;
} else if (IsEqualGUID (&range->Specifier, &FORMAT_DvInfo)) {
KS_DATARANGE_DVVIDEO *vr = (KS_DATARANGE_DVVIDEO *) entry->range;
src_vscc = NULL;
src_format = &vr->DVVideoInfo;
entry->format_size = sizeof (vr->DVVideoInfo);
entry->sample_size = vr->DataRange.SampleSize;
} else { } else {
gchar *guid_str; gchar *guid_str;
@ -510,19 +517,26 @@ ks_video_probe_filter_for_caps (HANDLE filter_handle)
if (entry != NULL) { if (entry != NULL) {
g_assert (entry->sample_size != 0); g_assert (entry->sample_size != 0);
memcpy ((gpointer) & entry->vscc, src_vscc, sizeof (entry->vscc)); if (src_vscc != NULL) {
memcpy ((gpointer) & entry->vscc, src_vscc,
sizeof (entry->vscc));
}
entry->format = g_malloc (entry->format_size); entry->format = g_malloc (entry->format_size);
memcpy (entry->format, src_format, entry->format_size); memcpy (entry->format, src_format, entry->format_size);
media_structure = media_structure =
ks_video_format_to_structure (range->SubFormat, ks_video_format_to_structure (range->SubFormat,
range->MajorFormat); range->Specifier);
if (media_structure == NULL) { if (media_structure == NULL) {
g_warning ("ks_video_format_to_structure returned NULL"); g_warning ("ks_video_format_to_structure returned NULL");
ks_video_media_type_free (entry); ks_video_media_type_free (entry);
entry = NULL; entry = NULL;
} else if (src_vscc == NULL) {
entry->translated_caps = gst_caps_new_empty ();
gst_caps_append_structure (entry->translated_caps,
media_structure);
} else if (ks_video_append_video_stream_cfg_fields } else if (ks_video_append_video_stream_cfg_fields
(media_structure, &entry->vscc)) { (media_structure, &entry->vscc)) {
entry->translated_caps = gst_caps_new_empty (); entry->translated_caps = gst_caps_new_empty ();

16
sys/winks/ksvideohelpers.h
View file

@ -51,6 +51,22 @@ struct _KsVideoMediaType
GstCaps * translated_caps; GstCaps * translated_caps;
}; };
typedef struct DVINFO {
DWORD dwDVAAuxSrc;
DWORD dwDVAAuxCtl;
DWORD dwDVAAuxSrc1;
DWORD dwDVAAuxCtl1;
DWORD dwDVVAuxSrc;
DWORD dwDVVAuxCtl;
DWORD dwDVReserved[2];
} DVINFO;
typedef struct KS_DATARANGE_DVVIDEO {
KSDATARANGE DataRange;
DVINFO DVVideoInfo;
} KS_DATARANGE_DVVIDEO,*PKS_DATARANGE_DVVIDEO;
GList * ks_video_device_list_sort_cameras_first (GList * devices); GList * ks_video_device_list_sort_cameras_first (GList * devices);
KsVideoMediaType * ks_video_media_type_dup (KsVideoMediaType * media_type); KsVideoMediaType * ks_video_media_type_dup (KsVideoMediaType * media_type);