Update _mediacodec_foreach_supported_codec function

- Remove unnecessary callback with invalid argument
- Remove improper error log

[Version] 0.6.2
[Profile] Common
[Issue Type] Update

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

diff --git a/packaging/capi-media-codec.spec b/packaging/capi-media-codec.spec
index 455600a..f540901 100755 (executable)
--- 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:    0.6.1
+Version:    0.6.2
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_codec_port.c b/src/media_codec_port.c
index 804a7cb..d78a1d4 100644 (file)
--- a/src/media_codec_port.c
+++ b/src/media_codec_port.c
@@ -800,7 +800,6 @@ int mc_set_supported_codec_cb(MMHandleType mediacodec, mediacodec_supported_code
 
 int _mediacodec_foreach_supported_codec(mediacodec_supported_codec_cb callback, void *user_data)
 {
-       int ret = MEDIACODEC_NONE;
        int i;
        int index;
 
@@ -814,19 +813,16 @@ int _mediacodec_foreach_supported_codec(mediacodec_supported_codec_cb callback,
        for (i = 0; i < CODEC_NR_ITEMS; i++) {
                if (codec[i]) {
                        index = (int)simple_to_codec_type_enumeration(i);
-                       if (!callback(index, user_data))
-                               goto CALLBACK_ERROR;
+                       if (!callback(index, user_data)) {
+                               LOGW("stop foreach callback");
+                               break;
+                       }
                }
        }
 
-       if (!callback(-1, user_data)) {
-               ret = MEDIACODEC_ERROR_INTERNAL;
-               goto CALLBACK_ERROR;
-       }
+       LOGD("done");
 
-CALLBACK_ERROR:
-       LOGD("foreach callback returned error");
-       return ret;
+       return MEDIACODEC_ERROR_NONE;
 }
 
 int mc_get_packet_pool(MMHandleType mediacodec, media_packet_pool_h *pool)

diff --git a/test/media_codec_test.c b/test/media_codec_test.c
index dc46195..34a9945 100644 (file)
--- a/test/media_codec_test.c
+++ b/test/media_codec_test.c
@@ -1405,12 +1405,6 @@ void _mediacodec_prepare(App *app, gboolean frame_all)
                        g_print("mediacodec_configure failed\n");
                break;
        case VIDEO_ENC:
-               media_format_set_video_mime(fmt, app->mime);
-               media_format_set_video_width(fmt, app->width);
-               media_format_set_video_height(fmt, app->height);
-               media_format_set_video_avg_bps(fmt, app->target_bits);
-               media_format_set_video_frame_rate(fmt, app->fps);
-
                media_format_create(&codec_format);
                media_format_set_video_mime(codec_format, codec_mime);
                media_format_set_video_width(codec_format, app->width);
@@ -1434,11 +1428,6 @@ void _mediacodec_prepare(App *app, gboolean frame_all)
                        g_print("mediacodec_configure failed\n");
                break;
        case AUDIO_ENC:
-               media_format_set_audio_mime(fmt, app->mime);
-               media_format_set_audio_channel(fmt, app->channel);
-               media_format_set_audio_samplerate(fmt, app->samplerate);
-               media_format_set_audio_bit(fmt, app->bit);
-
                media_format_create(&codec_format);
                media_format_set_audio_mime(codec_format, codec_mime);
                media_format_set_audio_channel(codec_format, app->channel);