From: Wim Taymans Date: Thu, 10 Nov 2011 17:32:39 +0000 (+0100) Subject: update for adapter api changes X-Git-Tag: 1.19.3~511^2~7176 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e338792ab0e1f48b391c61c647ad271587c409a6;p=platform%2Fupstream%2Fgstreamer.git update for adapter api changes --- diff --git a/ext/libvisual/visual.c b/ext/libvisual/visual.c index 3fbb720..28ee6c3 100644 --- a/ext/libvisual/visual.c +++ b/ext/libvisual/visual.c @@ -848,7 +848,7 @@ gst_visual_chain (GstPad * pad, GstBuffer * buffer) GST_DEBUG_OBJECT (visual, "allocating output buffer"); ret = gst_buffer_pool_acquire_buffer (visual->pool, &outbuf, NULL); if (ret != GST_FLOW_OK) { - gst_adapter_unmap (visual->adapter, 0); + gst_adapter_unmap (visual->adapter); goto beach; } } @@ -860,7 +860,7 @@ gst_visual_chain (GstPad * pad, GstBuffer * buffer) gst_buffer_unmap (outbuf, outdata, outsize); GST_DEBUG_OBJECT (visual, "rendered one frame"); - gst_adapter_unmap (visual->adapter, 0); + gst_adapter_unmap (visual->adapter); GST_BUFFER_TIMESTAMP (outbuf) = timestamp; GST_BUFFER_DURATION (outbuf) = visual->duration; diff --git a/ext/theora/gsttheoraenc.c b/ext/theora/gsttheoraenc.c index e31ff42..a82a848 100644 --- a/ext/theora/gsttheoraenc.c +++ b/ext/theora/gsttheoraenc.c @@ -1061,7 +1061,7 @@ theora_enc_read_multipass_cache (GstTheoraEnc * enc) bytes_consumed = th_encode_ctl (enc->encoder, TH_ENCCTL_2PASS_IN, (guint8 *) cache_data, bytes_read); - gst_adapter_unmap (enc->multipass_cache_adapter, 0); + gst_adapter_unmap (enc->multipass_cache_adapter); done = bytes_consumed <= 0; if (bytes_consumed > 0) diff --git a/gst-libs/gst/audio/gstaudioencoder.c b/gst-libs/gst/audio/gstaudioencoder.c index 25139ec..020d067 100644 --- a/gst-libs/gst/audio/gstaudioencoder.c +++ b/gst-libs/gst/audio/gstaudioencoder.c @@ -773,7 +773,7 @@ gst_audio_encoder_push_buffers (GstAudioEncoder * enc, gboolean force) if (G_LIKELY (buf)) { gst_buffer_unref (buf); - gst_adapter_unmap (priv->adapter, 0); + gst_adapter_unmap (priv->adapter); } /* no data to feed, no leftover provided, then bail out */ diff --git a/gst/gdp/gstgdpdepay.c b/gst/gdp/gstgdpdepay.c index b608977..d5cc81d 100644 --- a/gst/gdp/gstgdpdepay.c +++ b/gst/gdp/gstgdpdepay.c @@ -286,7 +286,7 @@ gst_gdp_depay_chain (GstPad * pad, GstBuffer * buffer) data = gst_adapter_map (this->adapter, this->payload_length); res = gst_dp_validate_payload (GST_DP_HEADER_LENGTH, this->header, data); - gst_adapter_unmap (this->adapter, 0); + gst_adapter_unmap (this->adapter); if (!res) goto payload_validate_error; diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c index 579faef..e6a0306 100644 --- a/gst/subparse/gstsubparse.c +++ b/gst/subparse/gstsubparse.c @@ -1421,9 +1421,10 @@ feed_textbuf (GstSubParse * self, GstBuffer * buf) if (input && consumed > 0) { self->textbuf = g_string_append (self->textbuf, input); - gst_adapter_unmap (self->adapter, consumed); + gst_adapter_unmap (self->adapter); + gst_adapter_flush (self->adapter, consumed); } else { - gst_adapter_unmap (self->adapter, 0); + gst_adapter_unmap (self->adapter); } g_free (input);