stream->num_planes = 1;
break;
- case MM_PIXEL_FORMAT_ENCODED_H264: /* fall through */
- case MM_PIXEL_FORMAT_ENCODED_MJPEG:
+ case MM_PIXEL_FORMAT_ENCODED_H264: /* fall through */
+ case MM_PIXEL_FORMAT_ENCODED_MJPEG: /* fall through */
+ case MM_PIXEL_FORMAT_ENCODED_VP8: /* fall through */
+ case MM_PIXEL_FORMAT_ENCODED_VP9: /* fall through */
stream->data_type = MM_CAM_STREAM_DATA_ENCODED;
stream->data.encoded.data = map_info->data;
stream->data.encoded.length_data = stream->length_total;
const char *videosrc_name = NULL;
const char *videosink_name = NULL;
const char *videoconvert_name = NULL;
+ const char *videodecoder_name = NULL;
+ const char *decoder_conf_name = NULL;
+ char videodecoder_name_final[32] = {'\0',};
char *err_name = NULL;
char *socket_path = NULL;
int socket_path_len;
#ifdef _MMCAMCORDER_RM_SUPPORT
int decoder_index = 0;
- char decoder_name[20] = {'\0',};
#endif /* _MMCAMCORDER_RM_SUPPORT */
GstElement *sink_element = NULL;
GstCameraControl *control = NULL;
&hcamcorder->recreate_decoder);
}
- if (sc->info_image->preview_format == MM_PIXEL_FORMAT_ENCODED_H264) {
+ if (_mmcamcorder_is_encoded_preview_pixel_format(sc->info_image->preview_format)) {
int preview_bitrate = 0;
int gop_interval = 0;
mm_camcorder_get_attributes(handle, NULL,
MMCAM_LOG_WARNING("_mmcamcorder_set_encoded_preview_bitrate failed");
/* set encoded preview iframe interval */
- if (!_mmcamcorder_set_encoded_preview_gop_interval(handle, gop_interval))
- MMCAM_LOG_WARNING("_mmcamcorder_set_encoded_preview_gop_interval failed");
+ if (sc->info_image->preview_format == MM_PIXEL_FORMAT_ENCODED_H264) {
+ if (!_mmcamcorder_set_encoded_preview_gop_interval(handle, gop_interval))
+ MMCAM_LOG_WARNING("_mmcamcorder_set_encoded_preview_gop_interval failed");
+ }
}
- if (display_surface_type != MM_DISPLAY_SURFACE_NULL) {
- const char *videodecoder_name = NULL;
- /* case of decoder element */
- if (sc->info_image->preview_format == MM_PIXEL_FORMAT_ENCODED_H264) {
- /* get video decoder element and name for H.264 format */
- _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,
- CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
- "VideodecoderElementH264",
- &sc->VideodecoderElementH264);
- _mmcamcorder_conf_get_value_element_name(sc->VideodecoderElementH264,
- &videodecoder_name);
- if (videodecoder_name) {
+ if (display_surface_type != MM_DISPLAY_SURFACE_NULL &&
+ _mmcamcorder_is_encoded_preview_pixel_format(sc->info_image->preview_format)) {
+ switch (sc->info_image->preview_format) {
+ case MM_PIXEL_FORMAT_ENCODED_H264:
+ decoder_conf_name = "VideodecoderElementH264";
+ break;
+ case MM_PIXEL_FORMAT_ENCODED_MJPEG:
+ decoder_conf_name = "VideodecoderElementMJPEG";
+ break;
+ case MM_PIXEL_FORMAT_ENCODED_VP8:
+ decoder_conf_name = "VideodecoderElementVP8";
+ break;
+ case MM_PIXEL_FORMAT_ENCODED_VP9:
+ decoder_conf_name = "VideodecoderElementVP9";
+ break;
+ default:
+ MMCAM_LOG_ERROR("invalid format[%d]", sc->info_image->preview_format);
+ goto pipeline_creation_error;
+ }
+
+ /* get video decoder element and name */
+ _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,
+ CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
+ decoder_conf_name,
+ &sc->VideodecoderElement);
+
+ _mmcamcorder_conf_get_value_element_name(sc->VideodecoderElement,
+ &videodecoder_name);
+
+ if (!videodecoder_name) {
+ MMCAM_LOG_ERROR("failed to get video decoder[%d,%s]", sc->info_image->preview_format, decoder_conf_name);
+ goto pipeline_creation_error;
+ }
+
#ifdef _MMCAMCORDER_RM_SUPPORT
- if (hcamcorder->request_resources.category_id[0] == RM_CATEGORY_VIDEO_DECODER_SUB)
- decoder_index = 1;
-
- snprintf(decoder_name, sizeof(decoder_name)-1, "%s%d", videodecoder_name, decoder_index);
- MMCAM_LOG_INFO("encoded preview decoder_name [%s], video decoder element [%s]",
- decoder_name, videodecoder_name);
- /* create decoder element */
- _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_DECODE, decoder_name, "videosrc_decode", element_list, err);
-#else /* _MMCAMCORDER_RM_SUPPORT */
- MMCAM_LOG_INFO("video decoder element [%s]", videodecoder_name);
- /* create decoder element */
- _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_DECODE, videodecoder_name, "videosrc_decode", element_list, err);
-#endif /* _MMCAMCORDER_RM_SUPPORT */
- _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst, sc->VideodecoderElementH264);
- } else {
- MMCAM_LOG_ERROR("failed to get video decoder element name from %p", sc->VideodecoderElementH264);
- goto pipeline_creation_error;
- }
+ MMCAM_LOG_INFO("decoder name from config[%s]", videodecoder_name);
+ if (sc->info_image->preview_format == MM_PIXEL_FORMAT_ENCODED_H264) {
+ if (hcamcorder->request_resources.category_id[0] == RM_CATEGORY_VIDEO_DECODER_SUB)
+ decoder_index = 1;
+ snprintf(videodecoder_name_final, sizeof(videodecoder_name_final), "%s%d", videodecoder_name, decoder_index);
} else if (sc->info_image->preview_format == MM_PIXEL_FORMAT_ENCODED_MJPEG) {
-#ifdef _MMCAMCORDER_RM_SUPPORT
- /* get video decoder element and name for MJPEG format */
- _mmcamcorder_conf_get_element(handle, hcamcorder->conf_main,
- CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT,
- "VideodecoderElementH264",
- &sc->VideodecoderElementH264);
- _mmcamcorder_conf_get_value_element_name(sc->VideodecoderElementH264,
- &videodecoder_name);
- if (videodecoder_name) {
- if (hcamcorder->request_resources.category_id[0] == RM_CATEGORY_VIDEO_DECODER)
- snprintf(decoder_name, sizeof(decoder_name)-1, "%s", "omx_uhd_mjpegdec");
- else
- snprintf(decoder_name, sizeof(decoder_name)-1, "%s", "omx_mjpegdec");
- MMCAM_LOG_INFO("encoded preview decoder_name [%s], video decoder element [%s]",
- decoder_name, videodecoder_name);
- /* create decoder element */
- _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_DECODE, decoder_name, "videosrc_decode", element_list, err);
- _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst, sc->VideodecoderElementH264);
- } else {
- MMCAM_LOG_ERROR("failed to get video decoder element name from %p", sc->VideodecoderElementH264);
- goto pipeline_creation_error;
- }
-#else /* _MMCAMCORDER_RM_SUPPORT */
- MMCAM_LOG_INFO("video decoder element [jpegdec]");
- /* create decoder element */
- _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_DECODE, "jpegdec", "videosrc_decode", element_list, err);
+ if (hcamcorder->request_resources.category_id[0] == RM_CATEGORY_VIDEO_DECODER)
+ snprintf(videodecoder_name_final, sizeof(videodecoder_name_final), "%s", "omx_uhd_mjpegdec");
+ else
+ snprintf(videodecoder_name_final, sizeof(videodecoder_name_final), "%s", "omx_mjpegdec");
+ } else {
#endif /* _MMCAMCORDER_RM_SUPPORT */
+ snprintf(videodecoder_name_final, sizeof(videodecoder_name_final), "%s", videodecoder_name);
+#ifdef _MMCAMCORDER_RM_SUPPORT
}
+#endif /* _MMCAMCORDER_RM_SUPPORT */
+
+ _MMCAMCORDER_ELEMENT_MAKE(sc, sc->element, _MMCAMCORDER_VIDEOSRC_DECODE, videodecoder_name_final, "videosrc_decode", element_list, err);
+
+ _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst, sc->VideodecoderElement);
}
MMCAM_LOG_INFO("Current mode[%d]", hcamcorder->type);
/* The first H.264 frame should not be skipped for vstream cb. */
if (hcamcorder->state < MM_CAMCORDER_STATE_PREPARE &&
- sc->info_image->preview_format != MM_PIXEL_FORMAT_ENCODED_H264) {
+ !_mmcamcorder_is_encoded_preview_pixel_format(sc->info_image->preview_format)) {
MMCAM_LOG_WARNING("Not ready for stream callback");
return GST_PAD_PROBE_OK;
}
int fps_auto = 0;
unsigned int caps_fourcc = 0;
gboolean do_set_caps = FALSE;
+ char fourcc_string[sizeof(fourcc) + 1];
+ gchar *caps_str = NULL;
+#ifdef _MMCAMCORDER_PRODUCT_TV
+ gint maxwidth = 0;
+ gint maxheight = 0;
+ int display_surface_type = MM_DISPLAY_SURFACE_NULL;
+#endif /* _MMCAMCORDER_PRODUCT_TV */
GstCaps *caps = NULL;
caps = NULL;
}
- if (do_set_caps) {
- if (sc->info_image->preview_format == MM_PIXEL_FORMAT_ENCODED_H264) {
-#ifdef _MMCAMCORDER_PRODUCT_TV
- gint maxwidth = 0;
- gint maxheight = 0;
- int display_surface_type = MM_DISPLAY_SURFACE_NULL;
- mm_camcorder_get_attributes(handle, NULL,
- MMCAM_DISPLAY_SURFACE, &display_surface_type,
- NULL);
+ if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
+ /* assume that it's camera capture mode */
+ MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "csc-range", 1);
+ }
- if (display_surface_type != MM_DISPLAY_SURFACE_NULL &&
- __mmcamcorder_find_max_resolution(handle, &maxwidth, &maxheight) == false) {
- MMCAM_LOG_ERROR("can not find max resolution limitation");
- return false;
- } else if (display_surface_type == MM_DISPLAY_SURFACE_NULL) {
- maxwidth = set_width;
- maxheight = set_height;
- }
+ if (!do_set_caps)
+ return TRUE;
+
+ switch (sc->info_image->preview_format) {
+ case MM_PIXEL_FORMAT_ENCODED_H264:
+#ifdef _MMCAMCORDER_PRODUCT_TV
+ mm_camcorder_get_attributes(handle, NULL,
+ MMCAM_DISPLAY_SURFACE, &display_surface_type,
+ NULL);
+ if (display_surface_type != MM_DISPLAY_SURFACE_NULL &&
+ __mmcamcorder_find_max_resolution(handle, &maxwidth, &maxheight) == false) {
+ MMCAM_LOG_ERROR("can not find max resolution limitation");
+ return false;
+ } else if (display_surface_type == MM_DISPLAY_SURFACE_NULL) {
+ maxwidth = set_width;
+ maxheight = set_height;
+ }
#endif /* _MMCAMCORDER_PRODUCT_TV */
- caps = gst_caps_new_simple("video/x-h264",
- "width", G_TYPE_INT, set_width,
- "height", G_TYPE_INT, set_height,
- "framerate", GST_TYPE_FRACTION, fps, 1,
- "stream-format", G_TYPE_STRING, "byte-stream",
+ caps = gst_caps_new_simple("video/x-h264",
+ "width", G_TYPE_INT, set_width,
+ "height", G_TYPE_INT, set_height,
+ "framerate", GST_TYPE_FRACTION, fps, 1,
+ "stream-format", G_TYPE_STRING, "byte-stream",
#ifdef _MMCAMCORDER_PRODUCT_TV
- "maxwidth", G_TYPE_INT, maxwidth,
- "maxheight", G_TYPE_INT, maxheight,
- "alignment", G_TYPE_STRING, "au",
+ "maxwidth", G_TYPE_INT, maxwidth,
+ "maxheight", G_TYPE_INT, maxheight,
+ "alignment", G_TYPE_STRING, "au",
#endif /* _MMCAMCORDER_PRODUCT_TV */
- NULL);
- } else if (sc->info_image->preview_format == MM_PIXEL_FORMAT_ENCODED_MJPEG){
+ NULL);
+ break;
+ case MM_PIXEL_FORMAT_ENCODED_MJPEG:
#ifdef _MMCAMCORDER_PRODUCT_TV
- caps = gst_caps_new_simple("video/x-jpeg",
+ caps = gst_caps_new_simple("video/x-jpeg",
#else
- caps = gst_caps_new_simple("image/jpeg",
+ caps = gst_caps_new_simple("image/jpeg",
#endif
- "width", G_TYPE_INT, set_width,
- "height", G_TYPE_INT, set_height,
- "framerate", GST_TYPE_FRACTION, fps, 1,
- NULL);
- } else {
- char fourcc_string[sizeof(fourcc)+1];
- memcpy(fourcc_string, (char*)&fourcc, sizeof(fourcc));
- fourcc_string[sizeof(fourcc)] = '\0';
- caps = gst_caps_new_simple("video/x-raw",
- "format", G_TYPE_STRING, fourcc_string,
- "width", G_TYPE_INT, set_width,
- "height", G_TYPE_INT, set_height,
- "framerate", GST_TYPE_FRACTION, fps, 1,
- "rotate", G_TYPE_INT, set_rotate,
- NULL);
- }
-
- if (caps) {
- gchar *caps_str = gst_caps_to_string(caps);
-
- if (caps_str) {
- MMCAM_LOG_INFO("vidoesrc new caps set [%s]", caps_str);
- g_free(caps_str);
- caps_str = NULL;
- } else {
- MMCAM_LOG_WARNING("caps string failed");
- }
-
- MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "caps", caps);
- gst_caps_unref(caps);
- caps = NULL;
- } else {
- MMCAM_LOG_ERROR("There are no caps");
- }
+ "width", G_TYPE_INT, set_width,
+ "height", G_TYPE_INT, set_height,
+ "framerate", GST_TYPE_FRACTION, fps, 1,
+ NULL);
+ break;
+ case MM_PIXEL_FORMAT_ENCODED_VP8:
+ caps = gst_caps_new_simple("video/x-vp8",
+ "width", G_TYPE_INT, set_width,
+ "height", G_TYPE_INT, set_height,
+ "framerate", GST_TYPE_FRACTION, fps, 1,
+ NULL);
+ break;
+ case MM_PIXEL_FORMAT_ENCODED_VP9:
+ caps = gst_caps_new_simple("video/x-vp9",
+ "width", G_TYPE_INT, set_width,
+ "height", G_TYPE_INT, set_height,
+ "framerate", GST_TYPE_FRACTION, fps, 1,
+ NULL);
+ break;
+ break;
+ default:
+ memcpy(fourcc_string, (char*)&fourcc, sizeof(fourcc));
+ fourcc_string[sizeof(fourcc)] = '\0';
+ caps = gst_caps_new_simple("video/x-raw",
+ "format", G_TYPE_STRING, fourcc_string,
+ "width", G_TYPE_INT, set_width,
+ "height", G_TYPE_INT, set_height,
+ "framerate", GST_TYPE_FRACTION, fps, 1,
+ "rotate", G_TYPE_INT, set_rotate,
+ NULL);
+ break;
}
- if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO) {
- /* assume that it's camera capture mode */
- MMCAMCORDER_G_OBJECT_SET(sc->element[_MMCAMCORDER_VIDEOSINK_SINK].gst, "csc-range", 1);
+ if (!caps) {
+ MMCAM_LOG_ERROR("There are no caps");
+ return FALSE;
}
+ caps_str = gst_caps_to_string(caps);
+ MMCAM_LOG_INFO("vidoesrc new caps set [%s]", caps_str);
+ g_free(caps_str);
+
+ MMCAMCORDER_G_OBJECT_SET_POINTER(sc->element[_MMCAMCORDER_VIDEOSRC_FILT].gst, "caps", caps);
+ gst_caps_unref(caps);
+
return TRUE;
}
_MMCamcorderSubContext *sc = NULL;
mmf_camcorder_t *hcamcorder = NULL;
const char *videodecoder_name = NULL;
+ char videodecoder_name_final[32] = {'\0',};
int display_surface_type = MM_DISPLAY_SURFACE_NULL;
#ifdef _MMCAMCORDER_RM_SUPPORT
- char decoder_name[20] = {'\0',};
int decoder_index = 0;
#endif /* _MMCAMCORDER_RM_SUPPORT */
MMCAM_LOG_INFO("start");
- _mmcamcorder_conf_get_value_element_name(sc->VideodecoderElementH264, &videodecoder_name);
+ _mmcamcorder_conf_get_value_element_name(sc->VideodecoderElement, &videodecoder_name);
if (videodecoder_name == NULL) {
- MMCAM_LOG_ERROR("failed to get decoder element name from %p", sc->VideodecoderElementH264);
+ MMCAM_LOG_ERROR("failed to get decoder element name from %p", sc->VideodecoderElement);
return FALSE;
}
if (hcamcorder->request_resources.category_id[0] == RM_CATEGORY_VIDEO_DECODER_SUB)
decoder_index = 1;
- snprintf(decoder_name, sizeof(decoder_name)-1, "%s%d", videodecoder_name, decoder_index);
- MMCAM_LOG_INFO("encoded preview decoder_name %s", decoder_name);
- } else {
+ snprintf(videodecoder_name_final, sizeof(videodecoder_name_final), "%s%d", videodecoder_name, decoder_index);
+ } else if (sc->info_image->preview_format == MM_PIXEL_FORMAT_ENCODED_MJPEG) {
/* MJPEG */
if (hcamcorder->request_resources.category_id[0] == RM_CATEGORY_VIDEO_DECODER)
- snprintf(decoder_name, sizeof(decoder_name)-1, "%s", "omx_uhd_mjpegdec");
+ snprintf(videodecoder_name_final, sizeof(videodecoder_name_final), "%s", "omx_uhd_mjpegdec");
else
- snprintf(decoder_name, sizeof(decoder_name)-1, "%s", "omx_mjpegdec");
- MMCAM_LOG_INFO("encoded preview decoder_name %s", decoder_name);
+ snprintf(videodecoder_name_final, sizeof(videodecoder_name_final), "%s", "omx_mjpegdec");
+ } else {
+#endif /* _MMCAMCORDER_RM_SUPPORT */
+ snprintf(videodecoder_name_final, sizeof(videodecoder_name_final), "%s", videodecoder_name);
+#ifdef _MMCAMCORDER_RM_SUPPORT
}
+#endif /* _MMCAMCORDER_RM_SUPPORT */
/* create decoder */
- sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst = gst_element_factory_make(decoder_name, "videosrc_decode");
- if (sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst == NULL) {
- MMCAM_LOG_ERROR("Decoder[%s] creation fail", decoder_name);
- return FALSE;
- }
-#else /* _MMCAMCORDER_RM_SUPPORT */
- /* create new decoder */
- sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst = gst_element_factory_make(videodecoder_name, "videosrc_decode");
+ sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst = gst_element_factory_make(videodecoder_name_final, "videosrc_decode");
if (sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst == NULL) {
- MMCAM_LOG_ERROR("Decoder [%s] creation fail", videodecoder_name);
+ MMCAM_LOG_ERROR("Decoder[%s] creation fail", videodecoder_name_final);
return FALSE;
}
-#endif /* _MMCAMCORDER_RM_SUPPORT */
- _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst, sc->VideodecoderElementH264);
+
+ _mmcamcorder_conf_set_value_element_property(sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst, sc->VideodecoderElement);
sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].id = _MMCAMCORDER_VIDEOSRC_DECODE;
g_object_weak_ref(G_OBJECT(sc->element[_MMCAMCORDER_VIDEOSRC_DECODE].gst),
type = MM_PIXEL_FORMAT_ENCODED;
else if (!strcmp(media_type, "video/x-h264"))
type = MM_PIXEL_FORMAT_ENCODED_H264;
+ else if (!strcmp(media_type, "video/x-jpeg"))
+ type = MM_PIXEL_FORMAT_ENCODED_MJPEG;
+ else if (!strcmp(media_type, "video/x-vp8"))
+ type = MM_PIXEL_FORMAT_ENCODED_VP8;
+ else if (!strcmp(media_type, "video/x-vp9"))
+ type = MM_PIXEL_FORMAT_ENCODED_VP9;
if (type == MM_PIXEL_FORMAT_INVALID)
MMCAM_LOG_ERROR("Not supported format[%s,GST:%d]", media_type, GST_VIDEO_INFO_FORMAT(&vinfo));
case MM_PIXEL_FORMAT_ENCODED_H264:
fourcc = GST_MAKE_FOURCC('H', '2', '6', '4');
break;
+ case MM_PIXEL_FORMAT_INVZ:
+ fourcc = GST_MAKE_FOURCC('I', 'N', 'V', 'Z');
+ break;
case MM_PIXEL_FORMAT_ENCODED_MJPEG:
fourcc = GST_MAKE_FOURCC ('M', 'J', 'P', 'G');
break;
- case MM_PIXEL_FORMAT_INVZ:
- fourcc = GST_MAKE_FOURCC('I', 'N', 'V', 'Z');
+ case MM_PIXEL_FORMAT_ENCODED_VP8:
+ fourcc = GST_MAKE_FOURCC ('V', 'P', '8', '0');
+ break;
+ case MM_PIXEL_FORMAT_ENCODED_VP9:
+ fourcc = GST_MAKE_FOURCC ('V', 'P', '9', '0');
break;
default:
MMCAM_LOG_INFO("Not proper pixel type[%d]. Set default - I420", pixtype);
switch (fourcc) {
case GST_MAKE_FOURCC('S', 'N', '1', '2'):
+ /* fall through */
case GST_MAKE_FOURCC('N', 'V', '1', '2'):
pixtype = MM_PIXEL_FORMAT_NV12;
break;
case GST_MAKE_FOURCC('S', 'N', '2', '1'):
+ /* fall through */
case GST_MAKE_FOURCC('N', 'V', '2', '1'):
pixtype = MM_PIXEL_FORMAT_NV21;
break;
case GST_MAKE_FOURCC('S', 'U', 'Y', 'V'):
+ /* fall through */
case GST_MAKE_FOURCC('Y', 'U', 'Y', 'V'):
+ /* fall through */
case GST_MAKE_FOURCC('Y', 'U', 'Y', '2'):
pixtype = MM_PIXEL_FORMAT_YUYV;
break;
case GST_MAKE_FOURCC('S', 'Y', 'V', 'Y'):
+ /* fall through */
case GST_MAKE_FOURCC('U', 'Y', 'V', 'Y'):
pixtype = MM_PIXEL_FORMAT_UYVY;
break;
case GST_MAKE_FOURCC('S', '4', '2', '0'):
+ /* fall through */
case GST_MAKE_FOURCC('I', '4', '2', '0'):
pixtype = MM_PIXEL_FORMAT_I420;
break;
pixtype = MM_PIXEL_FORMAT_RGB888;
break;
case GST_MAKE_FOURCC('A', 'R', 'G', 'B'):
+ /* fall through */
case GST_MAKE_FOURCC('x', 'R', 'G', 'B'):
pixtype = MM_PIXEL_FORMAT_ARGB;
break;
case GST_MAKE_FOURCC('B', 'G', 'R', 'A'):
+ /* fall through */
case GST_MAKE_FOURCC('B', 'G', 'R', 'x'):
+ /* fall through */
case GST_MAKE_FOURCC('S', 'R', '3', '2'):
pixtype = MM_PIXEL_FORMAT_RGBA;
break;
case GST_MAKE_FOURCC('J', 'P', 'E', 'G'):
- case GST_MAKE_FOURCC('P', 'N', 'G', ' '):
pixtype = MM_PIXEL_FORMAT_ENCODED;
break;
/*FIXME*/
case GST_MAKE_FOURCC ('M', 'J', 'P', 'G'):
pixtype = MM_PIXEL_FORMAT_ENCODED_MJPEG;
break;
+ case GST_MAKE_FOURCC ('V', 'P', '8', '0'):
+ /* fall through */
+ case GST_MAKE_FOURCC ('v', 'p', '0', '8'):
+ pixtype = MM_PIXEL_FORMAT_ENCODED_VP8;
+ break;
+ case GST_MAKE_FOURCC ('V', 'P', '9', '0'):
+ /* fall through */
+ case GST_MAKE_FOURCC ('v', 'p', '0', '9'):
+ pixtype = MM_PIXEL_FORMAT_ENCODED_VP9;
+ break;
case GST_MAKE_FOURCC('I', 'N', 'V', 'Z'):
pixtype = MM_PIXEL_FORMAT_INVZ;
break;
gboolean _mmcamcorder_is_encoded_preview_pixel_format(int pixel_format)
{
return (pixel_format == MM_PIXEL_FORMAT_ENCODED_H264 ||
- pixel_format == MM_PIXEL_FORMAT_ENCODED_MJPEG);
+ pixel_format == MM_PIXEL_FORMAT_ENCODED_MJPEG ||
+ pixel_format == MM_PIXEL_FORMAT_ENCODED_VP8 ||
+ pixel_format == MM_PIXEL_FORMAT_ENCODED_VP9);
}
void _mmcamcorder_set_log_level(int level)
projects / platform / core / multimedia / libmm-camcorder.git / commitdiff