From 444fc4389b9ce20139cb2a8448cc34da6ea938e1 Mon Sep 17 00:00:00 2001 From: Mahesh Kondiparthi Date: Thu, 4 Feb 2016 09:17:31 +0530 Subject: [PATCH] Fixed bug in infunctionality of 3gp video with current test-suite Added 3gp check in video-demuxing in muxer_test Added \n at the end of g_print Change-Id: Ia876b5c544bfcee6a2abd890bcd328018f7f25e0 Signed-off-by: Mahesh Kondiparthi --- test/mediamuxer_test.c | 8 ++++---- test/mediamuxer_test_gst.c | 12 ++++++------ test/mediamuxer_test_with_mediacodec.c | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/test/mediamuxer_test.c b/test/mediamuxer_test.c index 90fbe26..91922fe 100644 --- a/test/mediamuxer_test.c +++ b/test/mediamuxer_test.c @@ -427,8 +427,8 @@ void _interpret_main_menu(char *cmd) test_mediamuxer_add_track_audio(); } else if (strncmp(cmd, "v", 1) == 0) { if (!validate_with_codec) { - if ((strncmp(data_sink, "11", 2) == 0 || strncmp(data_sink, "12", 2) == 0 || strncmp(data_sink, "13", 2) == 0 - || strncmp(data_sink, "21", 2) == 0 || strncmp(data_sink, "22", 2) == 0)) { + if (strncmp(data_sink, "11", 2) == 0 || strncmp(data_sink, "12", 2) == 0 || strncmp(data_sink, "13", 2) == 0 + || strncmp(data_sink, "21", 2) == 0 || strncmp(data_sink, "22", 2) == 0 || strncmp(data_sink, "23", 2) == 0 || strncmp(data_sink, "24", 2) == 0) { have_vid_track = true; if (have_mp4 == false) { g_menu_state = CURRENT_STATUS_MP4_FILENAME; @@ -437,10 +437,10 @@ void _interpret_main_menu(char *cmd) } } if ((strncmp(data_sink, "11", 2) == 0 || strncmp(data_sink, "12", 2) == 0 || strncmp(data_sink, "13", 2) == 0 - || strncmp(data_sink, "21", 2) == 0 || strncmp(data_sink, "22", 2) == 0)) + || strncmp(data_sink, "21", 2) == 0 || strncmp(data_sink, "22", 2) == 0) || strncmp(data_sink, "23", 2) == 0 || strncmp(data_sink, "24", 2) == 0) test_mediamuxer_add_track_video(); else - g_print("Ignoring, data_sink=%s doesnt need video track testing", data_sink); + g_print("Ignoring, data_sink=%s doesnt need video track testing\n", data_sink); } else if (strncmp(cmd, "m", 1) == 0) { test_mediamuxer_write_sample(); } else if (strncmp(cmd, "t", 1) == 0) { diff --git a/test/mediamuxer_test_gst.c b/test/mediamuxer_test_gst.c index 7192815..bc7aec5 100644 --- a/test/mediamuxer_test_gst.c +++ b/test/mediamuxer_test_gst.c @@ -141,11 +141,11 @@ static void __audio_app_sink_callback(GstElement *sink, CustomData *data) return; } if (media_format_set_audio_bit(audfmt, 16)) - g_print("wav media_format_set_audio_bit failed"); + g_print("wav media_format_set_audio_bit failed\n"); if (media_format_set_audio_channel(audfmt, 2)) - g_print("wav media_format_set_audio_channel failed"); + g_print("wav media_format_set_audio_channel failed\n"); if (media_format_set_audio_samplerate(audfmt, 44100)) - g_print("wav media_format_set_audio_samplerate failed"); + g_print("wav media_format_set_audio_samplerate failed\n"); } else g_print("Unsupported audio mime\n"); @@ -508,7 +508,7 @@ int demux_audio() if (access(media_file, F_OK) == -1) { /* wav/amr file doesn't exist */ - g_print("wav/amr Invalid file path."); + g_print("wav/amr Invalid file path.\n"); return -1; } @@ -550,7 +550,7 @@ int demux_audio() /* we link the elements together */ if (!gst_element_link_many(data.source, data.demuxer, data.audioqueue, data.audio_appsink, NULL)) { - g_print("Demuxer pipeline link failed"); + g_print("Demuxer pipeline link failed\n"); return -1; } @@ -589,7 +589,7 @@ int demux_mp4() if (access(media_file, F_OK) == -1) { /* mp4 file doesn't exist */ - g_print("mp4 Invalid file path."); + g_print("mp4 Invalid file path.\n"); return -1; } diff --git a/test/mediamuxer_test_with_mediacodec.c b/test/mediamuxer_test_with_mediacodec.c index e9927f9..62582b9 100644 --- a/test/mediamuxer_test_with_mediacodec.c +++ b/test/mediamuxer_test_with_mediacodec.c @@ -343,7 +343,7 @@ void mediacodec_config_prepare(void) for (i = 0; i < g_handle_num; i++) { if (g_media_codec[i] != NULL) { - g_print("setting codec callbacks"); + g_print("setting codec callbacks\n"); mediacodec_set_input_buffer_used_cb(g_media_codec[i], _mediacodec_empty_buffer_cb, g_media_codec[i]); mediacodec_set_output_buffer_available_cb(g_media_codec[i], _mediacodec_fill_buffer_cb, g_media_codec[i]); mediacodec_set_eos_cb(g_media_codec[i], _mediacodec_eos_cb, g_media_codec[i]); -- 2.7.4