Bug fix - invalid bitrate setting

- Do not multiply 1000 with bitrate from media format.
  They are same unit.(bps)
- Remove bitrate setting when make packets for packet pool.

[Version] 1.1.5
[Issue Type] Bug fix

Change-Id: Ib6eea22ee25a46abed950cf7679361a0e277c41d
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/packaging/capi-media-codec.spec b/packaging/capi-media-codec.spec
index 1b43307e6f90af7ad432265dd69fc73e7faa8d63..14310dc8d748ccae3e3d9029eda3c42758fa37b3 100644 (file)
--- a/packaging/capi-media-codec.spec
+++ b/packaging/capi-media-codec.spec
@@ -4,7 +4,7 @@
 
 Name:       capi-media-codec
 Summary:    A Media Codec library in Tizen Native API
-Version:    1.1.4
+Version:    1.1.5
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_codec_port_gst.c b/src/media_codec_port_gst.c
index 502221daa513ab902f4e0da31a92d2f2b66b8214..a5d46e32f16a25cdffac9694ca2595633b020fd2 100644 (file)
--- a/src/media_codec_port_gst.c
+++ b/src/media_codec_port_gst.c
@@ -1104,7 +1104,6 @@ gboolean _mc_update_packet_info(mc_gst_core_t *core, media_format_h format)
                }
 
                if (core->encoder) {
-                       bitrate *= 1000;
                        sformat = __mc_get_gst_input_format(mimetype, core->is_hw);
                        is_format_change |= ((input_port_def->info.video.bitrate != bitrate) && (bitrate != 0));
                        is_format_change |= g_strcmp0(input_port_def->info.video.format, sformat);
@@ -1142,7 +1141,6 @@ gboolean _mc_update_packet_info(mc_gst_core_t *core, media_format_h format)
                }
 
                if (core->encoder) {
-                       bitrate *= 1000;
                        is_format_change |= ((input_port_def->info.audio.bitrate != bitrate) && (bitrate != 0));
                        if (is_format_change) {
                                LOGD("Bitrate changed : %d -> %d", input_port_def->info.audio.bitrate, bitrate);
@@ -3741,16 +3739,11 @@ mc_ret_e mc_gst_get_packet_pool(mc_handle_t *mc_handle, media_packet_pool_h *pac
                media_format_set_video_mime(fmt_handle, mime_format);
                media_format_set_video_width(fmt_handle, mc_handle->info.video.width);
                media_format_set_video_height(fmt_handle, mc_handle->info.video.height);
-
-               if (core->encoder)
-                       media_format_set_video_avg_bps(fmt_handle, mc_handle->info.video.bitrate);
        } else {
-                       media_format_set_audio_mime(fmt_handle, mime_format);
-                       media_format_set_audio_channel(fmt_handle, mc_handle->info.audio.channel);
-                       media_format_set_audio_samplerate(fmt_handle, mc_handle->info.audio.samplerate);
-                       media_format_set_audio_bit(fmt_handle, mc_handle->info.audio.bit_depth);
-               if (core->encoder)
-                       media_format_set_audio_avg_bps(fmt_handle, mc_handle->info.audio.bitrate);
+               media_format_set_audio_mime(fmt_handle, mime_format);
+               media_format_set_audio_channel(fmt_handle, mc_handle->info.audio.channel);
+               media_format_set_audio_samplerate(fmt_handle, mc_handle->info.audio.samplerate);
+               media_format_set_audio_bit(fmt_handle, mc_handle->info.audio.bit_depth);
        }
 
        ret = media_packet_pool_set_media_format(pool, fmt_handle);