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

This reverts commit 2b1ebe49cfd7ea89bedce48887845cf188956b21.

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

Change-Id: I964ffbc34c576d8f5c8b1733354c2461c1c20543

diff --git a/src/utc/capi-media-streamer/utc-capi-media-streamer.c b/src/utc/capi-media-streamer/utc-capi-media-streamer.c
index fc624960af4fb84fd6766c131d50c16e0b96e417..27cc06bd13b410eb56c94acb9ac248df9cedee15 100755 (executable)
--- a/src/utc/capi-media-streamer/utc-capi-media-streamer.c
+++ b/src/utc/capi-media-streamer/utc-capi-media-streamer.c
@@ -36,9 +36,9 @@
 #define EXTREMUM 0
 
 #define VIDEO_WIDTH       352
-#define VIDEO_HEIGHT      288
-#define VIDEO_FRAME_RATE  30
-
+#define VIDEO_HEIGHT       288
+#define VIDEO_AVG_BPS     1
+#define VIDEO_MAX_BPS     3
 #define AUDIO_CHANNEL     1
 #define AUDIO_SAMPLERATE  8000
 
@@ -125,7 +125,8 @@ void utc_capi_media_streamer_startup(void)
 
        media_format_set_video_width(vfmt_raw, VIDEO_WIDTH);
        media_format_set_video_height(vfmt_raw, VIDEO_HEIGHT);
-       media_format_set_video_frame_rate(vfmt_raw, VIDEO_FRAME_RATE);
+       media_format_set_video_avg_bps(vfmt_raw, VIDEO_AVG_BPS);
+       media_format_set_video_max_bps(vfmt_raw, VIDEO_MAX_BPS);
 
        /* Define video encoded format */
        media_format_create(&vfmt_encoded);
@@ -133,21 +134,24 @@ void utc_capi_media_streamer_startup(void)
 
        media_format_set_video_width(vfmt_encoded, VIDEO_WIDTH);
        media_format_set_video_height(vfmt_encoded, VIDEO_HEIGHT);
-       media_format_set_video_frame_rate(vfmt_encoded, VIDEO_FRAME_RATE);
+       media_format_set_video_avg_bps(vfmt_encoded, VIDEO_AVG_BPS);
+       media_format_set_video_max_bps(vfmt_encoded, VIDEO_MAX_BPS);
 
        /* Define encoded video format for adaptive stream */
        media_format_create(&vfmt_aenc);
        media_format_set_video_mime(vfmt_aenc, MEDIA_FORMAT_H264_SP);
        media_format_set_video_width(vfmt_aenc, VIDEO_WIDTH);
        media_format_set_video_height(vfmt_aenc, VIDEO_HEIGHT);
-       media_format_set_video_frame_rate(vfmt_aenc, VIDEO_FRAME_RATE);
+       media_format_set_video_avg_bps(vfmt_aenc, VIDEO_AVG_BPS);
+       media_format_set_video_max_bps(vfmt_aenc, VIDEO_MAX_BPS);
 
        /* Define encoded video format for adaptive stream */
        media_format_create(&vfmt_aencm);
        media_format_set_video_mime(vfmt_aencm, MEDIA_FORMAT_MPEG4_SP);
        media_format_set_video_width(vfmt_aencm, VIDEO_WIDTH);
        media_format_set_video_height(vfmt_aencm, VIDEO_HEIGHT);
-       media_format_set_video_frame_rate(vfmt_aencm, VIDEO_FRAME_RATE);
+       media_format_set_video_avg_bps(vfmt_aencm, VIDEO_AVG_BPS);
+       media_format_set_video_max_bps(vfmt_aencm, VIDEO_MAX_BPS);
 
        /* Define audio raw format */
        media_format_create(&afmt_raw);
@@ -2016,13 +2020,10 @@ int utc_media_streamer_node_get_pad_format_p(void)
 {
        int ret = MEDIA_STREAMER_ERROR_NONE;
 
-       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_H263;
 
-       ret = media_format_get_video_info(vfmt_encoded, &mime_init, &width_init, &height_init, NULL, NULL);
-       assert_eq(ret, MEDIA_STREAMER_ERROR_NONE);
-
-       ret = media_format_get_video_frame_rate(vfmt_encoded, &frame_rate_init);
+       ret = media_format_get_video_info(vfmt_encoded, &mime_init, &width_init, &height_init, &avg_bps_init, &max_bps_init);
        assert_eq(ret, MEDIA_STREAMER_ERROR_NONE);
 
        media_streamer_node_h app_src = NULL;
@@ -2053,28 +2054,27 @@ int utc_media_streamer_node_get_pad_format_p(void)
        assert_eq(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_MAX;
 
        ret = media_streamer_node_get_pad_format(app_src, "src", &pad_fmt);
        assert_eq(ret, MEDIA_STREAMER_ERROR_NONE);
        assert_neq(pad_fmt, NULL);
 
-       ret = media_format_get_video_info(pad_fmt, &mime, &width, &height, NULL, NULL);
-       assert_eq(ret, MEDIA_STREAMER_ERROR_NONE);
-
-       ret = media_format_get_video_frame_rate(pad_fmt, &frame_rate);
+       ret = media_format_get_video_info(pad_fmt, &mime, &width, &height, &avg_bps, &max_bps);
        assert_eq(ret, MEDIA_STREAMER_ERROR_NONE);
 
        assert_neq(mime, EXTREMUM);
        assert_neq(width, EXTREMUM);
        assert_neq(height, EXTREMUM);
-       assert_neq(frame_rate, EXTREMUM);
+       assert_neq(avg_bps, EXTREMUM);
+       assert_neq(max_bps, EXTREMUM);
 
        assert_eq(mime_init, mime);
        assert_eq(width_init, width);
        assert_eq(height_init, height);
-       assert_eq(frame_rate_init, frame_rate);
+       assert_eq(avg_bps_init, avg_bps);
+       assert_eq(max_bps_init, max_bps);
 
        media_format_unref(pad_fmt);