diff options
author | Alessandro Decina <alessandro.decina@collabora.co.uk> | 2012-01-31 11:02:10 +0100 |
---|---|---|
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-10-25 14:05:48 +0200 |
commit | 8aec23ac0578cf15ae8217e74d87594b473b702b (patch) | |
tree | 5924ed7261e1ec56afd39a4311202fadf7a6ee20 /gst | |
parent | cbecbbe23e6b519eed2f286be6e97250dbb3b5ab (diff) |
vc1parse: remove stub stream conversion code
Diffstat (limited to 'gst')
-rw-r--r-- | gst/videoparsers/gstvc1parse.c | 131 |
1 files changed, 4 insertions, 127 deletions
diff --git a/gst/videoparsers/gstvc1parse.c b/gst/videoparsers/gstvc1parse.c index caf830130..e38d2ac0f 100644 --- a/gst/videoparsers/gstvc1parse.c +++ b/gst/videoparsers/gstvc1parse.c @@ -1091,133 +1091,10 @@ gst_vc1_parse_pre_push_frame (GstBaseParse * parse, GstBaseParseFrame * frame) { GstVC1Parse *vc1parse = GST_VC1_PARSE (parse); - /* Nothing to do here */ - if (vc1parse->input_stream_format == vc1parse->output_stream_format) - return GST_FLOW_OK; - - switch (vc1parse->output_stream_format) { - case VC1_STREAM_FORMAT_BDU: - switch (vc1parse->input_stream_format) { - case VC1_STREAM_FORMAT_BDU: - case VC1_STREAM_FORMAT_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_RAW_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_FRAME_LAYER: - case VC1_STREAM_FORMAT_ASF: - case VC1_STREAM_FORMAT_FRAME_LAYER: - break; - default: - g_assert_not_reached (); - } - break; - case VC1_STREAM_FORMAT_BDU_FRAME: - switch (vc1parse->input_stream_format) { - case VC1_STREAM_FORMAT_BDU: - case VC1_STREAM_FORMAT_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_RAW_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_FRAME_LAYER: - case VC1_STREAM_FORMAT_ASF: - case VC1_STREAM_FORMAT_FRAME_LAYER: - break; - default: - g_assert_not_reached (); - } - break; - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU: - switch (vc1parse->input_stream_format) { - case VC1_STREAM_FORMAT_BDU: - case VC1_STREAM_FORMAT_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_RAW_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_FRAME_LAYER: - case VC1_STREAM_FORMAT_ASF: - case VC1_STREAM_FORMAT_FRAME_LAYER: - break; - default: - g_assert_not_reached (); - } - break; - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU_FRAME: - switch (vc1parse->input_stream_format) { - case VC1_STREAM_FORMAT_BDU: - case VC1_STREAM_FORMAT_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_RAW_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_FRAME_LAYER: - case VC1_STREAM_FORMAT_ASF: - case VC1_STREAM_FORMAT_FRAME_LAYER: - break; - default: - g_assert_not_reached (); - } - break; - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_RAW_FRAME: - switch (vc1parse->input_stream_format) { - case VC1_STREAM_FORMAT_BDU: - case VC1_STREAM_FORMAT_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_RAW_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_FRAME_LAYER: - case VC1_STREAM_FORMAT_ASF: - case VC1_STREAM_FORMAT_FRAME_LAYER: - break; - default: - g_assert_not_reached (); - } - break; - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_FRAME_LAYER: - switch (vc1parse->input_stream_format) { - case VC1_STREAM_FORMAT_BDU: - case VC1_STREAM_FORMAT_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_RAW_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_FRAME_LAYER: - case VC1_STREAM_FORMAT_ASF: - case VC1_STREAM_FORMAT_FRAME_LAYER: - break; - default: - g_assert_not_reached (); - } - break; - case VC1_STREAM_FORMAT_ASF: - switch (vc1parse->input_stream_format) { - case VC1_STREAM_FORMAT_BDU: - case VC1_STREAM_FORMAT_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_RAW_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_FRAME_LAYER: - case VC1_STREAM_FORMAT_ASF: - case VC1_STREAM_FORMAT_FRAME_LAYER: - break; - default: - g_assert_not_reached (); - } - break; - case VC1_STREAM_FORMAT_FRAME_LAYER: - switch (vc1parse->input_stream_format) { - case VC1_STREAM_FORMAT_BDU: - case VC1_STREAM_FORMAT_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_BDU_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_RAW_FRAME: - case VC1_STREAM_FORMAT_SEQUENCE_LAYER_FRAME_LAYER: - case VC1_STREAM_FORMAT_ASF: - case VC1_STREAM_FORMAT_FRAME_LAYER: - break; - default: - g_assert_not_reached (); - } - break; - default: - g_assert_not_reached (); + if (vc1parse->input_header_format != vc1parse->output_header_format || + vc1parse->input_stream_format != vc1parse->output_stream_format) { + GST_WARNING_OBJECT (vc1parse, "stream conversion not implemented yet"); + return GST_FLOW_ERROR; } return GST_FLOW_OK; |