update code alignment 21/34721/4 tizen_3.0.2015.q2_common tizen_3.0.m1_mobile tizen_3.0.m1_tv accepted/tizen/common/20150209.121942 accepted/tizen/mobile/20150211.014726 accepted/tizen/tv/20150210.013207 accepted/tizen/wearable/20150210.014955 submit/tizen/20150206.085612 tizen_3.0.m1_mobile_release tizen_3.0.m1_tv_release tizen_3.0.m2.a1_mobile_release tizen_3.0.m2.a1_tv_release
authorYoungHun Kim <yh8004.kim@samsung.com>
Mon, 2 Feb 2015 02:20:48 +0000 (11:20 +0900)
committerYoungHun Kim <yh8004.kim@samsung.com>
Fri, 6 Feb 2015 08:38:26 +0000 (17:38 +0900)
Change-Id: I1a60420e04c7f609003c0a53a4db8f5a4507beb0
Signed-off-by: YoungHun Kim <yh8004.kim@samsung.com>
packaging/libmm-transcode.spec
transcode/mm_transcode_pipeline.c
transcode/mm_transcode_seek.c

index b030ba1..89f7b61 100644 (file)
@@ -1,7 +1,7 @@
 Name:       libmm-transcode
 Summary:    Multimedia Framework Video Transcode Library
 Version:    0.9
-Release:    2
+Release:    3
 Group:      System/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
index ef3fb04..57144dc 100755 (executable)
@@ -703,7 +703,7 @@ _mm_encodebin_link(handle_s *handle)
                        handle->encodebin->encvideopad = gst_element_get_request_pad(handle->encodebin->encbin, "video");
                        if(handle->encodebin->encvideopad) {
                                debug_log("encvideopad: 0x%2x", handle->encodebin->encvideopad);
-                               gst_pad_link(handle->decoder_vidp->srcdecvideopad, handle->encodebin->encvideopad);
+                               gst_pad_link(handle->decoder_vidp->srcdecvideopad, handle->encodebin->encvideopad);
                        } else {
                                debug_error("error encvideopad");
                                return MM_ERROR_TRANSCODE_INTERNAL;
@@ -716,7 +716,7 @@ _mm_encodebin_link(handle_s *handle)
                        handle->encodebin->encaudiopad = gst_element_get_request_pad(handle->encodebin->encbin, "audio");
                        if(handle->encodebin->encaudiopad) {
                                debug_log("encaudiopad: 0x%2x", handle->encodebin->encaudiopad);
-                               gst_pad_link(handle->decoder_audp->srcdecaudiopad, handle->encodebin->encaudiopad);
+                               gst_pad_link(handle->decoder_audp->srcdecaudiopad, handle->encodebin->encaudiopad);
                        } else {
                                debug_error("error encaudiopad");
                                return MM_ERROR_TRANSCODE_INTERNAL;
@@ -773,7 +773,7 @@ _mm_encodebin_set_audio_property(handle_s* handle)
                        return MM_ERROR_TRANSCODE_INTERNAL;
                }
 
-               if(g_strcmp0(handle->property->aenc, AACENC) == 0) {
+               if(g_strcmp0(handle->property->aenc, AACENC) == 0) {
                        g_object_set(G_OBJECT(gst_bin_get_by_name(GST_BIN(handle->encodebin->encbin), "audio_encode")), AACCOMPLIANCE, AACCOMPLIANCELEVEL, NULL);
                }
 
index e3d343a..5f92bd8 100755 (executable)
@@ -53,12 +53,12 @@ _mm_cb_audio_output_stream_probe(GstPad *pad, GstPadProbeInfo *info, gpointer us
                        _mm_transcode_audio_capsfilter(gst_pad_get_current_caps (pad), handle); /* Need to audio caps converting when amrnbenc*/ /* Not drop buffer with 'return FALSE'*/
 
                        if(handle->param->seeking) {
-                               debug_log("[AUDIO BUFFER TIMESTAMP] ([%"G_GUINT64_FORMAT"])", start_pos_ts);
-                               GST_BUFFER_TIMESTAMP (GST_PAD_PROBE_INFO_BUFFER(info)) = start_pos_ts;
+                               debug_log("[AUDIO BUFFER TIMESTAMP] ([%"G_GUINT64_FORMAT"])", start_pos_ts);
+                               GST_BUFFER_TIMESTAMP (GST_PAD_PROBE_INFO_BUFFER(info)) = start_pos_ts;
                        }
                }
        }
-       return GST_PAD_PROBE_OK;
+    return GST_PAD_PROBE_OK;
 }
 
 GstAutoplugSelectResult
@@ -246,11 +246,11 @@ _mm_cb_video_output_stream_probe(GstPad *pad, GstPadProbeInfo *info, gpointer us
 
        if(GST_BUFFER_TIMESTAMP_IS_VALID (GST_PAD_PROBE_INFO_BUFFER(info))) {
                if(0 == handle->property->VIDFLAG++) {
-            _mm_transcode_video_capsfilter(gst_pad_get_current_caps (pad), handle); /* Not drop buffer with 'return FALSE'*/
+                       _mm_transcode_video_capsfilter(gst_pad_get_current_caps (pad), handle); /* Not drop buffer with 'return FALSE'*/
 
                        if(handle->param->seeking) {
-                debug_log("[VIDEO BUFFER TIMESTAMP] ([%"G_GUINT64_FORMAT"])", start_pos_ts);
-                GST_BUFFER_TIMESTAMP (GST_PAD_PROBE_INFO_BUFFER(info)) = start_pos_ts;
+                               debug_log("[VIDEO BUFFER TIMESTAMP] ([%"G_GUINT64_FORMAT"])", start_pos_ts);
+                               GST_BUFFER_TIMESTAMP (GST_PAD_PROBE_INFO_BUFFER(info)) = start_pos_ts;
                        }
                }
        }