fix tv profile build error

Change-Id: I7bb26c503a29df3eddfd03c77a8d5733b5a39068

diff --git a/gst/mpegtsdemux/mpegtspacketizer.c b/gst/mpegtsdemux/mpegtspacketizer.c
index 0c7d60a..e5dc6af 100644 (file)
--- a/gst/mpegtsdemux/mpegtspacketizer.c
+++ b/gst/mpegtsdemux/mpegtspacketizer.c
@@ -2288,6 +2288,9 @@ mpegts_packetizer_pts_to_ts (MpegTSPacketizer2 * packetizer,
 {
   GstClockTime res = GST_CLOCK_TIME_NONE;
   MpegTSPCR *pcrtable;
+#ifdef TIZEN_FEATURE_TSDEMUX_MODIFICATION
+  GstClockTime tmp;
+#endif
 
   PACKETIZER_GROUP_LOCK (packetizer);
   pcrtable = get_pcr_table (packetizer, pcr_pid);
@@ -2328,33 +2331,33 @@ mpegts_packetizer_pts_to_ts (MpegTSPacketizer2 * packetizer,
        * We are currently ignoring the check for handling the erronous server PCR case.
      */
 #ifdef TIZEN_FEATURE_TSDEMUX_MODIFICATION
-     GstClockTime tmp = pcrtable->base_time + pcrtable->skew;
-     if (packetizer->is_live_stream)
-     {
-       if (G_UNLIKELY (ABSDIFF (res, pcrtable->last_pcrtime) > 15 * GST_SECOND))
-       {
-               GST_WARNING ("Live Stream : Server sending erronous PCR values : Recalculating!!");
-       }
-       if (tmp + res > pcrtable->base_pcrtime)
-       {
-               res += tmp - pcrtable->base_pcrtime;
-       }
-       else
-               res = GST_CLOCK_TIME_NONE;
-     }
-     else
-     {
-       if (G_UNLIKELY (ABSDIFF (res, pcrtable->last_pcrtime) > 15 * GST_SECOND))
-       {
-               GST_WARNING ("VOD Stream : Server sending erronous PCR values : Maintaining old ts value !!!");
-       }
-       else if (tmp + res > pcrtable->base_pcrtime)
-       {
-               res += tmp - pcrtable->base_pcrtime;
-       }
-       else
-               res = GST_CLOCK_TIME_NONE;
-     }
+    tmp = pcrtable->base_time + pcrtable->skew;
+    if (packetizer->is_live_stream)
+    {
+      if (G_UNLIKELY (ABSDIFF (res, pcrtable->last_pcrtime) > 15 * GST_SECOND))
+      {
+        GST_WARNING ("Live Stream : Server sending erronous PCR values : Recalculating!!");
+      }
+      if (tmp + res > pcrtable->base_pcrtime)
+      {
+        res += tmp - pcrtable->base_pcrtime;
+      }
+      else
+        res = GST_CLOCK_TIME_NONE;
+    }
+    else
+    {
+      if (G_UNLIKELY (ABSDIFF (res, pcrtable->last_pcrtime) > 15 * GST_SECOND))
+      {
+        GST_WARNING ("VOD Stream : Server sending erronous PCR values : Maintaining old ts value !!!");
+      }
+      else if (tmp + res > pcrtable->base_pcrtime)
+      {
+        res += tmp - pcrtable->base_pcrtime;
+      }
+      else
+        res = GST_CLOCK_TIME_NONE;
+    }
 #else
     if (G_UNLIKELY (ABSDIFF (res, pcrtable->last_pcrtime) > 15 * GST_SECOND))
       res = GST_CLOCK_TIME_NONE;
@@ -2454,9 +2457,9 @@ mpegts_packetizer_pts_to_ts (MpegTSPacketizer2 * packetizer,
   }
 #ifdef TIZEN_FEATURE_TSDEMUX_MODIFICATION
   else if(packetizer->is_random_access){
-       if(!GST_CLOCK_TIME_IS_VALID (packetizer->ra_base_time))
-               packetizer->ra_base_time = pts;
-       res = pts - packetizer->ra_base_time;
+    if(!GST_CLOCK_TIME_IS_VALID (packetizer->ra_base_time))
+      packetizer->ra_base_time = pts;
+    res = pts - packetizer->ra_base_time;
   } else if ((packetizer->is_non_pcr_live_feed) && (GST_CLOCK_TIME_IS_VALID(pts))) {
     /*
     [prasenjit.c] For Live Youtube Channels , PCR flag does not come.
@@ -2469,8 +2472,8 @@ mpegts_packetizer_pts_to_ts (MpegTSPacketizer2 * packetizer,
       GST_DEBUG ("PCR Base Time reset to Current PTS");
       packetizer->non_pcr_base_time = pts;
     } else if ((pts - packetizer->non_pcr_base_time) < packetizer->last_live_pts) {
-      GST_DEBUG ("Current PTS Less than Previous PTS !!");
       GstClockTime delta = ABSDIFF ((pts - packetizer->non_pcr_base_time), packetizer->last_live_pts);
+      GST_DEBUG ("Current PTS Less than Previous PTS !!");
       packetizer->non_pcr_base_time = packetizer->non_pcr_base_time - delta;
     }
 

diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index c1a7745..def2234 100644 (file)
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -687,6 +687,9 @@ scan_keyframe_h264 (TSDemuxStream * stream, const guint8 * data,
       case GST_H264_NAL_SLICE_IDR:
       {
         GstH264SliceHdr slice;
+#ifdef TIZEN_FEATURE_TSDEMUX_MODIFICATION
+        GstTSDemux *demux = NULL;
+#endif
 
         if (h264infos->framedata.size)
           break;
@@ -703,7 +706,7 @@ scan_keyframe_h264 (TSDemuxStream * stream, const guint8 * data,
             frame_unit = unit;
 
 #ifdef TIZEN_FEATURE_TSDEMUX_MODIFICATION
-            GstTSDemux *demux = GST_TS_DEMUX(gst_pad_get_parent(stream->pad));
+            demux = GST_TS_DEMUX(gst_pad_get_parent(stream->pad));
             demux->video_keyframe_found = TRUE;
 #endif
           }

diff --git a/packaging/gst-plugins-bad.spec b/packaging/gst-plugins-bad.spec
index 860f7b0..2ca34c7 100644 (file)
--- a/packaging/gst-plugins-bad.spec
+++ b/packaging/gst-plugins-bad.spec
@@ -125,6 +125,7 @@ export CFLAGS+=" -Wall -g -fPIC\
        --disable-adpcmenc\
        --disable-aiff\
        --disable-asfmux\
+       --disable-audiomixer\
        --disable-compositor\
        --disable-audiovisualizers\
        --disable-bayer\
@@ -268,7 +269,7 @@ rm -rf $RPM_BUILD_ROOT
 #%{_libdir}/gstreamer-%{gst_branch}/libgstvideofiltersbad.so
 #%{_libdir}/gstreamer-%{gst_branch}/libgstyadif.so
 #%{_libdir}/gstreamer-%{gst_branch}/libgstuvch264.so
-%{_libdir}/gstreamer-%{gst_branch}/libgstaudiomixer.so
+
 
 %if %{with wayland}
 %{_libdir}/libgstwayland-%{gst_branch}.so.0*