mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-31 10:45:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: Use GstVideoInfo helper to create caps for raw video

Browse source 
This way we do not miss mandatory fields in caps.
At the same time use the gst_pb_utils_get_codec_description
helper to get codec description.

https://bugzilla.gnome.org/show_bug.cgi?id=712335
This commit is contained in:
Thibault Saunier 2013-11-14 17:29:50 -03:00
parent 6ff7522ba2
commit a45d470236
1 changed files with 20 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
gst/isomp4/qtdemux.c
View file

@ -53,6 +53,7 @@
#include <glib/gprintf.h> #include <glib/gprintf.h>
#include <gst/tag/tag.h> #include <gst/tag/tag.h>
#include <gst/audio/audio.h> #include <gst/audio/audio.h>
#include <gst/video/video.h>
#include "qtatomparser.h" #include "qtatomparser.h"
#include "qtdemux_types.h" #include "qtdemux_types.h"
@ -10320,8 +10321,7 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
guint32 fourcc, const guint8 * stsd_data, gchar ** codec_name) guint32 fourcc, const guint8 * stsd_data, gchar ** codec_name)
{ {
GstCaps *caps; GstCaps *caps;
const GstStructure *s; GstVideoFormat format = GST_VIDEO_FORMAT_UNKNOWN;
const gchar *name;
switch (fourcc) { switch (fourcc) {
case GST_MAKE_FOURCC ('p', 'n', 'g', ' '): case GST_MAKE_FOURCC ('p', 'n', 'g', ' '):
@ -10369,23 +10369,19 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
{ {
guint16 bps; guint16 bps;
_codec ("Raw RGB video");
bps = QT_UINT16 (stsd_data + 98); bps = QT_UINT16 (stsd_data + 98);
/* set common stuff */
caps = gst_caps_new_empty_simple ("video/x-raw");
switch (bps) { switch (bps) {
case 15: case 15:
gst_caps_set_simple (caps, "format", G_TYPE_STRING, "RGB15", NULL); format = GST_VIDEO_FORMAT_RGB15;
break; break;
case 16: case 16:
gst_caps_set_simple (caps, "format", G_TYPE_STRING, "RGB16", NULL); format = GST_VIDEO_FORMAT_RGB16;
break; break;
case 24: case 24:
gst_caps_set_simple (caps, "format", G_TYPE_STRING, "RGB", NULL); format = GST_VIDEO_FORMAT_RGB;
break; break;
case 32: case 32:
gst_caps_set_simple (caps, "format", G_TYPE_STRING, "ARGB", NULL); format = GST_VIDEO_FORMAT_ARGB;
break; break;
default: default:
/* unknown */ /* unknown */
@ -10394,31 +10390,19 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
break; break;
} }
case GST_MAKE_FOURCC ('y', 'v', '1', '2'): case GST_MAKE_FOURCC ('y', 'v', '1', '2'):
_codec ("Raw planar YUV 4:2:0"); format = GST_VIDEO_FORMAT_I420;
caps = gst_caps_new_simple ("video/x-raw",
"format", G_TYPE_STRING, "I420", NULL);
break; break;
case GST_MAKE_FOURCC ('y', 'u', 'v', '2'): case GST_MAKE_FOURCC ('y', 'u', 'v', '2'):
case GST_MAKE_FOURCC ('Y', 'u', 'v', '2'): case GST_MAKE_FOURCC ('Y', 'u', 'v', '2'):
_codec ("Raw packed YUV 4:2:2"); format = GST_VIDEO_FORMAT_I420;
caps = gst_caps_new_simple ("video/x-raw",
"format", G_TYPE_STRING, "YUY2", NULL);
break; break;
case GST_MAKE_FOURCC ('2', 'v', 'u', 'y'): case GST_MAKE_FOURCC ('2', 'v', 'u', 'y'):
case GST_MAKE_FOURCC ('2', 'V', 'u', 'y'): case GST_MAKE_FOURCC ('2', 'V', 'u', 'y'):
_codec ("Raw packed YUV 4:2:2");
caps = gst_caps_new_simple ("video/x-raw",
"format", G_TYPE_STRING, "UYVY", NULL);
break;
case GST_MAKE_FOURCC ('v', '2', '1', '0'): case GST_MAKE_FOURCC ('v', '2', '1', '0'):
_codec ("Raw packed YUV 10-bit 4:2:2"); format = GST_VIDEO_FORMAT_UYVY;
caps = gst_caps_new_simple ("video/x-raw",
"format", G_TYPE_STRING, "v210", NULL);
break; break;
case GST_MAKE_FOURCC ('r', '2', '1', '0'): case GST_MAKE_FOURCC ('r', '2', '1', '0'):
_codec ("Raw packed RGB 10-bit 4:4:4"); format = GST_VIDEO_FORMAT_r210;
caps = gst_caps_new_simple ("video/x-raw",
"format", G_TYPE_STRING, "r210", NULL);
break; break;
case GST_MAKE_FOURCC ('m', 'p', 'e', 'g'): case GST_MAKE_FOURCC ('m', 'p', 'e', 'g'):
case GST_MAKE_FOURCC ('m', 'p', 'g', '1'): case GST_MAKE_FOURCC ('m', 'p', 'g', '1'):
@ -10700,12 +10684,18 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
} }
} }
/* enable clipping for raw video streams */ if (format != GST_VIDEO_FORMAT_UNKNOWN) {
s = gst_caps_get_structure (caps, 0); GstVideoInfo info;
name = gst_structure_get_name (s);
if (g_str_has_prefix (name, "video/x-raw")) { gst_video_info_init (&info);
gst_video_info_set_format (&info, format, stream->width, stream->height);
caps = gst_video_info_to_caps (&info);
*codec_name = gst_pb_utils_get_codec_description (caps);
/* enable clipping for raw video streams */
stream->need_clip = TRUE; stream->need_clip = TRUE;
} }
return caps; return caps;
} }