Commit 80924bdf authored by Ronald S. Bultje's avatar Ronald S. Bultje

remove gstffmpegdecall. This was a temporary hack to get around some issues...

remove gstffmpegdecall. This was a temporary hack to get around some issues with our video/avi-centered mimetype syst...

Original commit message from CVS:
* remove gstffmpegdecall. This was a temporary hack to get around
some issues with our video/avi-centered mimetype system. Now that
we use proper identifiers, we don't need that piece of cruft anymore.
* update ffmpeg codec map for ffdec_*, plus make the uncompressed stream
caps also be formed by the codec mapper (this is easier to handle imo).
* add audio support (untested, though :P).
* remove the copying of buffer content and add a get_buffer() handler
instead.
* add an int to ffmpegenc to make it compile and resolve the symbol. I'll
truely fix that later on.
* make mimetypes in the ffmpeg codec mapper conform to docs/random/mimetypes
* etc.

Oh, and let's not forget that it can play back DIVX5 et all nicely. Support
for SVQ1/3 is also there, so if someone completes qtdemux, we can watch
these, too.
parent 56ab4632
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@
plugin_LTLIBRARIES = libgstffmpeg.la libgstffmpegall.la
plugin_LTLIBRARIES = libgstffmpeg.la
libgstffmpeg_la_SOURCES = gstffmpeg.c \
gstffmpegcodecmap.c \
......@@ -20,15 +20,4 @@ libgstffmpeg_la_LIBADD = \
libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstffmpegall_la_SOURCES = gstffmpegall.c \
gstffmpegallcodecmap.c
libgstffmpegall_la_CFLAGS = $(GST_CFLAGS) \
-I $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec \
-I $(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavformat
libgstffmpegall_la_LIBADD = \
$(top_builddir)/gst-libs/ext/ffmpeg/ffmpeg/libavcodec/libavcodec.a
libgstffmpegall_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstffmpegallcodecmap.h
noinst_HEADERS = gstffmpegcodecmap.h
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -17,24 +17,30 @@
* Boston, MA 02111-1307, USA.
*/
#ifndef __GST_FFMPEGALL_CODECMAP_H__
#define __GST_FFMPEGALL_CODECMAP_H__
#ifndef __GST_FFMPEG_CODECMAP_H__
#define __GST_FFMPEG_CODECMAP_H__
#include "config.h"
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avcodec.h>
#else
#include <ffmpeg/avcodec.h>
#endif
#include <string.h>
#include <gst/gst.h>
/* _codecid_to_caps () gets the GstCaps that belongs to
* a certain CodecID for a pad with compressed data.
*/
GstCaps *
gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
AVCodecContext *context);
gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
AVCodecContext *context);
enum CodecID
gst_ffmpeg_caps_to_codecid (GstCaps *caps,
AVCodecContext *context);
/* _codectype_to_caps () gets the GstCaps that belongs to
* a certain CodecType for a pad with uncompressed data.
*/
GstCaps *
gst_ffmpeg_codectype_to_caps (enum CodecType codec_type,
AVCodecContext *context);
#endif /* __GST_FFMPEGALL_CODECMAP_H__ */
#endif /* __GST_FFMPEG_CODECMAP_H__ */
This diff is collapsed.
......@@ -17,9 +17,11 @@
* Boston, MA 02111-1307, USA.
*/
#include <string.h>
#include <assert.h>
#include "config.h"
#include <assert.h>
#include <string.h>
#ifdef HAVE_FFMPEG_UNINSTALLED
#include <avcodec.h>
#else
......@@ -28,6 +30,8 @@
#include <gst/gst.h>
#include "gstffmpegcodecmap.h"
typedef struct _GstFFMpegEnc GstFFMpegEnc;
struct _GstFFMpegEnc {
......@@ -87,6 +91,8 @@ enum {
/* FILL ME */
};
int motion_estimation_method;
/* This factory is much simpler, and defines the source pad. */
GST_PAD_TEMPLATE_FACTORY (gst_ffmpegenc_src_factory,
"src",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment