From f35238794c124765f3a732c4df223296f5c9804f Mon Sep 17 00:00:00 2001
From: Vincent Penquerc'h <vincent.penquerch@collabora.co.uk>
Date: Fri, 17 Mar 2017 14:10:40 +0000
Subject: [PATCH] flacparse: fix playback if sample number does not start at 0

This reverts commit 29b807685d3c962bbe8afe351c5dca97d59eb5e0, while
fixing the original breaking tests/check/pipelines/flacdec.
---
 gst/audioparsers/gstflacparse.c | 19 ++++++++++++++-----
 gst/audioparsers/gstflacparse.h |  1 +
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/gst/audioparsers/gstflacparse.c b/gst/audioparsers/gstflacparse.c
index 819edde..a222429 100644
--- a/gst/audioparsers/gstflacparse.c
+++ b/gst/audioparsers/gstflacparse.c
@@ -801,7 +801,7 @@ gst_flac_parse_handle_frame (GstBaseParse * parse,
     framesize = map.size;
     goto cleanup;
   } else if ((GST_READ_UINT16_BE (map.data) & 0xfffe) == 0xfff8) {
-    gboolean ret;
+    gboolean ret, is_first = !flacparse->strategy_checked;
     guint next;
 
     flacparse->offset = GST_BUFFER_OFFSET (buffer);
@@ -811,9 +811,15 @@ gst_flac_parse_handle_frame (GstBaseParse * parse,
     GST_DEBUG_OBJECT (flacparse, "Found sync code");
     ret = gst_flac_parse_frame_is_valid (flacparse, map.data, map.size, &next);
     if (ret) {
+      if (is_first) {
+        GST_INFO_OBJECT (flacparse, "First sample number is %" G_GUINT64_FORMAT,
+            flacparse->sample_number);
+        flacparse->first_sample_number = flacparse->sample_number;
+      }
       framesize = next;
       goto cleanup;
     }
+
     /* If we're at EOS and the frame was not valid, drop it! */
     if (G_UNLIKELY (GST_BASE_PARSE_DRAINING (flacparse))) {
       GST_WARNING_OBJECT (flacparse, "EOS");
@@ -1543,6 +1549,7 @@ gst_flac_parse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame,
   GstBuffer *buffer = frame->buffer, *sbuffer;
   GstMapInfo map;
   GstFlowReturn res = GST_FLOW_ERROR;
+  guint64 relative_sample_number;
 
   gst_buffer_map (buffer, &map, GST_MAP_READ);
 
@@ -1650,19 +1657,21 @@ gst_flac_parse_parse_frame (GstBaseParse * parse, GstBaseParseFrame * frame,
     }
 
     /* also cater for oggmux metadata */
+    relative_sample_number =
+        flacparse->sample_number - flacparse->first_sample_number;
     if (flacparse->blocking_strategy == 0) {
       GST_BUFFER_PTS (buffer) =
-          gst_util_uint64_scale (flacparse->sample_number,
+          gst_util_uint64_scale (relative_sample_number,
           flacparse->block_size * GST_SECOND, flacparse->samplerate);
       GST_BUFFER_OFFSET_END (buffer) =
-          flacparse->sample_number * flacparse->block_size +
+          relative_sample_number * flacparse->block_size +
           flacparse->block_size;
     } else {
       GST_BUFFER_PTS (buffer) =
-          gst_util_uint64_scale (flacparse->sample_number, GST_SECOND,
+          gst_util_uint64_scale (relative_sample_number, GST_SECOND,
           flacparse->samplerate);
       GST_BUFFER_OFFSET_END (buffer) =
-          flacparse->sample_number + flacparse->block_size;
+          relative_sample_number + flacparse->block_size;
     }
 
     GST_BUFFER_DTS (buffer) = GST_BUFFER_PTS (buffer);
diff --git a/gst/audioparsers/gstflacparse.h b/gst/audioparsers/gstflacparse.h
index 2ce282e..f4f36b9 100644
--- a/gst/audioparsers/gstflacparse.h
+++ b/gst/audioparsers/gstflacparse.h
@@ -74,6 +74,7 @@ struct _GstFlacParse {
   guint8 blocking_strategy;
   guint16 block_size;
   guint64 sample_number;
+  guint64 first_sample_number;
   gboolean strategy_checked;
 
   gboolean sent_codec_tag;
-- 
2.7.4