diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-02 10:31:24 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-11-02 10:31:24 +0100 |
| commit | 769a9791a483e9c5e79fab8ecd5c1d148fc36567 (patch) | |
| tree | 935673ac46bddcb0057daabdae692a8846061499 /gst/fieldanalysis/gstfieldanalysis.c | |
| parent | b39f4a80f72465bb2eb2498f026fa1300d764332 (diff) | |
| parent | d4105d4b56b0b07d8994abf92db620ba1f533ab0 (diff) | |
| download | gstreamer-plugins-bad-769a9791a483e9c5e79fab8ecd5c1d148fc36567.tar.gz | |
Merge branch 'master' into 0.11
Diffstat (limited to 'gst/fieldanalysis/gstfieldanalysis.c')
| -rw-r--r-- | gst/fieldanalysis/gstfieldanalysis.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/gst/fieldanalysis/gstfieldanalysis.c b/gst/fieldanalysis/gstfieldanalysis.c index 21b2e0d6c..bc6e4c561 100644 --- a/gst/fieldanalysis/gstfieldanalysis.c +++ b/gst/fieldanalysis/gstfieldanalysis.c @@ -313,9 +313,8 @@ static guint64 block_score_for_row_5_tap (GstFieldAnalysis * filter, static gfloat opposite_parity_windowed_comb (GstFieldAnalysis * filter, FieldAnalysisFields * fields); - static void -gst_field_analysis_reset (GstFieldAnalysis * filter) +gst_field_analysis_empty_queue (GstFieldAnalysis * filter) { if (filter->frames) { guint length = g_queue_get_length (filter->frames); @@ -327,6 +326,12 @@ gst_field_analysis_reset (GstFieldAnalysis * filter) length--; } } +} + +static void +gst_field_analysis_reset (GstFieldAnalysis * filter) +{ + gst_field_analysis_empty_queue (filter); GST_DEBUG_OBJECT (filter, "Resetting context"); memset (filter->results, 0, 2 * sizeof (FieldAnalysis)); filter->is_telecine = FALSE; @@ -1711,7 +1716,7 @@ gst_field_analysis_chain (GstPad * pad, GstBuffer * buf) } } - gst_field_analysis_reset (filter); + gst_field_analysis_empty_queue (filter); if (ret != GST_FLOW_OK) { GST_DEBUG_OBJECT (filter, |