From dca13c8ea7528d75845a3c753ab71e4f1a31f18a Mon Sep 17 00:00:00 2001 From: Mahesh Kondiparthi Date: Wed, 17 Feb 2016 10:12:13 +0530 Subject: [PATCH] Added relevant error check for media_format_get_info calls in muxer Appropriate check with MEDIA_FORMAT_ERROR_NONE is used instead of MEDIA_FORMAT_ERROR_INVALID_OPERATION Change-Id: I02f17146cb8a78562cb8b59a668eb06cea7fc936 Signed-off-by: Mahesh Kondiparthi --- src/port_gst/mediamuxer_port_gst.c | 18 +++++++++--------- test/mediamuxer_test.c | 30 +++++++++++++++--------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/port_gst/mediamuxer_port_gst.c b/src/port_gst/mediamuxer_port_gst.c index c45a801..9a185f9 100755 --- a/src/port_gst/mediamuxer_port_gst.c +++ b/src/port_gst/mediamuxer_port_gst.c @@ -165,8 +165,8 @@ static int gst_muxer_add_track(MMHandleType pHandle, last->next = current; } - if (media_format_get_video_info(media_format, &mimetype, NULL, NULL, NULL, NULL) != - MEDIA_FORMAT_ERROR_INVALID_OPERATION) { + if (media_format_get_video_info(media_format, &mimetype, NULL, NULL, NULL, NULL) + == MEDIA_FORMAT_ERROR_NONE) { if ((mx_handle_gst->muxed_format == MEDIAMUXER_CONTAINER_FORMAT_MP4 && (mimetype == MEDIA_FORMAT_H264_SP || mimetype == MEDIA_FORMAT_H264_MP || mimetype == MEDIA_FORMAT_H264_HP || mimetype == MEDIA_FORMAT_H263 @@ -185,8 +185,8 @@ static int gst_muxer_add_track(MMHandleType pHandle, } else { MX_E("Unsupported/Mismatched video MIME Type: %x\n", mimetype); } - } else if (media_format_get_audio_info(media_format, &mimetype, NULL, NULL, NULL, NULL) != - MEDIA_FORMAT_ERROR_INVALID_OPERATION) { + } else if (media_format_get_audio_info(media_format, &mimetype, NULL, NULL, NULL, NULL) == + MEDIA_FORMAT_ERROR_NONE) { if ((mx_handle_gst->muxed_format == MEDIAMUXER_CONTAINER_FORMAT_MP4 && (mimetype == MEDIA_FORMAT_AAC_LC || mimetype == MEDIA_FORMAT_AAC_HE || mimetype == MEDIA_FORMAT_AAC_HE_PS)) || (mx_handle_gst->muxed_format == MEDIAMUXER_CONTAINER_FORMAT_3GP @@ -211,8 +211,8 @@ static int gst_muxer_add_track(MMHandleType pHandle, } else { MX_E("Unsupported/Mismatched audio MIME Type: %x\n", mimetype); } - } else if (media_format_get_text_info(media_format, &mimetype, &text_type_e) != - MEDIA_FORMAT_ERROR_INVALID_OPERATION) { + } else if (media_format_get_text_info(media_format, &mimetype, &text_type_e) + == MEDIA_FORMAT_ERROR_NONE) { if ((mimetype == MEDIA_FORMAT_TEXT_MP4) && (mx_handle_gst->muxed_format == MEDIAMUXER_CONTAINER_FORMAT_MP4 || mx_handle_gst->muxed_format == MEDIAMUXER_CONTAINER_FORMAT_3GP)) { @@ -507,7 +507,7 @@ mx_ret_e _gst_create_pipeline(mxgst_handle_t *gst_handle) current->appsrc = gst_element_factory_make("appsrc", str_appsrc); if (media_format_get_video_info((media_format_h)(current->media_format), &mimetype, NULL, NULL, NULL, NULL) - != MEDIA_FORMAT_ERROR_INVALID_OPERATION) { + == MEDIA_FORMAT_ERROR_NONE) { if (mimetype == MEDIA_FORMAT_H264_SP || mimetype == MEDIA_FORMAT_H264_MP || mimetype == MEDIA_FORMAT_H264_HP) current->parser = gst_element_factory_make("h264parse", str_parser); else if (mimetype == MEDIA_FORMAT_H263 || mimetype == MEDIA_FORMAT_H263P) @@ -566,8 +566,8 @@ mx_ret_e _gst_create_pipeline(mxgst_handle_t *gst_handle) current->appsrc = gst_element_factory_make("appsrc", str_appsrc); - if (media_format_get_audio_info((media_format_h)(current->media_format), &mimetype, NULL, NULL, NULL, NULL) != - MEDIA_FORMAT_ERROR_INVALID_OPERATION) { + if (media_format_get_audio_info((media_format_h)(current->media_format), &mimetype, NULL, NULL, NULL, NULL) == + MEDIA_FORMAT_ERROR_NONE) { if (mimetype == MEDIA_FORMAT_AAC_LC || mimetype == MEDIA_FORMAT_AAC_HE || mimetype == MEDIA_FORMAT_AAC_HE_PS) current->parser = gst_element_factory_make("aacparse", str_parser); else if (mimetype == MEDIA_FORMAT_PCM diff --git a/test/mediamuxer_test.c b/test/mediamuxer_test.c index b8d3563..5f688e4 100644 --- a/test/mediamuxer_test.c +++ b/test/mediamuxer_test.c @@ -189,19 +189,19 @@ int test_mediamuxer_add_track_video() /* MEDIA_FORMAT_H264_SP MEDIA_FORMAT_H264_MP MEDIA_FORMAT_H264_HP */ if (strncmp(data_sink, "11", 2) == 0) { - if (media_format_set_video_mime(media_format, MEDIA_FORMAT_H264_SP) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_video_mime(media_format, MEDIA_FORMAT_H264_SP) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_mime operation\n"); } else if (strncmp(data_sink, "12", 2) == 0) { - if (media_format_set_video_mime(media_format, MEDIA_FORMAT_H263) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_video_mime(media_format, MEDIA_FORMAT_H263) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_mime operation\n"); } else if (strncmp(data_sink, "13", 2) == 0) { - if (media_format_set_video_mime(media_format, MEDIA_FORMAT_MPEG4_SP) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_video_mime(media_format, MEDIA_FORMAT_MPEG4_SP) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_mime operation\n"); } else if (strncmp(data_sink, "21", 2) == 0 || strncmp(data_sink, "23", 2) == 0) { - if (media_format_set_video_mime(media_format, MEDIA_FORMAT_H264_SP) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_video_mime(media_format, MEDIA_FORMAT_H264_SP) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_mime operation\n"); } else if (strncmp(data_sink, "22", 2) == 0 || strncmp(data_sink, "24", 2) == 0) { - if (media_format_set_video_mime(media_format, MEDIA_FORMAT_H263) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_video_mime(media_format, MEDIA_FORMAT_H263) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_mime operation\n"); } else if (strncmp(data_sink, "31", 2) == 0 || strncmp(data_sink, "41", 2) == 0 || strncmp(data_sink, "42", 2) == 0 @@ -242,36 +242,36 @@ int test_mediamuxer_add_track_audio() if (strncmp(data_sink, "11", 2) == 0 || strncmp(data_sink, "12", 2) == 0 || strncmp(data_sink, "13", 2) == 0) { /* MEDIA_FORMAT_AAC_LC MEDIA_FORMAT_AAC_HE MEDIA_FORMAT_AAC_HE_PS */ - if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AAC_LC) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AAC_LC) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_mime operation, for AAC in MP4\n"); } else if (strncmp(data_sink, "21", 2) == 0 || strncmp(data_sink, "22", 2) == 0) { - if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AAC_LC) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AAC_LC) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_mime operation, for AAC in 3GP\n"); } else if (strncmp(data_sink, "23", 2) == 0 || strncmp(data_sink, "24", 2) == 0) { - if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AMR_NB) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AMR_NB) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_mime operation for AMR_NB in 3GP\n"); } else if (strncmp(data_sink, "31", 2) == 0) { - if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_PCM) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_PCM) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_mime operation for PCM in WAV\n"); } else if (strncmp(data_sink, "41", 2) == 0) { - if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AMR_NB) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AMR_NB) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_mime operation for amr-nb audio\n"); } else if (strncmp(data_sink, "42", 2) == 0) { - if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AMR_WB) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AMR_WB) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_mime operation for amr-wb audio\n"); } else if (strncmp(data_sink, "51", 2) == 0) { - if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AAC) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_audio_mime(media_format_a, MEDIA_FORMAT_AAC) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_mime operation for aac-adts audio\n"); } if (validate_with_codec) { - if (media_format_set_audio_channel(media_format_a, channel) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_audio_channel(media_format_a, channel) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_channel operation\n"); media_format_set_audio_samplerate(media_format_a, samplerate); media_format_set_audio_bit(media_format_a, bit); media_format_set_audio_avg_bps(media_format_a, bitrate); } else { - if (media_format_set_audio_channel(media_format_a, 2) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_audio_channel(media_format_a, 2) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_audio_channel operation\n"); media_format_set_audio_samplerate(media_format_a, 44100); media_format_set_audio_bit(media_format_a, 16); @@ -308,7 +308,7 @@ int test_mediamuxer_add_track_subtitle() || strncmp(data_sink, "13", 1) == 0 || strncmp(data_sink, "21", 1) == 0 || strncmp(data_sink, "22", 1) == 0 || strncmp(data_sink, "23", 1) == 0 || strncmp(data_sink, "24", 1) == 0) { - if (media_format_set_text_mime(media_format_t, MEDIA_FORMAT_TEXT_MP4) == MEDIA_FORMAT_ERROR_INVALID_OPERATION) + if (media_format_set_text_mime(media_format_t, MEDIA_FORMAT_TEXT_MP4) != MEDIA_FORMAT_ERROR_NONE) g_print("Problem during media_format_set_text_mime operation in MP4\n"); } else { g_print("Currently text is not supported for this format\n"); -- 2.7.4