From e3cc12769288a4cdd4ba06c501451ebfec942ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 7 Aug 2009 06:56:54 +0200 Subject: gme: Use gme for tags and duration parsing --- ext/gme/Makefile.am | 4 +- ext/gme/gstgme.c | 149 +++++++--------------- ext/gme/gstgme.h | 3 +- ext/gme/tag.c | 353 ---------------------------------------------------- ext/gme/tag.h | 37 ------ 5 files changed, 45 insertions(+), 501 deletions(-) delete mode 100644 ext/gme/tag.c delete mode 100644 ext/gme/tag.h (limited to 'ext/gme') diff --git a/ext/gme/Makefile.am b/ext/gme/Makefile.am index c2bdbfea..c84d340e 100644 --- a/ext/gme/Makefile.am +++ b/ext/gme/Makefile.am @@ -1,10 +1,10 @@ plugin_LTLIBRARIES = libgstgme.la -libgstgme_la_SOURCES = gstgme.c tag.c +libgstgme_la_SOURCES = gstgme.c libgstgme_la_CFLAGS = $(GST_CFLAGS) $(GME_CFLAGS) libgstgme_la_LIBADD = $(GST_LIBS) $(GME_LIBS) libgstgme_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstgme_la_LIBTOOLFLAGS = --tag=disable-static -noinst_HEADERS = gstgme.h tag.h +noinst_HEADERS = gstgme.h diff --git a/ext/gme/gstgme.c b/ext/gme/gstgme.c index 0315d6d0..0efb8d8a 100644 --- a/ext/gme/gstgme.c +++ b/ext/gme/gstgme.c @@ -158,8 +158,8 @@ gst_spc_dec_init (GstSpcDec * spc, GstSpcDecClass * klass) spc->buf = NULL; spc->player = NULL; + spc->total_duration = GST_CLOCK_TIME_NONE; spc->initialized = FALSE; - spc_tag_clear (&spc->tag_info); } static void @@ -171,8 +171,6 @@ gst_spc_dec_dispose (GObject * object) gst_buffer_unref (spc->buf); spc->buf = NULL; } - - spc_tag_free (&spc->tag_info); } static GstFlowReturn @@ -223,38 +221,6 @@ gst_spc_dec_sink_event (GstPad * pad, GstEvent * event) return result; } -static gint64 -gst_spc_duration (GstSpcDec * spc) -{ - gint64 total_ticks = - spc->tag_info.time_intro + - spc->tag_info.time_loop * spc->tag_info.loop_count + - spc->tag_info.time_end; - if (total_ticks) { - return (gint64) gst_util_uint64_scale (total_ticks, GST_SECOND, 64000); - } else if (spc->tag_info.time_seconds) { - gint64 time = (gint64) spc->tag_info.time_seconds * GST_SECOND; - - return time; - } else { - return (gint64) (3 * 60) * GST_SECOND; - } -} - -static gint64 -gst_spc_fadeout (GstSpcDec * spc) -{ - if (spc->tag_info.time_fade) { - return (gint64) gst_util_uint64_scale ((guint64) spc->tag_info.time_fade, - GST_SECOND, 64000); - } else if (spc->tag_info.time_fade_milliseconds) { - return (gint64) (spc->tag_info.time_fade_milliseconds * GST_MSECOND); - } else { - return 10 * GST_SECOND; - } -} - - static gboolean gst_spc_dec_src_event (GstPad * pad, GstEvent * event) { @@ -293,7 +259,10 @@ gst_spc_dec_src_event (GstPad * pad, GstEvent * event) guint64 cur = gme_tell (spc->player) * GST_MSECOND; guint64 dest = (guint64) start; - dest = CLAMP (dest, 0, gst_spc_duration (spc) + gst_spc_fadeout (spc)); + if (spc->total_duration != GST_CLOCK_TIME_NONE) + dest = CLAMP (dest, 0, spc->total_duration); + else + dest = MAX (0, dest); if (dest == cur) break; @@ -317,8 +286,9 @@ gst_spc_dec_src_event (GstPad * pad, GstEvent * event) gst_pad_push_event (spc->srcpad, gst_event_new_flush_stop ()); } - if (stop == GST_CLOCK_TIME_NONE) - stop = (guint64) (gst_spc_duration (spc) + gst_spc_fadeout (spc)); + if (stop == GST_CLOCK_TIME_NONE + && spc->total_duration != GST_CLOCK_TIME_NONE) + stop = spc->total_duration; gst_pad_push_event (spc->srcpad, gst_event_new_new_segment (FALSE, rate, GST_FORMAT_TIME, dest, stop, dest)); @@ -356,12 +326,12 @@ gst_spc_dec_src_query (GstPad * pad, GstQuery * query) GstFormat format; gst_query_parse_duration (query, &format, NULL); - if (!spc->initialized || format != GST_FORMAT_TIME) { + if (!spc->initialized || format != GST_FORMAT_TIME + || spc->total_duration == GST_CLOCK_TIME_NONE) { result = FALSE; break; } - gst_query_set_duration (query, GST_FORMAT_TIME, - gst_spc_duration (spc) + gst_spc_fadeout (spc)); + gst_query_set_duration (query, GST_FORMAT_TIME, spc->total_duration); break; } case GST_QUERY_POSITION: @@ -395,7 +365,6 @@ gst_spc_play (GstPad * pad) GstBuffer *out; gboolean seeking = spc->seeking; gme_err_t gme_err = NULL; - gint64 duration, fade, end, position; const int NUM_SAMPLES = 1600; /* 4 bytes (stereo 16-bit) per sample */ if (!seeking) { @@ -421,24 +390,6 @@ gst_spc_play (GstPad * pad) gst_buffer_set_caps (out, GST_PAD_CAPS (pad)); } - duration = gst_spc_duration (spc); - fade = gst_spc_fadeout (spc); - end = duration + fade; - position = gme_tell (spc->player) * GST_MSECOND; - - if (position >= duration) { - gint16 *data = (gint16 *) GST_BUFFER_DATA (out); - guint32 size = GST_BUFFER_SIZE (out) / sizeof (gint16); - unsigned int i; - - gint64 num = (fade - (position - duration)); - - for (i = 0; i < size; i++) { - /* Apply a parabolic volume envelope */ - data[i] = (gint16) (data[i] * num / fade * num / fade); - } - } - if ((flow_return = gst_pad_push (spc->srcpad, out)) != GST_FLOW_OK) { GST_DEBUG_OBJECT (spc, "pausing task, reason %s", gst_flow_get_name (flow_return)); @@ -450,7 +401,7 @@ gst_spc_play (GstPad * pad) } } - if (position >= end) { + if (gme_track_ended (spc->player)) { gst_pad_pause_task (pad); gst_pad_push_event (pad, gst_event_new_eos ()); } @@ -463,7 +414,7 @@ gst_spc_play (GstPad * pad) static gboolean spc_setup (GstSpcDec * spc) { - spc_tag_info *info; + gme_info_t *info; gme_err_t gme_err = NULL; GstTagList *taglist; guint64 total_duration; @@ -472,77 +423,60 @@ spc_setup (GstSpcDec * spc) return FALSE; } - info = &(spc->tag_info); + gme_err = + gme_open_data (GST_BUFFER_DATA (spc->buf), GST_BUFFER_SIZE (spc->buf), + &spc->player, 32000); + if (gme_err || !spc->player) { + if (spc->player) { + gme_delete (spc->player); + spc->player = NULL; + } + + GST_ELEMENT_ERROR (spc, STREAM, DEMUX, (NULL), (gme_err)); + + return FALSE; + } - spc_tag_get_info (GST_BUFFER_DATA (spc->buf), GST_BUFFER_SIZE (spc->buf), - info); + gme_err = gme_track_info (spc->player, &info, 0); taglist = gst_tag_list_new (); - if (info->title) + if (info->song) gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_TITLE, - info->title, NULL); - if (info->artist) + info->song, NULL); + if (info->author) gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_ARTIST, - info->artist, NULL); + info->author, NULL); /* Prefer the name of the official soundtrack over the name of the game (since this is * how track numbers are derived) */ - if (info->album) - gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_ALBUM, - info->album, NULL); - else if (info->game) + if (info->game) gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_ALBUM, info->game, NULL); - if (info->year) { - GDate *date = g_date_new_dmy (1, 1, info->year); - gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_DATE, date, NULL); - g_date_free (date); - } - if (info->track) { - gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_TRACK_NUMBER, - info->track, NULL); - } if (info->comment) gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_COMMENT, info->comment, NULL); - if (info->disc) - gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, - GST_TAG_ALBUM_VOLUME_NUMBER, info->disc, NULL); - if (info->publisher) - gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_ORGANIZATION, - info->publisher, NULL); if (info->dumper) gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_CONTACT, info->dumper, NULL); - if (info->emulator) + if (info->copyright) + gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_COPYRIGHT, + info->copyright, NULL); + if (info->system) gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, GST_TAG_ENCODER, - info->emulator == EMU_ZSNES ? "ZSNES" : "Snes9x", NULL); + info->system, NULL); - total_duration = (guint64) (gst_spc_duration (spc) + gst_spc_fadeout (spc)); + spc->total_duration = total_duration = + gst_util_uint64_scale_int (info->play_length, GST_MSECOND, 1); gst_tag_list_add (taglist, GST_TAG_MERGE_REPLACE, - GST_TAG_DURATION, total_duration, - GST_TAG_GENRE, "Game", GST_TAG_CODEC, "SPC700", NULL); + GST_TAG_DURATION, total_duration, NULL); gst_element_found_tags_for_pad (GST_ELEMENT (spc), spc->srcpad, taglist); - /* spc_tag_info_free(&info); */ + g_free (info); - gme_err = - gme_open_data (GST_BUFFER_DATA (spc->buf), GST_BUFFER_SIZE (spc->buf), - &spc->player, 32000); - if (gme_err || !spc->player) { - if (spc->player) { - gme_delete (spc->player); - spc->player = NULL; - } - - GST_ELEMENT_ERROR (spc, STREAM, DEMUX, (NULL), (gme_err)); - - return FALSE; - } #ifdef HAVE_LIBGME_ACCURACY /* TODO: Is it worth it to make this optional? */ gme_enable_accuracy (spc->player, 1); @@ -575,6 +509,7 @@ gst_spc_dec_change_state (GstElement * element, GstStateChange transition) switch (transition) { case GST_STATE_CHANGE_READY_TO_PAUSED: + dec->total_duration = GST_CLOCK_TIME_NONE; break; default: break; diff --git a/ext/gme/gstgme.h b/ext/gme/gstgme.h index 3d7e4899..b4ab17a5 100644 --- a/ext/gme/gstgme.h +++ b/ext/gme/gstgme.h @@ -24,7 +24,6 @@ #include #include -#include "tag.h" G_BEGIN_DECLS @@ -55,7 +54,7 @@ struct _GstSpcDec gboolean seeking; int seekpoint; - spc_tag_info tag_info; + GstClockTime total_duration; }; struct _GstSpcDecClass diff --git a/ext/gme/tag.c b/ext/gme/tag.c deleted file mode 100644 index 41ce812f..00000000 --- a/ext/gme/tag.c +++ /dev/null @@ -1,353 +0,0 @@ -/* Copyright (C) 2007 Brian Koropoff - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include -#include -#include -#include - -#include -#include -#include - - -#define EXTENDED_OFFSET 0x10200 -#define EXTENDED_MAGIC ((guint32) ('x' << 0 | 'i' << 8 | 'd' << 16 | '6' << 24)) - -#define TYPE_LENGTH 0x0 -#define TYPE_STRING 0x1 -#define TYPE_INTEGER 0x4 - -#define TAG_TITLE 0x01 -#define TAG_GAME 0x02 -#define TAG_ARTIST 0x03 -#define TAG_DUMPER 0x04 -#define TAG_DUMP_DATE 0x05 -#define TAG_EMULATOR 0x06 -#define TAG_COMMENT 0x07 -#define TAG_ALBUM 0x10 -#define TAG_DISC 0x11 -#define TAG_TRACK 0x12 -#define TAG_PUBLISHER 0x13 -#define TAG_YEAR 0x14 -#define TAG_INTRO 0x30 -#define TAG_LOOP 0x31 -#define TAG_END 0x32 -#define TAG_FADE 0x33 -#define TAG_MUTED 0x34 -#define TAG_COUNT 0x35 -#define TAG_AMP 0x36 - -#define READ_INT8(data, offset) (data[offset]) -#define READ_INT16(data, offset) ((data[offset] << 0) + (data[offset+1] << 8)) -#define READ_INT24(data, offset) ((data[offset] << 0) + (data[offset+1] << 8) + (data[offset+2] << 16)) -#define READ_INT32(data, offset) ((data[offset] << 0) + (data[offset+1] << 8) + (data[offset+2] << 16) + (data[offset+3] << 24)) - -static inline gboolean -spc_tag_is_extended (guchar * data, guint length) -{ - // Extended tags come at the end of the file (at a known offset) - // and start with "xid6" - return (length > EXTENDED_OFFSET + 4 - && READ_INT32 (data, EXTENDED_OFFSET) == EXTENDED_MAGIC); -} - -static inline gboolean -spc_tag_is_text_format (guchar * data, guint length) -{ - // Because the id666 format is brain dead, there's - // no definite way to decide if it is in text - // format. This function implements a set of - // heuristics to make a best-effort guess. - - // If the date field contains separators, it is probably text - if (data[0xA0] == '/' || data[0xA0] == '.') - return TRUE; - // If the first byte of the date field is small (but not 0, - // which could indicate an empty string), it's probably binary - if (data[0x9E] >= 1 && data[0x9E] <= 31) - return FALSE; - - // If all previous tests turned up nothing, assume it's text - return TRUE; -} - -static inline gboolean -spc_tag_is_present (guchar * data, guint length) -{ - return data[0x23] == 26; -} - -static inline GDate * -spc_tag_unpack_date (guint32 packed) -{ - guint dump_year = packed / 10000; - guint dump_month = (packed % 10000) / 100; - guint dump_day = packed % 100; - - if (dump_month == 0) - dump_month = 1; - if (dump_day == 0) - dump_day = 1; - - if (dump_year != 0) - return g_date_new_dmy (dump_day, dump_month, dump_year); - else - return NULL; -} - -void -spc_tag_clear (spc_tag_info * info) -{ - info->title = info->game = info->publisher = info->artist = info->album = - info->comment = info->dumper = NULL; - info->dump_date = NULL; - info->time_seconds = 0; - info->time_fade_milliseconds = 0; - info->time_intro = 0; - info->time_end = 0; - info->time_loop = 0; - info->time_fade = 0; - info->loop_count = 0; - info->muted = 0; - info->disc = 0; - info->amplification = 0; -} - -void -spc_tag_get_info (guchar * data, guint length, spc_tag_info * info) -{ - spc_tag_clear (info); - - if (spc_tag_is_present (data, length)) { - gboolean text_format = spc_tag_is_text_format (data, length); - - info->title = g_new0 (gchar, 0x21); - info->game = g_new0 (gchar, 0x21); - info->artist = g_new0 (gchar, 0x21); - info->dumper = g_new0 (gchar, 0x10); - info->comment = g_new0 (gchar, 0x32); - - strncpy (info->title, (gchar *) & data[0x2E], 32); - strncpy (info->artist, (gchar *) & data[(text_format ? 0xB1 : 0xB0)], 32); - strncpy (info->game, (gchar *) & data[0x4E], 32); - strncpy (info->dumper, (gchar *) & data[0x6E], 16); - strncpy (info->comment, (gchar *) & data[0x7E], 32); - - if (text_format) { - gchar time[4]; - gchar fade[6]; - guint dump_year, dump_month, dump_day; - - strncpy (time, (gchar *) data + 0xA9, 3); - strncpy (fade, (gchar *) data + 0xAC, 5); - - time[3] = fade[5] = 0; - - info->time_seconds = atoi (time); - info->time_fade_milliseconds = atoi (fade); - - dump_year = (guint) atoi ((gchar *) data + 0x9E); - dump_month = (guint) atoi ((gchar *) data + 0x9E + 3); - dump_day = (guint) atoi ((gchar *) data + 0x9E + 3 + 3); - - if (dump_month == 0) - dump_month = 1; - if (dump_day == 0) - dump_day = 1; - if (dump_year != 0) - info->dump_date = g_date_new_dmy (dump_day, dump_month, dump_year); - - info->muted = READ_INT8 (data, 0xD1); - info->emulator = READ_INT8 (data, 0xD2); - } else { - info->time_seconds = READ_INT24 (data, 0xA9); - info->time_fade_milliseconds = READ_INT32 (data, 0xAC); - info->dump_date = spc_tag_unpack_date (READ_INT32 (data, 0x9E)); - info->muted = READ_INT8 (data, 0xD0); - info->emulator = READ_INT8 (data, 0xD1); - } - } - - if (spc_tag_is_extended (data, length)) { - guchar *chunk = data + EXTENDED_OFFSET + 8; - guint32 chunk_size = *((guint32 *) (data + EXTENDED_OFFSET + 4)); - - guchar *subchunk, *subchunk_next; - - for (subchunk = chunk; subchunk < chunk + chunk_size; - subchunk = subchunk_next) { - guint8 tag = READ_INT8 (subchunk, 0); - guint8 type = READ_INT8 (subchunk, 1); - guint16 length = READ_INT16 (subchunk, 2); - guchar *value = subchunk + 4; - - switch (type) { - case TYPE_LENGTH: - { - switch (tag) { - case TAG_TRACK: - info->track = READ_INT8 (subchunk, 2 + 1); - break; - case TAG_YEAR: - info->year = READ_INT16 (subchunk, 2); - break; - case TAG_COUNT: - info->loop_count = READ_INT8 (subchunk, 2); - break; - case TAG_EMULATOR: - info->emulator = READ_INT8 (subchunk, 2); - break; - case TAG_DISC: - info->disc = READ_INT8 (subchunk, 2); - break; - case TAG_MUTED: - info->muted = READ_INT8 (subchunk, 2); - break; - default: - break; - } - - subchunk_next = subchunk + 4; - break; - } - case TYPE_STRING: - { - gchar *dest; - - if (length <= 1) - dest = NULL; - else - switch (tag) { - case TAG_TITLE: - dest = info->title = g_renew (gchar, info->title, length); - break; - case TAG_GAME: - dest = info->game = g_renew (gchar, info->game, length); - break; - case TAG_ARTIST: - dest = info->artist = g_renew (gchar, info->artist, length); - break; - case TAG_ALBUM: - dest = info->album = g_renew (gchar, info->album, length); - break; - case TAG_DUMPER: - dest = info->dumper = g_renew (gchar, info->dumper, length); - break; - case TAG_COMMENT: - dest = info->comment = g_renew (gchar, info->comment, length); - break; - case TAG_PUBLISHER: - dest = info->publisher = - g_renew (gchar, info->publisher, length); - break; - default: - dest = NULL; - break; - } - - if (dest) - strncpy (dest, (gchar *) value, length); - - subchunk_next = value + length; - break; - } - case TYPE_INTEGER: - { - switch (tag) { - case TAG_INTRO: - info->time_intro = READ_INT32 (value, 0); - break; - case TAG_END: - info->time_end = READ_INT32 (value, 0); - break; - case TAG_FADE: - info->time_fade = READ_INT32 (value, 0); - break; - case TAG_LOOP: - info->time_loop = READ_INT32 (value, 0); - break; - case TAG_DUMP_DATE: - info->dump_date = spc_tag_unpack_date (READ_INT32 (value, 0)); - break; - case TAG_AMP: - info->amplification = READ_INT32 (value, 0); - break; - default: - break; - } - subchunk_next = value + length; - break; - } - default: - subchunk_next = value + length; - break; - } - } - } - - if (info->title && !*info->title) { - g_free (info->title); - info->title = NULL; - } - if (info->game && !*info->game) { - g_free (info->game); - info->game = NULL; - } - if (info->artist && !*info->artist) { - g_free (info->artist); - info->artist = NULL; - } - if (info->album && !*info->album) { - g_free (info->album); - info->album = NULL; - } - if (info->publisher && !*info->publisher) { - g_free (info->publisher); - info->publisher = NULL; - } - if (info->comment && !*info->comment) { - g_free (info->comment); - info->comment = NULL; - } - if (info->dumper && !*info->dumper) { - g_free (info->dumper); - info->dumper = NULL; - } -} - -void -spc_tag_free (spc_tag_info * info) -{ - if (info->title) - g_free (info->title); - if (info->game) - g_free (info->game); - if (info->artist) - g_free (info->artist); - if (info->album) - g_free (info->album); - if (info->publisher) - g_free (info->publisher); - if (info->comment) - g_free (info->comment); - if (info->dumper) - g_free (info->dumper); - if (info->dump_date) - g_date_free (info->dump_date); -} diff --git a/ext/gme/tag.h b/ext/gme/tag.h deleted file mode 100644 index 5b795893..00000000 --- a/ext/gme/tag.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright (C) 2007 Brian Koropoff - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include -#include - -typedef struct -{ - gchar *title, *game, *artist, *album, *publisher; - gchar *dumper, *comment; - enum { EMU_SNES9X = 2, EMU_ZSNES = 1, EMU_UNKNOWN = 0 } emulator; - guint8 track, disc, muted, loop_count; - guint16 year; - guint32 time_seconds, time_fade_milliseconds; - guint32 time_intro, time_loop, time_end, time_fade; - guint32 amplification; - GDate *dump_date; -} spc_tag_info; - -void spc_tag_clear(spc_tag_info* info); -void spc_tag_get_info(guchar* data, guint length, spc_tag_info* info); -void spc_tag_free(spc_tag_info* info); -- cgit v1.2.1