Revert "[ITC][capi-media-streamer][Non-ACR][modify tc]"

This reverts commit 4d7d5e816d044abc81b0b07196734122fd2f3eac.

For M2 release, We need to revert this patch.
After M2 release, I will request this.
thank you.

Change-Id: I3d12c9feb5c8bf6426ca582da4b63b08033cf22e

diff --git a/src/itc/capi-media-streamer/ITs-capi-media-streamer-common.h b/src/itc/capi-media-streamer/ITs-capi-media-streamer-common.h
index 29c444c2c57843640082e663f26fc8f528403ac3..f5bab2ab4006185bc6571db661ca81c58c29e63f 100755 (executable)
--- a/src/itc/capi-media-streamer/ITs-capi-media-streamer-common.h
+++ b/src/itc/capi-media-streamer/ITs-capi-media-streamer-common.h
@@ -28,7 +28,8 @@ media_streamer_h streamer;
 bool g_bMediaStreamerPositionChangedCallback;
 #define VIDEO_WIDTH 1280
 #define VIDEO_HEIGHT 720
-#define VIDEO_FRAME_RATE 30
+#define AVG_BPS 1031
+#define MAX_BPS 2063
 #define API_NAMESPACE  "CAPI_MEDIA_STREAMER_ITC"
 #define USER_DATA_STR  "callback_user_data"
 #define TIMEOUT 20000

diff --git a/src/itc/capi-media-streamer/ITs-capi-media-streamer.c b/src/itc/capi-media-streamer/ITs-capi-media-streamer.c
index 2e96dcd15c6f3cd8c4c41a71f95c232734dd68b6..53c29ddc18b8427ab30dfd1e7ba58a56d83ca1a1 100755 (executable)
--- a/src/itc/capi-media-streamer/ITs-capi-media-streamer.c
+++ b/src/itc/capi-media-streamer/ITs-capi-media-streamer.c
@@ -94,10 +94,16 @@ void ITs_capi_media_streamer_startup(void)
                FPRINTF("[Line : %d][%s] media_format_set_video_height failed, error returned = %s [%d]\\n", __LINE__, API_NAMESPACE, MediaStreamerGetError(nRetVal), nRetVal);
                return;
        }
-       nRetVal = media_format_set_video_frame_rate(vfmt_encoded, VIDEO_FRAME_RATE);
+       nRetVal = media_format_set_video_avg_bps(vfmt_encoded, AVG_BPS);
        if(nRetVal != MEDIA_FORMAT_ERROR_NONE)
        {
-               FPRINTF("[Line : %d][%s] media_format_set_video_frame_rate failed, error returned = %s [%d]\\n", __LINE__, API_NAMESPACE, MediaStreamerGetError(nRetVal), nRetVal);
+               FPRINTF("[Line : %d][%s] media_format_set_video_avg_bps failed, error returned = %s [%d]\\n", __LINE__, API_NAMESPACE, MediaStreamerGetError(nRetVal), nRetVal);
+               return;
+       }
+       nRetVal = media_format_set_video_max_bps(vfmt_encoded, MAX_BPS);
+       if(nRetVal != MEDIA_FORMAT_ERROR_NONE)
+       {
+               FPRINTF("[Line : %d][%s] media_format_set_video_max_bps failed, error returned = %s [%d]\\n", __LINE__, API_NAMESPACE, MediaStreamerGetError(nRetVal), nRetVal);
                return;
        }
        return;
@@ -800,22 +806,20 @@ int ITc_capi_media_streamer_node_node_set_get_pad_format_p(void)
        START_TEST;
        int ret = MEDIA_STREAMER_ERROR_NONE;
        media_format_h pad_fmt = NULL;
-       int width, height, frame_rate;
+       int width, height, avg_bps, max_bps;
        media_format_mimetype_e mime = MEDIA_FORMAT_MP3;
        media_streamer_node_h app_src = NULL;
-       int width_init, height_init, frame_rate_init;
+       int width_init, height_init, avg_bps_init, max_bps_init;
        media_format_mimetype_e mime_init = MEDIA_FORMAT_MP3;
        media_streamer_node_h app_sink = NULL;
-
-       ret = media_format_get_video_info(vfmt_encoded, &mime_init, &width_init, &height_init, NULL, NULL);
+       
+       ret = media_format_get_video_info(vfmt_encoded, &mime_init, &width_init, &height_init, &avg_bps_init, &max_bps_init);
        PRINT_RESULT(MEDIA_STREAMER_ERROR_NONE, ret, "media_format_get_video_info", MediaStreamerGetError(ret));
        assert_eq(mime_init, MEDIA_FORMAT_H263);
        assert_eq(width_init, VIDEO_WIDTH);
        assert_eq(height_init, VIDEO_HEIGHT);
-
-       ret = media_format_get_video_frame_rate(vfmt_encoded, &frame_rate_init);
-       PRINT_RESULT(MEDIA_STREAMER_ERROR_NONE, ret, "media_format_get_video_frame_rate", MediaStreamerGetError(ret));
-       assert_eq(frame_rate_init, VIDEO_FRAME_RATE);
+       assert_eq(avg_bps_init, AVG_BPS);
+       assert_eq(max_bps_init, MAX_BPS);
 
        ret = media_streamer_node_create_src(MEDIA_STREAMER_NODE_SRC_TYPE_CUSTOM, &app_src);
        PRINT_RESULT(MEDIA_STREAMER_ERROR_NONE, ret, "media_streamer_node_create_src", MediaStreamerGetError(ret));
@@ -823,11 +827,12 @@ int ITc_capi_media_streamer_node_node_set_get_pad_format_p(void)
 
        ret = media_streamer_node_add(streamer, app_src);
        PRINT_RESULT(MEDIA_STREAMER_ERROR_NONE, ret, "media_streamer_node_add", MediaStreamerGetError(ret));
-
+       
+       
        ret = media_streamer_node_create_sink(MEDIA_STREAMER_NODE_SINK_TYPE_CUSTOM, &app_sink);
        PRINT_RESULT(MEDIA_STREAMER_ERROR_NONE, ret, "media_streamer_node_create_sink", MediaStreamerGetError(ret));
        CHECK_HANDLE(app_sink,"media_streamer_node_create_sink");
-
+   
        ret = media_streamer_node_set_pad_format(app_src, "src", vfmt_encoded);
        PRINT_RESULT(MEDIA_STREAMER_ERROR_NONE, ret, "media_streamer_node_set_pad_format", MediaStreamerGetError(ret));
 
@@ -841,15 +846,14 @@ int ITc_capi_media_streamer_node_node_set_get_pad_format_p(void)
        PRINT_RESULT(MEDIA_STREAMER_ERROR_NONE, ret, "media_streamer_node_get_pad_format", MediaStreamerGetError(ret));
        CHECK_HANDLE(pad_fmt,"media_streamer_node_get_pad_format");
 
-       ret = media_format_get_video_info(pad_fmt, &mime, &width, &height, NULL, NULL);
+       ret = media_format_get_video_info(pad_fmt, &mime, &width, &height, &avg_bps, &max_bps);
        PRINT_RESULT(MEDIA_STREAMER_ERROR_NONE, ret, "media_format_get_video_info", MediaStreamerGetError(ret));
+
        assert_eq(mime, MEDIA_FORMAT_H263);
        assert_eq(width, VIDEO_WIDTH);
        assert_eq(height, VIDEO_HEIGHT);
-
-       ret = media_format_get_video_frame_rate(pad_fmt, &frame_rate);
-       PRINT_RESULT(MEDIA_STREAMER_ERROR_NONE, ret, "media_format_get_video_frame_rate", MediaStreamerGetError(ret));
-       assert_eq(frame_rate, VIDEO_FRAME_RATE);
+       assert_eq(avg_bps, AVG_BPS);
+       assert_eq(max_bps, MAX_BPS);
 
        return 0;
 }