Realigned code on new Ducati header files
authorOlivier Naudan <o-naudan@ti.com>
Mon, 29 Oct 2012 14:40:17 +0000 (10:40 -0400)
committerVincent Penquerc'h <vincent.penquerch@collabora.co.uk>
Fri, 16 Nov 2012 14:47:06 +0000 (14:47 +0000)
src/Makefile.am
src/gstducatih264dec.c
src/gstducatimpeg4dec.c
src/gstducativc1dec.c

index b5fe57965e5979b05f90419837d6cf0e10a22a92..68069a310d5ec8efa0de7fdfcab6f47365412df3 100644 (file)
@@ -39,6 +39,7 @@ libgstducati_la_SOURCES = \
 libgstducati_la_CFLAGS = \
        $(GST_CFLAGS) \
        $(LIBDCE_CFLAGS) \
+        -Wno-unused-variable \
        -DGST_USE_UNSTABLE_API
 
 libgstducati_la_LIBADD = \
index 6c049e76e6501708b6aab257158c4e6b54c02dac..05e1c94d491376ac94347b1e06325e441a064ce0 100644 (file)
@@ -123,7 +123,7 @@ gst_ducati_h264dec_allocate_params (GstDucatiVidDec * self, gint params_sz,
     IH264VDEC_Params *params = (IH264VDEC_Params *) self->params;
 
     self->params->displayDelay = IVIDDEC3_DECODE_ORDER;
-    params->maxNumRefFrames = IH264VDEC_NUM_REFFRAMES_AUTO;
+    params->dpbSizeInFrames = IH264VDEC_DPB_NUMFRAMES_AUTO;
     params->pConstantMemory = 0;
     params->presetLevelIdc = IH264VDEC_LEVEL41;
     params->errConcealmentMode = IH264VDEC_APPLY_CONCEALMENT;
@@ -382,7 +382,7 @@ gst_ducati_h264dec_set_sink_caps (GstDucatiVidDec * self, GstCaps * caps)
 
     if (gst_structure_get_int (structure, "num-ref-frames", &num_ref_frames)
         && num_ref_frames >= 0) {
-      ((IH264VDEC_Params *) self->params)->maxNumRefFrames = num_ref_frames;
+      ((IH264VDEC_Params *) self->params)->dpbSizeInFrames = num_ref_frames;
     }
     if (gst_structure_get_int (structure, "num-reorder-frames",
             &num_reorder_frames)
index 8aa52daa628ec8115b4989203b46f11ea3bd8142..212a4b88211796d6493eef41b04e99c88fb67ada 100644 (file)
@@ -91,7 +91,7 @@ gst_ducati_mpeg4dec_allocate_params (GstDucatiVidDec * self, gint params_sz,
     self->dynParams->lateAcquireArg = -1;
     params->outloopDeBlocking = FALSE;
     params->sorensonSparkStream = FALSE;
-    params->ErrorConcealmentON = FALSE;
+    params->errorConcealmentEnable = FALSE;
   }
 
   return ret;
index 13b53ffb1543cfa64b659314d4ddedd2227bb567..041b616e4e0379834df24f2e7d29885b7173357c 100644 (file)
@@ -116,7 +116,7 @@ gst_ducati_vc1dec_allocate_params (GstDucatiVidDec * self, gint params_sz,
     params->frameLayerDataPresentFlag = FALSE;
 
     /* enable concealment */
-    params->ErrorConcealmentON = 1;
+    params->errorConcealmentON = 1;
 
     /* codec wants lateAcquireArg = -1 */
     self->dynParams->lateAcquireArg = -1;