gst-libs/gst/audio: Remove baseaudiodecoder

Adds little beyond baseaudiocodec (seeking, bit of query), and what it adds
is mainly out-of-scope (e.g. decoder seeking, should be done by upstream
demuxer/parser) and/or based on non-prime example (mad).

diff --git a/gst-libs/gst/audio/gstbaseaudiodecoder.c b/gst-libs/gst/audio/gstbaseaudiodecoder.c
deleted file mode 100644 (file)
index 30a0b1c..0000000
--- a/gst-libs/gst/audio/gstbaseaudiodecoder.c
+++ /dev/null
@@ -1,437 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Igalia S.L.
- * Author: Iago Toral Quiroga <itoral@igalia.com>
- *
- * 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.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "gstbaseaudiodecoder.h"
-
-#include <gst/gstutils.h>
-#include <string.h>
-
-/*
- * FIXME: Do we really need decoder/encoder classes?
- * FIXME: is it interesting to provide sink_query and src_query functions?
- */
-
-GST_DEBUG_CATEGORY_EXTERN (baseaudiocodec_debug);
-#define GST_CAT_DEFAULT baseaudiocodec_debug
-
-/* ----- Function prototypes ----- */
-
-static void gst_base_audio_decoder_finalize (GObject * object);
-
-static gboolean gst_base_audio_decoder_src_event (GstPad * pad,
-    GstEvent * event);
-/* static gboolean gst_base_audio_decoder_sink_query (GstPad * pad, */
-/*     GstQuery * query); */
-/* static gboolean gst_base_audio_decoder_sink_convert (GstPad * pad, */
-/*     GstFormat src_format, gint64 src_value, GstFormat * dest_format, */
-/*     gint64 * dest_value); */
-static const GstQueryType *gst_base_audio_decoder_get_query_types (GstPad *
-    pad);
-static gboolean gst_base_audio_decoder_src_query (GstPad * pad,
-    GstQuery * query);
-static gboolean gst_base_audio_decoder_src_convert (GstPad * pad,
-    GstFormat src_format, gint64 src_value, GstFormat * dest_format,
-    gint64 * dest_value);
-static gboolean gst_base_audio_decoder_reset (GstBaseAudioCodec * codec);
-
-/* ----- GObject setup ----- */
-
-GST_BOILERPLATE (GstBaseAudioDecoder, gst_base_audio_decoder,
-    GstBaseAudioCodec, GST_TYPE_BASE_AUDIO_CODEC);
-
-static void
-gst_base_audio_decoder_base_init (gpointer g_class)
-{
-}
-
-static void
-gst_base_audio_decoder_class_init (GstBaseAudioDecoderClass * klass)
-{
-  GObjectClass *gobject_class;
-
-  gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->finalize = gst_base_audio_decoder_finalize;
-
-  parent_class->reset = gst_base_audio_decoder_reset;
-}
-
-static void
-gst_base_audio_decoder_init (GstBaseAudioDecoder * decoder,
-    GstBaseAudioDecoderClass * klass)
-{
-  GstPad *pad;
-
-  GST_DEBUG ("gst_base_audio_decoder_init");
-
-  pad = GST_BASE_AUDIO_CODEC_SINK_PAD (decoder);
-/*   gst_pad_set_query_function (pad, gst_base_audio_decoder_sink_query); */
-
-  pad = GST_BASE_AUDIO_CODEC_SRC_PAD (decoder);
-
-  gst_pad_set_event_function (pad, gst_base_audio_decoder_src_event);
-  gst_pad_set_query_type_function (pad, gst_base_audio_decoder_get_query_types);
-  gst_pad_set_query_function (pad, gst_base_audio_decoder_src_query);
-}
-
-static void
-gst_base_audio_decoder_finalize (GObject * object)
-{
-  g_return_if_fail (GST_IS_BASE_AUDIO_DECODER (object));
-
-  GST_DEBUG_OBJECT (object, "gst_base_audio_decoder_finalize");
-
-  G_OBJECT_CLASS (parent_class)->finalize (object);
-}
-
-/* ----- Private element implementation ----- */
-
-static gboolean
-gst_base_audio_decoder_src_convert (GstPad * pad, GstFormat src_format,
-    gint64 src_value, GstFormat * dest_format, gint64 * dest_value)
-{
-  gboolean res = TRUE;
-  GstBaseAudioCodec *codec;
-  gint bytes_per_sample;
-  gint scale = 1;
-  guint byterate;
-
-  if (src_format == *dest_format || src_value == -1 || src_value == 0) {
-    *dest_value = src_value;
-    return TRUE;
-  }
-
-  codec = GST_BASE_AUDIO_CODEC (GST_PAD_PARENT (pad));
-
-  bytes_per_sample = codec->state.channels * codec->state.bytes_per_sample;
-
-  switch (src_format) {
-    case GST_FORMAT_BYTES:
-      switch (*dest_format) {
-        case GST_FORMAT_DEFAULT:       /* Bytes -> Samples */
-          if (bytes_per_sample == 0)
-            return FALSE;
-          *dest_value = src_value / bytes_per_sample;
-          break;
-        case GST_FORMAT_TIME:  /* Bytes -> Time */
-          byterate = bytes_per_sample * codec->state.rate;
-          if (byterate == 0)
-            return FALSE;
-          *dest_value =
-              gst_util_uint64_scale_int (src_value, GST_SECOND, byterate);
-          break;
-        default:
-          res = FALSE;
-      }
-      break;
-    case GST_FORMAT_DEFAULT:
-      switch (*dest_format) {
-        case GST_FORMAT_BYTES: /* Samples -> Bytes */
-          *dest_value = src_value * bytes_per_sample;
-          break;
-        case GST_FORMAT_TIME:  /* Samples -> Time */
-          if (codec->state.rate == 0)
-            return FALSE;
-          *dest_value = gst_util_uint64_scale_int (src_value, GST_SECOND,
-              codec->state.rate);
-          break;
-        default:
-          res = FALSE;
-      }
-      break;
-    case GST_FORMAT_TIME:
-      switch (*dest_format) {
-        case GST_FORMAT_BYTES: /* Time -> Bytes */
-          scale = bytes_per_sample;
-          /* fallthrough */
-        case GST_FORMAT_DEFAULT:       /* Time -> Samples */
-          *dest_value = gst_util_uint64_scale_int (src_value,
-              scale * codec->state.rate, GST_SECOND);
-          break;
-        default:
-          res = FALSE;
-      }
-      break;
-    default:
-      res = FALSE;
-  }
-
-  return res;
-}
-
-#ifndef GST_DISABLE_INDEX
-static gboolean
-gst_base_audio_decoder_index_seek (GstBaseAudioDecoder * decoder,
-    GstIndex * index, GstPad * pad, GstEvent * event)
-{
-  GstIndexEntry *entry;
-  gdouble rate;
-  GstFormat format;
-  GstSeekFlags flags;
-  GstSeekType cur_type, stop_type;
-  gint64 cur, stop;
-  gint index_id;
-  GstBaseAudioCodec *codec;
-
-  codec = GST_BASE_AUDIO_CODEC (decoder);
-
-  gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur,
-      &stop_type, &stop);
-
-  gst_index_get_writer_id (index, GST_OBJECT (decoder), &index_id);
-  entry = gst_index_get_assoc_entry (index, index_id,
-      GST_INDEX_LOOKUP_BEFORE, GST_ASSOCIATION_FLAG_KEY_UNIT, format, cur);
-
-  if (entry && gst_pad_is_linked (GST_BASE_AUDIO_CODEC_SINK_PAD (codec))) {
-    const GstFormat *peer_formats, *try_formats;
-
-    /* since we know the exact byteoffset of the frame, 
-       make sure to seek on bytes first */
-    const GstFormat try_all_formats[] = {
-      GST_FORMAT_BYTES,
-      GST_FORMAT_TIME,
-      0
-    };
-
-    try_formats = try_all_formats;
-
-#if 0
-    /* FIXE ME */
-    peer_formats =
-        gst_pad_get_formats (GST_PAD_PEER (GST_BASE_AUDIO_CODEC_SINK_PAD
-            (codec)));
-#else
-    peer_formats = try_all_formats;
-#endif
-
-    while (gst_formats_contains (peer_formats, *try_formats)) {
-      gint64 value;
-
-      if (gst_index_entry_assoc_map (entry, *try_formats, &value)) {
-        GstEvent *seek_event;
-
-        GST_DEBUG_OBJECT (decoder,
-            "index %s %" G_GINT64_FORMAT
-            " -> %s %" G_GINT64_FORMAT,
-            gst_format_get_details (format)->nick,
-            cur, gst_format_get_details (*try_formats)->nick, value);
-
-        seek_event = gst_event_new_seek (rate, *try_formats, flags,
-            cur_type, value, stop_type, stop);
-
-        if (gst_pad_push_event (GST_BASE_AUDIO_CODEC_SINK_PAD (codec),
-                seek_event)) {
-          return TRUE;
-        }
-      }
-
-      try_formats++;
-    }
-  }
-
-  return FALSE;
-}
-#endif
-
-static gboolean
-gst_base_audio_decoder_normal_seek (GstBaseAudioDecoder * decoder,
-    GstPad * pad, GstEvent * event)
-{
-  gdouble rate;
-  GstFormat format, conv;
-  GstSeekFlags flags;
-  GstSeekType cur_type, stop_type;
-  gint64 cur, stop;
-  gint64 time_cur, bytes_cur;
-  gint64 time_stop, bytes_stop;
-  gboolean res;
-  GstEvent *peer_event;
-  GstBaseAudioCodec *codec;
-
-  codec = GST_BASE_AUDIO_CODEC (decoder);
-
-  gst_event_parse_seek (event, &rate, &format, &flags, &cur_type, &cur,
-      &stop_type, &stop);
-
-  res = FALSE;
-
-  /* Try to seek in time */
-  conv = GST_FORMAT_TIME;
-  if (!gst_base_audio_decoder_src_convert (pad, format, cur, &conv, &time_cur))
-    goto convert_failed;
-  if (!gst_base_audio_decoder_src_convert (pad, format, stop, &conv,
-          &time_stop))
-    goto convert_failed;
-
-  GST_DEBUG ("seek to time %" GST_TIME_FORMAT "-%" GST_TIME_FORMAT,
-      GST_TIME_ARGS (time_cur), GST_TIME_ARGS (time_stop));
-
-  peer_event = gst_event_new_seek (rate, GST_FORMAT_TIME, flags,
-      cur_type, time_cur, stop_type, time_stop);
-
-  res = gst_pad_push_event (GST_BASE_AUDIO_CODEC_SINK_PAD (codec), peer_event);
-
-  /* Try seek in bytes if seek in time failed */
-  if (!res) {
-    conv = GST_FORMAT_BYTES;
-    if (!gst_base_audio_decoder_src_convert (pad, GST_FORMAT_TIME, time_cur,
-            &conv, &bytes_cur))
-      goto convert_failed;
-    if (!gst_base_audio_decoder_src_convert (pad, GST_FORMAT_TIME, time_stop,
-            &conv, &bytes_stop))
-      goto convert_failed;
-
-    peer_event =
-        gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, cur_type, bytes_cur,
-        stop_type, bytes_stop);
-
-    res = gst_pad_push_event (GST_BASE_AUDIO_CODEC_SINK_PAD (codec),
-        peer_event);
-  }
-
-  return res;
-
-  /* ERRORS */
-convert_failed:
-  {
-    GST_DEBUG_OBJECT (decoder, "failed to convert format %u", format);
-    return FALSE;
-  }
-}
-
-static gboolean
-gst_base_audio_decoder_seek (GstBaseAudioDecoder * decoder,
-    GstPad * pad, GstEvent * event)
-{
-  gboolean res;
-
-#ifndef GST_DISABLE_INDEX
-  GstIndex *index = gst_element_get_index (GST_ELEMENT (decoder));
-  if (index) {
-    res = gst_base_audio_decoder_index_seek (decoder, index, pad, event);
-    gst_object_unref (index);
-  } else
-#endif
-    res = gst_base_audio_decoder_normal_seek (decoder, pad, event);
-
-  return res;
-}
-
-static gboolean
-gst_base_audio_decoder_src_event (GstPad * pad, GstEvent * event)
-{
-  gboolean res;
-  GstBaseAudioDecoder *decoder;
-  GstBaseAudioCodec *codec;
-
-  decoder = GST_BASE_AUDIO_DECODER (GST_PAD_PARENT (pad));
-  codec = GST_BASE_AUDIO_CODEC (decoder);
-
-  switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_SEEK:
-      /* Try the demuxer first */
-      gst_event_ref (event);
-      res = gst_pad_push_event (GST_BASE_AUDIO_CODEC_SINK_PAD (codec), event);
-      if (!res) {
-        res = gst_base_audio_decoder_seek (decoder, pad, event);
-      }
-      gst_event_unref (event);
-      break;
-    default:
-      res = gst_pad_push_event (GST_BASE_AUDIO_CODEC_SINK_PAD (codec), event);
-      break;
-  }
-  return res;
-}
-
-static const GstQueryType *
-gst_base_audio_decoder_get_query_types (GstPad * pad)
-{
-  static const GstQueryType query_types[] = {
-    GST_QUERY_CONVERT,
-    0
-  };
-
-  return query_types;
-}
-
-static gboolean
-gst_base_audio_decoder_src_query (GstPad * pad, GstQuery * query)
-{
-  GstBaseAudioDecoder *enc;
-  gboolean res;
-
-  enc = GST_BASE_AUDIO_DECODER (gst_pad_get_parent (pad));
-
-  switch GST_QUERY_TYPE
-    (query) {
-    case GST_QUERY_CONVERT:
-    {
-      GstFormat src_fmt, dest_fmt;
-      gint64 src_val, dest_val;
-
-      gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
-      res =
-          gst_base_audio_decoder_src_convert (pad, src_fmt, src_val, &dest_fmt,
-          &dest_val);
-      if (!res)
-        goto error;
-      gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
-      break;
-    }
-    default:
-      res = gst_pad_query_default (pad, query);
-    }
-
-  gst_object_unref (enc);
-
-  return res;
-
-error:
-  GST_DEBUG_OBJECT (enc, "query failed");
-  gst_object_unref (enc);
-  return res;
-}
-
-/* FIXME: implement  (is this really necessary?) */
-/* static gboolean */
-/* gst_base_audio_decoder_sink_convert (GstPad * pad, GstFormat src_format, */
-/*     gint64 src_value, GstFormat * dest_format, gint64 * dest_value) */
-/* { */
-/*   return TRUE; */
-/* } */
-
-/* FIXME: implement (is this really necessary?) */
-/* static gboolean */
-/* gst_base_audio_decoder_sink_query (GstPad * pad, GstQuery * query) */
-/* { */
-/*   return TRUE; */
-/* } */
-
-static gboolean
-gst_base_audio_decoder_reset (GstBaseAudioCodec * codec)
-{
-  GST_DEBUG ("gst_base_audio_decoder_reset");
-  return TRUE;
-}

diff --git a/gst-libs/gst/audio/gstbaseaudiodecoder.h b/gst-libs/gst/audio/gstbaseaudiodecoder.h
deleted file mode 100644 (file)
index d95381c..0000000
--- a/gst-libs/gst/audio/gstbaseaudiodecoder.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* GStreamer
- * Copyright (C) 2009 Igalia S.L.
- * Author: Iago Toral Quiroga <itoral@igalia.com>
- *
- * 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.
- */
-
-#ifndef _GST_BASE_AUDIO_DECODER_H_
-#define _GST_BASE_AUDIO_DECODER_H_
-
-#ifndef GST_USE_UNSTABLE_API
-#warning "GstBaseAudioDecoder is unstable API and may change in future."
-#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
-#endif
-
-#include "gstbaseaudiocodec.h"
-
-G_BEGIN_DECLS
-
-#define GST_TYPE_BASE_AUDIO_DECODER \
-  (gst_base_audio_decoder_get_type())
-#define GST_BASE_AUDIO_DECODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BASE_AUDIO_DECODER,GstBaseAudioDecoder))
-#define GST_BASE_AUDIO_DECODER_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BASE_AUDIO_DECODER,GstBaseAudioDecoderClass))
-#define GST_BASE_AUDIO_DECODER_GET_CLASS(obj) \
-  (G_TYPE_INSTANCE_GET_CLASS((obj),GST_TYPE_BASE_AUDIO_DECODER,GstBaseAudioDecoderClass))
-#define GST_IS_BASE_AUDIO_DECODER(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BASE_AUDIO_DECODER))
-#define GST_IS_BASE_AUDIO_DECODER_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BASE_AUDIO_DECODER))
-
-typedef struct _GstBaseAudioDecoder GstBaseAudioDecoder;
-typedef struct _GstBaseAudioDecoderClass GstBaseAudioDecoderClass;
-
-struct _GstBaseAudioDecoder
-{
-  GstBaseAudioCodec base_audio_codec;
-};
-
-struct _GstBaseAudioDecoderClass
-{
-  GstBaseAudioCodecClass base_audio_codec_class;
-};
-
-GType gst_base_audio_decoder_get_type (void);
-
-G_END_DECLS
-
-#endif
-