@@ -38,18 +38,15 @@
static GstBuffer *create_h264enc_codec_data (DroidMediaData * data);
static gboolean create_mpeg4vdec_codec_data_from_codec_data (GstDroidCodec *
codec, GstBuffer * data, DroidMediaData * out);
-static gboolean
-create_mpeg2vdec_codec_data_from_codec_data (GstDroidCodec *
- codec G_GNUC_UNUSED, GstBuffer * data, DroidMediaData * out);
static gboolean create_h264dec_codec_data_from_codec_data (GstDroidCodec *
codec, GstBuffer * data, DroidMediaData * out);
-static gboolean create_h265dec_codec_data_from_codec_data (GstDroidCodec *
+static gboolean create_vp8vdec_codec_data_from_codec_data (GstDroidCodec *
codec, GstBuffer * data, DroidMediaData * out);
static gboolean create_aacdec_codec_data_from_codec_data (GstDroidCodec * codec,
GstBuffer * data, DroidMediaData * out);
static gboolean create_aacdec_codec_data_from_frame_data (GstDroidCodec * codec,
GstBuffer * frame_data, DroidMediaData * out);
-static gboolean process_h26xdec_data (GstDroidCodec * codec, GstBuffer * buffer,
+static gboolean process_h264dec_data (GstDroidCodec * codec, GstBuffer * buffer,
DroidMediaData * out);
static gboolean process_aacdec_data (GstDroidCodec * codec, GstBuffer * buffer,
DroidMediaData * out);
@@ -120,26 +117,15 @@
{GST_DROID_CODEC_DECODER_VIDEO, "video/x-h264", "video/avc",
"video/x-h264, stream-format=avc,alignment=au", TRUE,
is_h264_dec, NULL, NULL, NULL,
- create_h264dec_codec_data_from_codec_data, NULL, process_h26xdec_data},
+ create_h264dec_codec_data_from_codec_data, NULL, process_h264dec_data},
{GST_DROID_CODEC_DECODER_VIDEO, "video/x-h263", "video/3gpp",
"video/x-h263", TRUE, NULL,
NULL, NULL, NULL, NULL, NULL, NULL},
{GST_DROID_CODEC_DECODER_VIDEO, "video/x-vp8", "video/x-vnd.on2.vp8",
- "video/x-vp8", TRUE, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
-
- {GST_DROID_CODEC_DECODER_VIDEO, "video/x-vp9", "video/x-vnd.on2.vp9",
- "video/x-vp9", TRUE, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
-
- {GST_DROID_CODEC_DECODER_VIDEO, "video/mpeg", "video/mpeg2",
- "video/mpeg, mpegversion=2", TRUE,
- NULL, NULL, NULL, NULL,
- create_mpeg2vdec_codec_data_from_codec_data, NULL, NULL},
-
- {GST_DROID_CODEC_DECODER_VIDEO, "video/x-h265", "video/hevc",
- "video/x-h265", FALSE, NULL, NULL, NULL, NULL,
- create_h265dec_codec_data_from_codec_data, NULL, process_h26xdec_data},
+ "video/x-vp8", TRUE, NULL, NULL, NULL, NULL,
+ create_vp8vdec_codec_data_from_codec_data, NULL, NULL},
/* audio encoders */
{GST_DROID_CODEC_ENCODER_AUDIO, "audio/mpeg", "audio/mp4a-latm",
@@ -231,20 +217,6 @@
continue;
}
- /* Verify that video codec is supported before enabling it */
- if (type == GST_DROID_CODEC_DECODER_VIDEO
- || type == GST_DROID_CODEC_ENCODER_VIDEO) {
- DroidMediaCodecMetaData md;
- md.type = codecs[x].droid;
- md.flags = DROID_MEDIA_CODEC_HW_ONLY;
- if (!droid_media_codec_is_supported (&md,
- type == GST_DROID_CODEC_ENCODER_VIDEO)) {
- GST_INFO ("No hardware support found for %s, disabling codec",
- codecs[x].droid);
- continue;
- }
- }
-
s = gst_structure_new_from_string (codecs[x].caps);
caps = gst_caps_merge_structure (caps, s);
}
@@ -645,16 +617,6 @@
}
static gboolean
-create_mpeg2vdec_codec_data_from_codec_data (GstDroidCodec *
- codec G_GNUC_UNUSED, GstBuffer * data G_GNUC_UNUSED, DroidMediaData * out)
-{
- out->size = 0;
- out->data = NULL;
-
- return TRUE;
-}
-
-static gboolean
create_mpeg4vdec_codec_data_from_codec_data (GstDroidCodec *
codec G_GNUC_UNUSED, GstBuffer * data, DroidMediaData * out)
{
@@ -715,7 +677,7 @@
}
static gboolean
-create_h264dec_codec_data_from_codec_data (GstDroidCodec * codec,
+create_vp8vdec_codec_data_from_codec_data (GstDroidCodec * codec,
GstBuffer * data, DroidMediaData * out)
{
GstMapInfo info;
@@ -731,10 +693,6 @@
goto out;
}
- codec->data->h264_nal = (1 + (info.data[4] & 3));
-
- GST_INFO ("nal prefix length %d", codec->data->h264_nal);
-
out->size = info.size;
out->data = g_malloc (info.size);
memcpy (out->data, info.data, info.size);
@@ -747,7 +705,7 @@
}
static gboolean
-create_h265dec_codec_data_from_codec_data (GstDroidCodec * codec,
+create_h264dec_codec_data_from_codec_data (GstDroidCodec * codec,
GstBuffer * data, DroidMediaData * out)
{
GstMapInfo info;
@@ -763,7 +721,7 @@
goto out;
}
- codec->data->h264_nal = (1 + (info.data[21] & 3));
+ codec->data->h264_nal = (1 + (info.data[4] & 3));
GST_INFO ("nal prefix length %d", codec->data->h264_nal);
@@ -930,7 +888,7 @@
}
static gboolean
-process_h26xdec_data (GstDroidCodec * codec, GstBuffer * buffer,
+process_h264dec_data (GstDroidCodec * codec, GstBuffer * buffer,
DroidMediaData * out)
{
GstMapInfo info;
|