[SCM] libgroove/upstream: buffer pts moved from separate function to GrooveBuffer struct

[andrewrk-guest at users.alioth.debian.org]

The following commit has been merged in the upstream branch:
commit 39ddcc3cde405af2fc5acac748b26bb41cbe6709
Author: Andrew Kelley <superjoe30 at gmail.com>
Date:   Sun May 11 14:29:54 2014 -0700

    buffer pts moved from separate function to GrooveBuffer struct

diff --git a/groove/buffer.c b/groove/buffer.c
index 95fce45..8fbda63 100644
--- a/groove/buffer.c
+++ b/groove/buffer.c
@@ -38,8 +38,3 @@ void groove_buffer_unref(struct GrooveBuffer *buffer) {
         av_free(b);
     }
 }
-
-uint64_t groove_buffer_pts(struct GrooveBuffer *buffer) {
-    struct GrooveBufferPrivate *b = (struct GrooveBufferPrivate *) buffer;
-    return b->pts;
-}
diff --git a/groove/buffer.h b/groove/buffer.h
index 4d06674..41c19f1 100644
--- a/groove/buffer.h
+++ b/groove/buffer.h
@@ -24,8 +24,6 @@ struct GrooveBufferPrivate {
     // used for when is_packet is true
     // GrooveBuffer::data[0] will point to this
     uint8_t *data;
-
-    uint64_t pts;
 };
 
 #endif /* GROOVE_BUFFER_H_INCLUDED */
diff --git a/groove/encoder.c b/groove/encoder.c
index 663f2f6..e77a71f 100644
--- a/groove/encoder.c
+++ b/groove/encoder.c
@@ -254,7 +254,7 @@ static int encoder_write_packet(void *opaque, uint8_t *buf, int buf_size) {
 
     buffer->item = e->encode_head;
     buffer->pos = e->encode_pos;
-    b->pts = e->encode_pts;
+    buffer->pts = e->encode_pts;
     buffer->format = e->encode_format;
 
     b->is_packet = 1;
diff --git a/groove/groove.h b/groove/groove.h
index c9db96a..4f9c205 100644
--- a/groove/groove.h
+++ b/groove/groove.h
@@ -254,14 +254,14 @@ struct GrooveBuffer {
 
     /* total number of bytes contained in this buffer */
     int size;
+
+    /* presentation time stamp of the buffer */
+    uint64_t pts;
 };
 
 void groove_buffer_ref(struct GrooveBuffer *buffer);
 void groove_buffer_unref(struct GrooveBuffer *buffer);
 
-/* return the presentation time stamp of the buffer. */
-uint64_t groove_buffer_pts(struct GrooveBuffer *buffer);
-
 /************** GrooveSink ****************/
 
 /* use this to get access to a realtime raw audio buffer
diff --git a/groove/playlist.c b/groove/playlist.c
index 52ae7af..5ca8c2e 100644
--- a/groove/playlist.c
+++ b/groove/playlist.c
@@ -132,9 +132,9 @@ static struct GrooveBuffer * frame_to_groove_buffer(struct GroovePlaylist *playl
     buffer->format.sample_fmt = frame->format;
     buffer->format.sample_rate = frame->sample_rate;
     buffer->size = frame_size(frame);
+    buffer->pts = frame->pts;
 
     b->frame = frame;
-    b->pts = frame->pts;
 
     return buffer;
 }

-- 
libgroove packaging