X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fport_gst%2Fmediademuxer_port_gst.c;h=09c696fa962abecc0e4c4d42fc53021ae19af8c1;hb=9a04137e41e648c1423a94fb25c302af4f0a0920;hp=32ea0da0a0fc1018d85bee8de76f492020f657ff;hpb=045eadea65e8a4e84b22d3d986bcbb4eb15f212c;p=platform%2Fcore%2Fapi%2Fmediademuxer.git diff --git a/src/port_gst/mediademuxer_port_gst.c b/src/port_gst/mediademuxer_port_gst.c index 32ea0da..09c696f 100755 --- a/src/port_gst/mediademuxer_port_gst.c +++ b/src/port_gst/mediademuxer_port_gst.c @@ -462,7 +462,7 @@ static int __gst_create_audio_only_pipeline(gpointer data, GstCaps *caps) gchar *name = NULL; gchar *type = NULL; track_info *head_track = &(gst_handle->info); - track *trck = NULL; + track *tmp_track = NULL; gst_handle->is_valid_container = true; @@ -550,22 +550,22 @@ static int __gst_create_audio_only_pipeline(gpointer data, GstCaps *caps) goto ERROR; } - trck = head_track->head; - while (trck != NULL && aud_srcpad != trck->pad) - trck = trck->next; - - if (trck != NULL) { - if (trck->caps) - gst_caps_unref(trck->caps); - trck->caps = gst_caps_copy(caps); - if (trck->caps_string) - g_free(trck->caps_string); - trck->caps_string = gst_caps_to_string(trck->caps); - MD_I("caps set to %s\n", trck->caps_string); - if (trck->name) - g_free(trck->name); + tmp_track = head_track->head; + while (tmp_track != NULL && aud_srcpad != tmp_track->pad) + tmp_track = tmp_track->next; + + if (tmp_track != NULL) { + if (tmp_track->caps) + gst_caps_unref(tmp_track->caps); + tmp_track->caps = gst_caps_copy(caps); + if (tmp_track->caps_string) + g_free(tmp_track->caps_string); + tmp_track->caps_string = gst_caps_to_string(tmp_track->caps); + MD_I("caps set to %s\n", tmp_track->caps_string); + if (tmp_track->name) + g_free(tmp_track->name); g_strlcpy(name, "audio", strlen(name)); - trck->name = name; + tmp_track->name = name; } (head_track->num_audio_track)++; @@ -1626,12 +1626,6 @@ int gst_set_error_cb(MMHandleType pHandle, MEDIADEMUXER_CHECK_NULL(pHandle); mdgst_handle_t *gst_handle = (mdgst_handle_t *) pHandle; - if (!gst_handle) { - MD_E("fail invaild param (gst_handle)\n"); - ret = MD_INVALID_ARG; - goto ERROR; - } - if (gst_handle->user_cb[_GST_EVENT_TYPE_ERROR]) { MD_E("Already set mediademuxer_error_cb\n"); ret = MD_ERROR_INVALID_ARGUMENT; @@ -1662,12 +1656,6 @@ int gst_set_eos_cb(MMHandleType pHandle, gst_eos_cb callback, void *user_data) MEDIADEMUXER_CHECK_NULL(pHandle); mdgst_handle_t *gst_handle = (mdgst_handle_t *) pHandle; - if (!gst_handle) { - MD_E("fail invaild param (gst_handle)\n"); - ret = MD_INVALID_ARG; - goto ERROR; - } - if (gst_handle->user_cb[_GST_EVENT_TYPE_EOS]) { MD_E("Already set mediademuxer_eos_cb\n"); ret = MD_ERROR_INVALID_ARGUMENT;