diff --git a/ChangeLog b/ChangeLog index 4d2eae47b8..71a61d995e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,72 @@ +2008-08-02 Sebastian Dröge + + * gst/matroska/ebml-read.c: (gst_ebml_read_class_init), + (gst_ebml_read_change_state), (gst_ebml_read_element_level_up), + (gst_ebml_read_peek_bytes), (gst_ebml_read_element_id), + (gst_ebml_read_element_length), (gst_ebml_peek_id), + (gst_ebml_read_get_length), (gst_ebml_read_skip), + (gst_ebml_read_buffer), (gst_ebml_read_bytes), + (gst_ebml_read_uint), (gst_ebml_read_sint), (_ext2dbl), + (gst_ebml_read_float), (gst_ebml_read_ascii), (gst_ebml_read_date), + (gst_ebml_read_master), (gst_ebml_read_binary), + (gst_ebml_read_header): + * gst/matroska/ebml-write.c: (gst_ebml_write_element_id), + (gst_ebml_write_element_size), (gst_ebml_write_uint), + (gst_ebml_write_sint), (gst_ebml_write_ascii), + (gst_ebml_write_master_start), (gst_ebml_write_master_finish), + (gst_ebml_replace_uint): + * gst/matroska/matroska-demux.c: (gst_matroska_demux_reset), + (gst_matroska_demux_read_track_encoding), + (gst_matroska_demux_read_track_encodings), + (gst_matroska_demux_add_stream), (gst_matroskademux_do_index_seek), + (gst_matroska_demux_send_event), + (gst_matroska_demux_element_send_event), + (gst_matroska_demux_handle_seek_event), + (gst_matroska_demux_handle_src_event), + (gst_matroska_demux_init_stream), + (gst_matroska_demux_parse_tracks), + (gst_matroska_demux_parse_index_cuetrack), + (gst_matroska_demux_parse_index_pointentry), + (gst_matroska_demux_parse_index), (gst_matroska_demux_parse_info), + (gst_matroska_demux_parse_metadata_id_simple_tag), + (gst_matroska_demux_parse_metadata_id_tag), + (gst_matroska_demux_parse_metadata), + (gst_matroska_demux_parse_attached_file), + (gst_matroska_demux_parse_attachments), + (gst_matroska_demux_parse_chapters), (gst_matroska_ebmlnum_uint), + (gst_matroska_ebmlnum_sint), (gst_matroska_demux_push_hdr_buf), + (gst_matroska_demux_push_flac_codec_priv_data), + (gst_matroska_demux_push_xiph_codec_priv_data), + (gst_matroska_demux_push_dvd_clut_change_event), + (gst_matroska_demux_add_mpeg_seq_header), + (gst_matroska_demux_add_wvpk_header), + (gst_matroska_demux_check_subtitle_buffer), + (gst_matroska_decode_buffer), + (gst_matroska_demux_parse_blockgroup_or_simpleblock), + (gst_matroska_demux_parse_cluster), + (gst_matroska_demux_parse_contents_seekentry), + (gst_matroska_demux_parse_contents), + (gst_matroska_demux_loop_stream_parse_id), + (gst_matroska_demux_loop_stream), (gst_matroska_demux_loop), + (gst_matroska_demux_video_caps), (gst_matroska_demux_audio_caps), + (gst_matroska_demux_subtitle_caps), + (gst_matroska_demux_change_state): + * gst/matroska/matroska-ids.c: + * gst/matroska/matroska-mux.c: (gst_matroska_mux_class_init), + (gst_matroska_mux_reset), (gst_matroska_mux_handle_sink_event), + (gst_matroska_mux_video_pad_setcaps), + (xiph3_streamheader_to_codecdata), + (vorbis_streamheader_to_codecdata), + (theora_streamheader_to_codecdata), + (gst_matroska_mux_audio_pad_setcaps), + (gst_matroska_mux_request_new_pad), (gst_matroska_mux_release_pad), + (gst_matroska_mux_track_header), (gst_matroska_mux_start), + (gst_matroska_mux_write_simple_tag), (gst_matroska_mux_finish), + (gst_matroska_mux_best_pad), (gst_matroska_mux_write_data), + (gst_matroska_mux_collected), (gst_matroska_mux_change_state): + Fix indention everywhere. A broken indent version has added newlines + after every single declaration some time ago. + 2008-08-02 Sebastian Dröge * gst/matroska/matroska-demux.c: diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c index 2220a229f6..ae673ca5ff 100644 --- a/gst/matroska/ebml-read.c +++ b/gst/matroska/ebml-read.c @@ -112,7 +112,6 @@ static void gst_ebml_read_class_init (GstEbmlReadClass * klass) { GstElementClass *gstelement_class = (GstElementClass *) klass; - GObjectClass *gobject_class = (GObjectClass *) klass; parent_class = g_type_class_peek_parent (klass); @@ -137,7 +136,6 @@ static GstStateChangeReturn gst_ebml_read_change_state (GstElement * element, GstStateChange transition) { GstStateChangeReturn ret; - GstEbmlRead *ebml = GST_EBML_READ (element); switch (transition) { @@ -183,7 +181,6 @@ static guint gst_ebml_read_element_level_up (GstEbmlRead * ebml) { guint num = 0; - guint64 pos = ebml->offset; while (ebml->level != NULL) { @@ -214,7 +211,6 @@ gst_ebml_read_peek_bytes (GstEbmlRead * ebml, guint size, GstBuffer ** p_buf, * We do it mainly to avoid pulling buffers of 1 byte all the time */ if (ebml->cached_buffer) { guint64 cache_offset = GST_BUFFER_OFFSET (ebml->cached_buffer); - guint cache_size = GST_BUFFER_SIZE (ebml->cached_buffer); if (cache_offset <= ebml->offset && @@ -313,13 +309,9 @@ static GstFlowReturn gst_ebml_read_element_id (GstEbmlRead * ebml, guint32 * id, guint * level_up) { guint8 *buf; - gint len_mask = 0x80, read = 1, n = 1; - guint32 total; - guint8 b; - GstFlowReturn ret; ret = gst_ebml_read_peek_bytes (ebml, 1, NULL, &buf); @@ -373,13 +365,9 @@ gst_ebml_read_element_length (GstEbmlRead * ebml, guint64 * length, gint * rread) { GstFlowReturn ret; - guint8 *buf; - gint len_mask = 0x80, read = 1, n = 1, num_ffs = 0; - guint64 total; - guint8 b; ret = gst_ebml_read_peek_bytes (ebml, 1, NULL, &buf); @@ -442,9 +430,7 @@ GstFlowReturn gst_ebml_peek_id (GstEbmlRead * ebml, guint * level_up, guint32 * id) { guint64 off; - guint level_up_tmp = 0; - GstFlowReturn ret; g_assert (level_up); @@ -489,7 +475,6 @@ gint64 gst_ebml_read_get_length (GstEbmlRead * ebml) { GstFormat fmt = GST_FORMAT_BYTES; - gint64 end; /* FIXME: what to do if we don't get the upstream length */ @@ -523,9 +508,7 @@ GstFlowReturn gst_ebml_read_skip (GstEbmlRead * ebml) { guint64 length; - guint32 id; - GstFlowReturn ret; ret = gst_ebml_read_element_id (ebml, &id, NULL); @@ -548,7 +531,6 @@ GstFlowReturn gst_ebml_read_buffer (GstEbmlRead * ebml, guint32 * id, GstBuffer ** buf) { guint64 length; - GstFlowReturn ret; ret = gst_ebml_read_element_id (ebml, id, NULL); @@ -579,7 +561,6 @@ gst_ebml_read_bytes (GstEbmlRead * ebml, guint32 * id, guint8 ** data, guint * size) { guint64 length; - GstFlowReturn ret; *size = 0; @@ -615,9 +596,7 @@ GstFlowReturn gst_ebml_read_uint (GstEbmlRead * ebml, guint32 * id, guint64 * num) { guint8 *data; - guint size; - GstFlowReturn ret; ret = gst_ebml_read_bytes (ebml, id, &data, &size); @@ -649,11 +628,8 @@ GstFlowReturn gst_ebml_read_sint (GstEbmlRead * ebml, guint32 * id, gint64 * num) { guint8 *data; - guint size; - gboolean negative = 0; - GstFlowReturn ret; ret = gst_ebml_read_bytes (ebml, id, &data, &size); @@ -704,9 +680,7 @@ static gdouble _ext2dbl (guint8 * data) { struct _ext_float ext; - guint64 m = 0; - gint e, i; memcpy (&ext.exponent, data, 2); @@ -733,9 +707,7 @@ GstFlowReturn gst_ebml_read_float (GstEbmlRead * ebml, guint32 * id, gdouble * num) { guint8 *data; - guint size; - GstFlowReturn ret; ret = gst_ebml_read_bytes (ebml, id, &data, &size); @@ -779,9 +751,7 @@ GstFlowReturn gst_ebml_read_ascii (GstEbmlRead * ebml, guint32 * id, gchar ** str) { guint8 *data; - guint size; - GstFlowReturn ret; ret = gst_ebml_read_bytes (ebml, id, &data, &size); @@ -830,7 +800,6 @@ GstFlowReturn gst_ebml_read_date (GstEbmlRead * ebml, guint32 * id, gint64 * date) { gint64 ebml_date; - GstFlowReturn ret; ret = gst_ebml_read_sint (ebml, id, &ebml_date); @@ -851,9 +820,7 @@ GstFlowReturn gst_ebml_read_master (GstEbmlRead * ebml, guint32 * id) { GstEbmlLevel *level; - guint64 length; - GstFlowReturn ret; ret = gst_ebml_read_element_id (ebml, id, NULL); @@ -882,9 +849,7 @@ gst_ebml_read_binary (GstEbmlRead * ebml, guint32 * id, guint8 ** binary, guint64 * length) { guint8 *data; - guint size; - GstFlowReturn ret; ret = gst_ebml_read_bytes (ebml, id, &data, &size); @@ -906,9 +871,7 @@ gst_ebml_read_header (GstEbmlRead * ebml, gchar ** doctype, guint * version) { /* this function is the first to be called */ guint32 id; - guint level_up; - GstFlowReturn ret; /* default init */ diff --git a/gst/matroska/ebml-write.c b/gst/matroska/ebml-write.c index e2a6a2f7aa..69aa1ffabb 100644 --- a/gst/matroska/ebml-write.c +++ b/gst/matroska/ebml-write.c @@ -256,7 +256,6 @@ static void gst_ebml_write_element_id (GstBuffer * buf, guint32 id) { guint8 *data = GST_BUFFER_DATA (buf) + GST_BUFFER_SIZE (buf); - guint bytes = 4, mask = 0x10; /* get ID length */ @@ -292,7 +291,6 @@ static void gst_ebml_write_element_size (GstBuffer * buf, guint64 size) { guint8 *data = GST_BUFFER_DATA (buf) + GST_BUFFER_SIZE (buf); - guint bytes = 1, mask = 0x80; if (size != GST_EBML_SIZE_UNKNOWN) { @@ -482,7 +480,6 @@ void gst_ebml_write_uint (GstEbmlWrite * ebml, guint32 id, guint64 num) { GstBuffer *buf = gst_ebml_write_element_new (ebml, sizeof (num)); - guint size = gst_ebml_write_get_uint_size (num); /* write */ @@ -511,7 +508,6 @@ gst_ebml_write_sint (GstEbmlWrite * ebml, guint32 id, gint64 num) * have a number (-)0x8000 (G_MINSHORT), then my abs()<<1 * will be 0x10000; this is G_MAXUSHORT+1! So: if (<0) -1. */ guint64 unum = (num < 0 ? (-num - 1) << 1 : num << 1); - guint size = gst_ebml_write_get_uint_size (unum); /* make unsigned */ @@ -564,7 +560,6 @@ void gst_ebml_write_ascii (GstEbmlWrite * ebml, guint32 id, const gchar * str) { gint len = strlen (str) + 1; /* add trailing '\0' */ - GstBuffer *buf = gst_ebml_write_element_new (ebml, len); gst_ebml_write_element_id (buf, id); @@ -620,7 +615,6 @@ guint64 gst_ebml_write_master_start (GstEbmlWrite * ebml, guint32 id) { guint64 pos = ebml->pos, t; - GstBuffer *buf = gst_ebml_write_element_new (ebml, 0); t = GST_BUFFER_SIZE (buf); @@ -644,7 +638,6 @@ void gst_ebml_write_master_finish (GstEbmlWrite * ebml, guint64 startpos) { guint64 pos = ebml->pos; - GstBuffer *buf; gst_ebml_write_seek (ebml, startpos); @@ -738,7 +731,6 @@ void gst_ebml_replace_uint (GstEbmlWrite * ebml, guint64 pos, guint64 num) { guint64 oldpos = ebml->pos; - GstBuffer *buf = gst_buffer_new_and_alloc (8); gst_ebml_write_seek (ebml, pos); diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 0b75ddf4d0..01e7c9d2cd 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -115,7 +115,6 @@ static void gst_matroska_demux_loop (GstPad * pad); static gboolean gst_matroska_demux_element_send_event (GstElement * element, GstEvent * event); - static gboolean gst_matroska_demux_element_query (GstElement * element, GstQuery * query); @@ -285,7 +284,6 @@ static void gst_matroska_demux_reset (GstElement * element) { GstMatroskaDemux *demux = GST_MATROSKA_DEMUX (element); - guint i; GST_DEBUG_OBJECT (demux, "Resetting state"); @@ -390,9 +388,7 @@ gst_matroska_demux_read_track_encoding (GstMatroskaDemux * demux, { GstMatroskaTrackEncoding enc = { 0, }; GstEbmlRead *ebml = GST_EBML_READ (demux); - GstFlowReturn ret; - guint32 id; DEBUG_ELEMENT_START (demux, ebml, "ContentEncoding"); @@ -520,10 +516,8 @@ gst_matroska_demux_read_track_encoding (GstMatroskaDemux * demux, } case GST_MATROSKA_ID_CONTENTCOMPSETTINGS:{ guint8 *data; - guint64 size; - if ((ret = gst_ebml_read_binary (ebml, &id, &data, &size)) != GST_FLOW_OK) { @@ -585,9 +579,7 @@ gst_matroska_demux_read_track_encodings (GstMatroskaDemux * demux, GstMatroskaTrackContext * context) { GstFlowReturn ret; - GstEbmlRead *ebml = GST_EBML_READ (demux); - guint32 id; DEBUG_ELEMENT_START (demux, ebml, "ContentEncodings"); @@ -655,23 +647,14 @@ static GstFlowReturn gst_matroska_demux_add_stream (GstMatroskaDemux * demux) { GstElementClass *klass = GST_ELEMENT_GET_CLASS (demux); - GstEbmlRead *ebml = GST_EBML_READ (demux); - GstMatroskaTrackContext *context; - GstPadTemplate *templ = NULL; - GstCaps *caps = NULL; - gchar *padname = NULL; - GstFlowReturn ret; - guint32 id; - GstTagList *list = NULL; - gchar *codec = NULL; if (demux->num_streams >= GST_MATROSKA_DEMUX_MAX_STREAMS) { @@ -985,7 +968,6 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux) /* colourspace (only matters for raw video) fourcc */ case GST_MATROSKA_ID_VIDEOCOLOURSPACE:{ guint8 *data; - guint64 datalen; if ((ret = @@ -1158,7 +1140,6 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux) /* codec private data */ case GST_MATROSKA_ID_CODECPRIVATE:{ guint8 *data; - guint64 size; if ((ret = @@ -1375,6 +1356,7 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux) case GST_MATROSKA_TRACK_TYPE_VIDEO:{ GstMatroskaTrackVideoContext *videocontext = (GstMatroskaTrackVideoContext *) context; + padname = g_strdup_printf ("video_%02d", demux->num_v_streams++); templ = gst_element_class_get_pad_template (klass, "video_%02d"); caps = gst_matroska_demux_video_caps (videocontext, @@ -1392,6 +1374,7 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux) case GST_MATROSKA_TRACK_TYPE_AUDIO:{ GstMatroskaTrackAudioContext *audiocontext = (GstMatroskaTrackAudioContext *) context; + padname = g_strdup_printf ("audio_%02d", demux->num_a_streams++); templ = gst_element_class_get_pad_template (klass, "audio_%02d"); caps = gst_matroska_demux_audio_caps (audiocontext, @@ -1409,6 +1392,7 @@ gst_matroska_demux_add_stream (GstMatroskaDemux * demux) case GST_MATROSKA_TRACK_TYPE_SUBTITLE:{ GstMatroskaTrackSubtitleContext *subtitlecontext = (GstMatroskaTrackSubtitleContext *) context; + padname = g_strdup_printf ("subtitle_%02d", demux->num_t_streams++); templ = gst_element_class_get_pad_template (klass, "subtitle_%02d"); caps = gst_matroska_demux_subtitle_caps (subtitlecontext, @@ -1599,7 +1583,6 @@ gst_matroskademux_do_index_seek (GstMatroskaDemux * demux, gint64 seek_pos, gint64 segment_stop, gboolean keyunit) { GstMatroskaIndex *entry = NULL; - guint n; if (!demux->index || !demux->index->len) @@ -1624,7 +1607,6 @@ gst_matroskademux_do_index_seek (GstMatroskaDemux * demux, gint64 seek_pos, */ if (entry && n < demux->index->len) { GstMatroskaIndex *index; - GstClockTimeDiff d_this, d_entry; index = &g_array_index (demux->index, GstMatroskaIndex, n); @@ -1652,7 +1634,6 @@ static gboolean gst_matroska_demux_send_event (GstMatroskaDemux * demux, GstEvent * event) { gboolean ret = TRUE; - gint i; g_return_val_if_fail (event != NULL, FALSE); @@ -1681,7 +1662,6 @@ static gboolean gst_matroska_demux_element_send_event (GstElement * element, GstEvent * event) { GstMatroskaDemux *demux = GST_MATROSKA_DEMUX (element); - gboolean res; g_return_val_if_fail (event != NULL, FALSE); @@ -1701,23 +1681,14 @@ gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux, GstEvent * event) { GstMatroskaIndex *entry; - GstSeekFlags flags; - GstSeekType cur_type, stop_type; - GstFormat format; - GstEvent *newsegment_event; - gboolean flush, keyunit; - gdouble rate; - gint64 cur, stop; - gint64 segment_start, segment_stop; - gint i; gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur, @@ -1884,7 +1855,6 @@ static gboolean gst_matroska_demux_handle_src_event (GstPad * pad, GstEvent * event) { GstMatroskaDemux *demux = GST_MATROSKA_DEMUX (gst_pad_get_parent (pad)); - gboolean res = TRUE; switch (GST_EVENT_TYPE (event)) { @@ -1914,13 +1884,9 @@ static GstFlowReturn gst_matroska_demux_init_stream (GstMatroskaDemux * demux) { GstEbmlRead *ebml = GST_EBML_READ (demux); - guint32 id; - gchar *doctype; - guint version; - GstFlowReturn ret; GST_DEBUG_OBJECT (demux, "Init stream"); @@ -1983,9 +1949,7 @@ static GstFlowReturn gst_matroska_demux_parse_tracks (GstMatroskaDemux * demux) { GstEbmlRead *ebml = GST_EBML_READ (demux); - GstFlowReturn ret = GST_FLOW_OK; - guint32 id; DEBUG_ELEMENT_START (demux, ebml, "Tracks"); @@ -2033,11 +1997,8 @@ gst_matroska_demux_parse_index_cuetrack (GstMatroskaDemux * demux, guint * nentries) { GstEbmlRead *ebml = GST_EBML_READ (demux); - guint32 id; - GstFlowReturn ret; - GstMatroskaIndex idx; idx.pos = (guint64) - 1; @@ -2152,13 +2113,9 @@ static GstFlowReturn gst_matroska_demux_parse_index_pointentry (GstMatroskaDemux * demux) { GstEbmlRead *ebml = GST_EBML_READ (demux); - guint32 id; - GstFlowReturn ret; - GstClockTime time = GST_CLOCK_TIME_NONE; - guint nentries = 0; DEBUG_ELEMENT_START (demux, ebml, "CuePoint"); @@ -2259,9 +2216,7 @@ static GstFlowReturn gst_matroska_demux_parse_index (GstMatroskaDemux * demux) { GstEbmlRead *ebml = GST_EBML_READ (demux); - guint32 id; - GstFlowReturn ret = GST_FLOW_OK; if (demux->index) @@ -2316,9 +2271,7 @@ static GstFlowReturn gst_matroska_demux_parse_info (GstMatroskaDemux * demux) { GstEbmlRead *ebml = GST_EBML_READ (demux); - GstFlowReturn ret = GST_FLOW_OK; - guint32 id; DEBUG_ELEMENT_START (demux, ebml, "SegmentInfo"); @@ -2353,7 +2306,6 @@ gst_matroska_demux_parse_info (GstMatroskaDemux * demux) case GST_MATROSKA_ID_DURATION:{ gdouble num; - GstClockTime dur; if ((ret = gst_ebml_read_float (ebml, &id, &num)) != GST_FLOW_OK) @@ -2466,13 +2418,9 @@ gst_matroska_demux_parse_metadata_id_simple_tag (GstMatroskaDemux * demux, GST_MATROSKA_TAG_ID_GENRE, GST_TAG_GENRE} }; GstEbmlRead *ebml = GST_EBML_READ (demux); - GstFlowReturn ret; - guint32 id; - gchar *value = NULL; - gchar *tag = NULL; DEBUG_ELEMENT_START (demux, ebml, "SimpleTag"); @@ -2566,9 +2514,7 @@ gst_matroska_demux_parse_metadata_id_tag (GstMatroskaDemux * demux, GstTagList ** p_taglist) { GstEbmlRead *ebml = GST_EBML_READ (demux); - guint32 id; - GstFlowReturn ret; DEBUG_ELEMENT_START (demux, ebml, "Tag"); @@ -2617,15 +2563,10 @@ static GstFlowReturn gst_matroska_demux_parse_metadata (GstMatroskaDemux * demux) { GstEbmlRead *ebml = GST_EBML_READ (demux); - GstTagList *taglist; - GstFlowReturn ret = GST_FLOW_OK; - guint32 id; - GList *l; - GstEbmlLevel *curlevel; /* Can't be NULL at this point */ @@ -2709,19 +2650,12 @@ gst_matroska_demux_parse_attached_file (GstMatroskaDemux * demux, GstTagList * taglist) { GstEbmlRead *ebml = GST_EBML_READ (demux); - guint32 id; - GstFlowReturn ret; - gchar *description = NULL; - gchar *filename = NULL; - gchar *mimetype = NULL; - guint8 *data = NULL; - guint64 datalen = 0; DEBUG_ELEMENT_START (demux, ebml, "AttachedFile"); @@ -2784,7 +2718,8 @@ gst_matroska_demux_parse_attached_file (GstMatroskaDemux * demux, break; default: - GST_WARNING ("Unknown AttachedFile subelement 0x%x - ignoring", id); + GST_WARNING_OBJECT (demux, + "Unknown AttachedFile subelement 0x%x - ignoring", id); /* fall through */ case GST_MATROSKA_ID_FILEUID: ret = gst_ebml_read_skip (ebml); @@ -2801,11 +2736,8 @@ gst_matroska_demux_parse_attached_file (GstMatroskaDemux * demux, if (filename && mimetype && data && datalen > 0) { GstTagImageType image_type = GST_TAG_IMAGE_TYPE_NONE; - GstBuffer *tagbuffer = NULL; - GstCaps *caps; - gchar *filename_lc = g_utf8_strdown (filename, -1); GST_DEBUG_OBJECT (demux, "Creating tag for attachment with filename '%s', " @@ -2882,11 +2814,8 @@ static GstFlowReturn gst_matroska_demux_parse_attachments (GstMatroskaDemux * demux) { GstEbmlRead *ebml = GST_EBML_READ (demux); - guint32 id; - GstFlowReturn ret = GST_FLOW_OK; - GstTagList *taglist; DEBUG_ELEMENT_START (demux, ebml, "Attachments"); @@ -2942,9 +2871,7 @@ static GstFlowReturn gst_matroska_demux_parse_chapters (GstMatroskaDemux * demux) { GstEbmlRead *ebml = GST_EBML_READ (demux); - guint32 id; - GstFlowReturn ret = GST_FLOW_OK; GST_WARNING_OBJECT (demux, "Parsing of chapters not implemented yet"); @@ -2992,7 +2919,6 @@ static gint gst_matroska_ebmlnum_uint (guint8 * data, guint size, guint64 * num) { gint len_mask = 0x80, read = 1, n = 1, num_ffs = 0; - guint64 total; if (size <= 0) { @@ -3030,7 +2956,6 @@ static gint gst_matroska_ebmlnum_sint (guint8 * data, guint size, gint64 * num) { guint64 unum; - gint res; /* read as unsigned number first */ @@ -3092,7 +3017,6 @@ gst_matroska_demux_push_hdr_buf (GstMatroskaDemux * demux, GstMatroskaTrackContext * stream, guint8 * data, guint len) { GstFlowReturn ret, cret; - GstBuffer *header_buf = NULL; ret = gst_pad_alloc_buffer_and_set_caps (stream->pad, @@ -3132,9 +3056,7 @@ gst_matroska_demux_push_flac_codec_priv_data (GstMatroskaDemux * demux, GstMatroskaTrackContext * stream) { GstFlowReturn ret; - guint8 *pdata; - guint off, len; GST_LOG_OBJECT (demux, "priv data size = %u", stream->codec_priv_size); @@ -3179,9 +3101,7 @@ gst_matroska_demux_push_xiph_codec_priv_data (GstMatroskaDemux * demux, GstMatroskaTrackContext * stream) { GstFlowReturn ret; - guint8 *p = (guint8 *) stream->codec_priv; - gint i, offset, length, num_packets; /* start of the stream and vorbis audio or theora video, need to @@ -3236,11 +3156,8 @@ gst_matroska_demux_push_dvd_clut_change_event (GstMatroskaDemux * demux, start = strstr (stream->codec_priv, "palette:"); if (start) { gint i; - guint32 clut[16]; - guint32 col; - guint8 r, g, b, y, u, v; start += 8; @@ -3290,11 +3207,8 @@ gst_matroska_demux_add_mpeg_seq_header (GstElement * element, GstMatroskaTrackContext * stream, GstBuffer ** buf) { GstMatroskaDemux *demux = GST_MATROSKA_DEMUX (element); - guint8 *seq_header; - guint seq_header_len; - guint32 header; if (stream->codec_state) { @@ -3318,7 +3232,6 @@ gst_matroska_demux_add_mpeg_seq_header (GstElement * element, /* Sequence start code, if not found prepend */ if (header != 0x000001b3) { GstBuffer *newbuf; - GstFlowReturn ret, cret; ret = gst_pad_alloc_buffer_and_set_caps (stream->pad, @@ -3350,17 +3263,12 @@ gst_matroska_demux_add_wvpk_header (GstElement * element, GstMatroskaTrackContext * stream, GstBuffer ** buf) { GstMatroskaDemux *demux = GST_MATROSKA_DEMUX (element); - GstMatroskaTrackAudioContext *audiocontext = (GstMatroskaTrackAudioContext *) stream; GstBuffer *newbuf = NULL; - guint8 *data; - guint newlen; - GstFlowReturn ret, cret = GST_FLOW_OK; - Wavpack4Header wvh; wvh.ck_id[0] = 'w'; @@ -3416,11 +3324,8 @@ gst_matroska_demux_add_wvpk_header (GstElement * element, audiocontext->wvpk_block_index += block_samples; } else { guint8 *outdata; - guint outpos = 0; - guint size; - guint32 block_samples, flags, crc, blocksize; data = GST_BUFFER_DATA (*buf); @@ -3502,17 +3407,11 @@ gst_matroska_demux_check_subtitle_buffer (GstElement * element, GstMatroskaTrackContext * stream, GstBuffer ** buf) { GstMatroskaDemux *demux = GST_MATROSKA_DEMUX (element); - GstMatroskaTrackSubtitleContext *sub_stream; - const gchar *encoding, *data; - GError *err = NULL; - GstBuffer *newbuf; - gchar *utf8; - guint size; sub_stream = (GstMatroskaTrackSubtitleContext *) stream; @@ -3581,11 +3480,8 @@ gst_matroska_decode_buffer (GstMatroskaTrackContext * context, GstBuffer * buf) for (i = 0; i < context->encodings->len; i++) { GstMatroskaTrackEncoding *enc; - guint8 *new_data = NULL; - guint new_size = 0; - GstBuffer *new_buf; enc = &g_array_index (context->encodings, GstMatroskaTrackEncoding, i); @@ -3600,9 +3496,7 @@ gst_matroska_decode_buffer (GstMatroskaTrackContext * context, GstBuffer * buf) #ifdef HAVE_ZLIB /* zlib encoded track */ z_stream zstream; - guint orig_size; - int result; orig_size = GST_BUFFER_SIZE (buf); @@ -3676,29 +3570,17 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux, guint64 cluster_time, gboolean is_simpleblock) { GstMatroskaTrackContext *stream = NULL; - GstEbmlRead *ebml = GST_EBML_READ (demux); - GstFlowReturn ret = GST_FLOW_OK; - gboolean readblock = FALSE; - guint32 id; - guint64 block_duration = 0; - GstBuffer *buf = NULL; - gint stream_num = -1, n, laces = 0; - guint size = 0; - gint *lace_size = NULL; - gint64 time = 0; - gint flags = 0; - gint64 referenceblock = 0; while (ret == GST_FLOW_OK) { @@ -3722,7 +3604,6 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux, case GST_MATROSKA_ID_BLOCK: { guint64 num; - guint8 *data; if ((ret = gst_ebml_read_buffer (ebml, &id, &buf)) != GST_FLOW_OK) @@ -3828,7 +3709,6 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux, total = lace_size[0] = num; for (n = 1; ret == GST_FLOW_OK && n < laces - 1; n++) { gint64 snum; - gint r; if ((r = gst_matroska_ebmlnum_sint (data, size, &snum)) < 0) { @@ -3889,7 +3769,6 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux, case GST_MATROSKA_ID_CODECSTATE:{ guint8 *data; - guint64 data_len = 0; if ((ret = @@ -3931,7 +3810,6 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux, if (ret == GST_FLOW_OK && readblock) { guint64 duration = 0; - gint64 lace_time = 0; stream = demux->src[stream_num]; @@ -3966,7 +3844,6 @@ gst_matroska_demux_parse_blockgroup_or_simpleblock (GstMatroskaDemux * demux, /* else duration is diff between timecode of this and next block */ for (n = 0; n < laces; n++) { GstBuffer *sub; - GstClockTimeDiff diff; if (lace_size[n] == 0) @@ -4066,11 +3943,8 @@ static GstFlowReturn gst_matroska_demux_parse_cluster (GstMatroskaDemux * demux) { GstEbmlRead *ebml = GST_EBML_READ (demux); - GstFlowReturn ret = GST_FLOW_OK; - guint64 cluster_time = GST_CLOCK_TIME_NONE; - guint32 id; DEBUG_ELEMENT_START (demux, ebml, "Cluster"); @@ -4148,13 +4022,9 @@ static GstFlowReturn gst_matroska_demux_parse_contents_seekentry (GstMatroskaDemux * demux) { GstEbmlRead *ebml = GST_EBML_READ (demux); - GstFlowReturn ret; - guint64 seek_pos = (guint64) - 1; - guint32 seek_id = 0; - guint32 id; DEBUG_ELEMENT_START (demux, ebml, "Seek"); @@ -4236,9 +4106,7 @@ gst_matroska_demux_parse_contents_seekentry (GstMatroskaDemux * demux) case GST_MATROSKA_ID_CHAPTERS: { guint level_up = demux->level_up; - guint64 before_pos, length; - GstEbmlLevel *level; /* remember */ @@ -4362,9 +4230,7 @@ static GstFlowReturn gst_matroska_demux_parse_contents (GstMatroskaDemux * demux) { GstEbmlRead *ebml = GST_EBML_READ (demux); - GstFlowReturn ret = GST_FLOW_OK; - guint32 id; while (ret == GST_FLOW_OK) { @@ -4410,7 +4276,6 @@ gst_matroska_demux_loop_stream_parse_id (GstMatroskaDemux * demux, guint32 id, gboolean * p_run_loop) { GstEbmlRead *ebml = GST_EBML_READ (demux); - GstFlowReturn ret = GST_FLOW_OK; switch (id) { @@ -4575,7 +4440,6 @@ gst_matroska_demux_loop_stream_parse_id (GstMatroskaDemux * demux, /* attachments - contains files attached to the mkv container * like album art, etc */ case GST_MATROSKA_ID_ATTACHMENTS:{ - if (!demux->attachments_parsed) { if ((ret = gst_matroska_demux_parse_attachments (demux)) != GST_FLOW_OK) return ret; @@ -4608,11 +4472,8 @@ static GstFlowReturn gst_matroska_demux_loop_stream (GstMatroskaDemux * demux) { GstEbmlRead *ebml = GST_EBML_READ (demux); - GstFlowReturn ret = GST_FLOW_OK; - gboolean run_loop = TRUE; - guint32 id; /* we've found our segment, start reading the different contents in here */ @@ -4639,9 +4500,7 @@ static void gst_matroska_demux_loop (GstPad * pad) { GstMatroskaDemux *demux = GST_MATROSKA_DEMUX (GST_PAD_PARENT (pad)); - GstEbmlRead *ebml = GST_EBML_READ (demux); - GstFlowReturn ret; /* first, if we're to start, let's actually get starting */ @@ -4753,7 +4612,6 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext * gchar ** codec_name) { GstMatroskaTrackContext *context = (GstMatroskaTrackContext *) videocontext; - GstCaps *caps = NULL; g_assert (videocontext != NULL); @@ -4940,7 +4798,6 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext * if (caps != NULL) { int i; - GstStructure *structure; for (i = 0; i < gst_caps_get_size (caps); i++) { @@ -5076,7 +4933,6 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext * gchar ** codec_name) { GstMatroskaTrackContext *context = (GstMatroskaTrackContext *) audiocontext; - GstCaps *caps = NULL; g_assert (audiocontext != NULL); @@ -5171,11 +5027,8 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext * } } else if (g_str_has_prefix (codec_id, GST_MATROSKA_CODEC_ID_AUDIO_AAC)) { GstBuffer *priv = NULL; - gint mpegversion = -1; - gint rate_idx, profile; - guint8 *data = NULL; /* unspecified AAC profile with opaque private codec data */ @@ -5304,7 +5157,6 @@ gst_matroska_demux_subtitle_caps (GstMatroskaTrackSubtitleContext * subtitlecontext, const gchar * codec_id, gpointer data, guint size) { GstCaps *caps = NULL; - GstMatroskaTrackContext *context = (GstMatroskaTrackContext *) subtitlecontext; @@ -5357,7 +5209,6 @@ gst_matroska_demux_change_state (GstElement * element, GstStateChange transition) { GstMatroskaDemux *demux = GST_MATROSKA_DEMUX (element); - GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS; /* handle upwards state changes here */ diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index 8d334a989d..c4899d391a 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -233,7 +233,6 @@ static void gst_matroska_mux_class_init (GstMatroskaMuxClass * klass) { GObjectClass *gobject_class; - GstElementClass *gstelement_class; gobject_class = (GObjectClass *) klass; @@ -384,7 +383,6 @@ static void gst_matroska_mux_reset (GstElement * element) { GstMatroskaMux *mux = GST_MATROSKA_MUX (element); - GSList *walk; /* reset EBML write */ @@ -396,7 +394,6 @@ gst_matroska_mux_reset (GstElement * element) /* clean up existing streams */ while ((walk = mux->collect->data) != NULL) { GstMatroskaPad *collect_pad; - GstPad *thepad; collect_pad = (GstMatroskaPad *) walk->data; @@ -480,13 +477,9 @@ static gboolean gst_matroska_mux_handle_sink_event (GstPad * pad, GstEvent * event) { GstMatroskaTrackContext *context; - GstMatroskaPad *collect_pad; - GstMatroskaMux *mux; - GstTagList *list; - gboolean ret; mux = GST_MATROSKA_MUX (gst_pad_get_parent (pad)); @@ -535,19 +528,12 @@ static gboolean gst_matroska_mux_video_pad_setcaps (GstPad * pad, GstCaps * caps) { GstMatroskaTrackContext *context = NULL; - GstMatroskaTrackVideoContext *videocontext; - GstMatroskaMux *mux; - GstMatroskaPad *collect_pad; - GstStructure *structure; - const gchar *mimetype; - gint width, height, pixel_width, pixel_height; - gint fps_d, fps_n; mux = GST_MATROSKA_MUX (GST_PAD_PARENT (pad)); @@ -626,9 +612,7 @@ skip_details: || !strcmp (mimetype, "video/x-dv") || !strcmp (mimetype, "video/x-h263")) { BITMAPINFOHEADER *bih; - const GValue *codec_data; - gint size = sizeof (BITMAPINFOHEADER); bih = g_new0 (BITMAPINFOHEADER, 1); @@ -700,9 +684,7 @@ skip_details: if (codec_data != NULL) { guint8 *priv_data = NULL; - guint priv_data_size = 0; - GstBuffer *codec_data_buf = g_value_peek_pointer (codec_data); priv_data_size = GST_BUFFER_SIZE (codec_data_buf); @@ -770,11 +752,8 @@ xiph3_streamheader_to_codecdata (const GValue * streamheader, GstMatroskaTrackContext * context, GstBuffer ** p_buf0) { GstBuffer *buf[3]; - GArray *bufarr; - guint8 *priv_data; - guint i, offset, priv_data_size; if (streamheader == NULL) @@ -873,7 +852,6 @@ vorbis_streamheader_to_codecdata (const GValue * streamheader, } else { if (memcmp (GST_BUFFER_DATA (buf0) + 1, "vorbis", 6) == 0) { GstMatroskaTrackAudioContext *audiocontext; - guint8 *hdr; hdr = GST_BUFFER_DATA (buf0) + 1 + 6 + 4; @@ -904,9 +882,7 @@ theora_streamheader_to_codecdata (const GValue * streamheader, GST_WARNING ("First header not a theora identification header, ignoring"); } else { GstMatroskaTrackVideoContext *videocontext; - guint fps_num, fps_denom, par_num, par_denom; - guint8 *hdr; hdr = GST_BUFFER_DATA (buf0) + 1 + 6 + 3 + 2 + 2; @@ -961,17 +937,11 @@ static gboolean gst_matroska_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps) { GstMatroskaTrackContext *context = NULL; - GstMatroskaTrackAudioContext *audiocontext; - GstMatroskaMux *mux; - GstMatroskaPad *collect_pad; - const gchar *mimetype; - gint samplerate = 0, channels = 0; - GstStructure *structure; mux = GST_MATROSKA_MUX (GST_PAD_PARENT (pad)); @@ -1170,17 +1140,11 @@ gst_matroska_mux_request_new_pad (GstElement * element, GstPadTemplate * templ, const gchar * pad_name) { GstElementClass *klass = GST_ELEMENT_GET_CLASS (element); - GstMatroskaMux *mux = GST_MATROSKA_MUX (element); - GstMatroskaPad *collect_pad; - GstPad *newpad = NULL; - gchar *name = NULL; - GstPadSetCapsFunction setcapsfunc = NULL; - GstMatroskaTrackContext *context = NULL; if (templ == gst_element_class_get_pad_template (klass, "audio_%d")) { @@ -1252,14 +1216,12 @@ static void gst_matroska_mux_release_pad (GstElement * element, GstPad * pad) { GstMatroskaMux *mux; - GSList *walk; mux = GST_MATROSKA_MUX (GST_PAD_PARENT (pad)); for (walk = mux->collect->data; walk; walk = g_slist_next (walk)) { GstCollectData *cdata = (GstCollectData *) walk->data; - GstMatroskaPad *collect_pad = (GstMatroskaPad *) cdata; if (cdata->pad == pad) { @@ -1300,7 +1262,6 @@ gst_matroska_mux_track_header (GstMatroskaMux * mux, GstMatroskaTrackContext * context) { GstEbmlWrite *ebml = mux->ebml_write; - guint64 master; /* TODO: check if everything necessary is written and check default values */ @@ -1449,11 +1410,8 @@ gst_matroska_mux_start (GstMatroskaMux * mux) for (collected = mux->collect->data; collected; collected = g_slist_next (collected)) { GstMatroskaPad *collect_pad; - GstFormat format = GST_FORMAT_TIME; - GstPad *thepad; - gint64 trackduration; collect_pad = (GstMatroskaPad *) collected->data; @@ -1488,9 +1446,7 @@ gst_matroska_mux_start (GstMatroskaMux * mux) for (collected = mux->collect->data; collected; collected = g_slist_next (collected)) { - GstMatroskaPad *collect_pad; - GstPad *thepad; collect_pad = (GstMatroskaPad *) collected->data; @@ -1538,16 +1494,12 @@ gst_matroska_mux_write_simple_tag (const GstTagList * list, const gchar * tag, GST_MATROSKA_TAG_ID_LEAD_PERFORMER, GST_TAG_PERFORMER}, { GST_MATROSKA_TAG_ID_GENRE, GST_TAG_GENRE} }; - GstEbmlWrite *ebml = (GstEbmlWrite *) data; - guint i; - guint64 simpletag_master; for (i = 0; i < G_N_ELEMENTS (tag_conv); i++) { const gchar *tagname_gst = tag_conv[i].gstreamer_tagname; - const gchar *tagname_mkv = tag_conv[i].matroska_tagname; if (strcmp (tagname_gst, tag) == 0) { @@ -1583,13 +1535,9 @@ static void gst_matroska_mux_finish (GstMatroskaMux * mux) { GstEbmlWrite *ebml = mux->ebml_write; - guint64 pos; - guint64 duration = 0; - GSList *collected; - GstTagList *tags; /* finish last cluster */ @@ -1600,7 +1548,6 @@ gst_matroska_mux_finish (GstMatroskaMux * mux) /* cues */ if (mux->index != NULL) { guint n; - guint64 master, pointentry_master, trackpos_master; mux->cues_pos = ebml->pos; @@ -1688,7 +1635,6 @@ gst_matroska_mux_finish (GstMatroskaMux * mux) for (collected = mux->collect->data; collected; collected = g_slist_next (collected)) { GstMatroskaPad *collect_pad; - GstClockTime min_duration; /* observed minimum duration */ collect_pad = (GstMatroskaPad *) collected->data; @@ -1749,7 +1695,6 @@ static GstMatroskaPad * gst_matroska_mux_best_pad (GstMatroskaMux * mux, gboolean * popped) { GSList *collected; - GstMatroskaPad *best = NULL; *popped = FALSE; @@ -1822,19 +1767,12 @@ static GstFlowReturn gst_matroska_mux_write_data (GstMatroskaMux * mux, GstMatroskaPad * collect_pad) { GstEbmlWrite *ebml = mux->ebml_write; - GstBuffer *buf, *hdr; - guint64 cluster, blockgroup; - gboolean write_duration; - gint16 relative_timestamp; - gint64 relative_timestamp64; - guint64 block_duration; - gboolean is_video_keyframe = FALSE; /* write data */ @@ -2000,11 +1938,8 @@ static GstFlowReturn gst_matroska_mux_collected (GstCollectPads * pads, gpointer user_data) { GstMatroskaMux *mux = GST_MATROSKA_MUX (user_data); - GstMatroskaPad *best; - gboolean popped; - GstFlowReturn ret; GST_DEBUG_OBJECT (mux, "Collected pads"); @@ -2042,7 +1977,6 @@ gst_matroska_mux_collected (GstCollectPads * pads, gpointer user_data) * the actual duration later when we send an updated header on eos */ if (GST_BUFFER_TIMESTAMP_IS_VALID (best->buffer)) { GstClockTime start_ts = GST_BUFFER_TIMESTAMP (best->buffer); - GstClockTime end_ts = start_ts; if (GST_BUFFER_DURATION_IS_VALID (best->buffer)) @@ -2079,7 +2013,6 @@ static GstStateChangeReturn gst_matroska_mux_change_state (GstElement * element, GstStateChange transition) { GstStateChangeReturn ret; - GstMatroskaMux *mux = GST_MATROSKA_MUX (element); switch (transition) {