mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-13 17:55:30 +00:00
Code Issues 1 Projects Releases Wiki Activity

basevideo: merge utils header into basevideocodec

Browse source
This commit is contained in:
David Schleef 2011-02-20 14:16:18 -08:00
parent d1a78aa3f9
commit 3ada35cc0e
8 changed files with 64 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ext/vp8/gstvp8dec.h
View file

@ -25,7 +25,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/video/gstbasevideodecoder.h> #include <gst/video/gstbasevideodecoder.h>
#include <gst/video/gstbasevideoutils.h>
/* FIXME: Undef HAVE_CONFIG_H because vpx_codec.h uses it, /* FIXME: Undef HAVE_CONFIG_H because vpx_codec.h uses it,
* which causes compilation failures */ * which causes compilation failures */

1
ext/vp8/gstvp8enc.h
View file

@ -24,7 +24,6 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/video/gstbasevideoencoder.h> #include <gst/video/gstbasevideoencoder.h>
#include <gst/video/gstbasevideoutils.h>
/* FIXME: Undef HAVE_CONFIG_H because vpx_codec.h uses it, /* FIXME: Undef HAVE_CONFIG_H because vpx_codec.h uses it,
* which causes compilation failures */ * which causes compilation failures */

1
gst-libs/gst/video/Makefile.am
View file

@ -11,7 +11,6 @@ libgstbasevideo_@GST_MAJORMINOR@_la_SOURCES = \
libgstbasevideo_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video libgstbasevideo_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video
libgstbasevideo_@GST_MAJORMINOR@include_HEADERS = \ libgstbasevideo_@GST_MAJORMINOR@include_HEADERS = \
gstbasevideoutils.h \
gstbasevideocodec.h \ gstbasevideocodec.h \
gstbasevideodecoder.h \ gstbasevideodecoder.h \
gstbasevideoencoder.h gstbasevideoencoder.h

64
gst-libs/gst/video/gstbasevideocodec.h
View file

@ -26,7 +26,8 @@
#endif #endif
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/video/gstbasevideoutils.h> #include <gst/base/gstadapter.h>
#include <gst/video/video.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -78,9 +79,60 @@ G_BEGIN_DECLS
*/ */
#define GST_BASE_VIDEO_CODEC_FLOW_NEED_DATA GST_FLOW_CUSTOM_SUCCESS #define GST_BASE_VIDEO_CODEC_FLOW_NEED_DATA GST_FLOW_CUSTOM_SUCCESS
typedef struct _GstVideoState GstVideoState;
typedef struct _GstVideoFrame GstVideoFrame;
typedef struct _GstBaseVideoCodec GstBaseVideoCodec; typedef struct _GstBaseVideoCodec GstBaseVideoCodec;
typedef struct _GstBaseVideoCodecClass GstBaseVideoCodecClass; typedef struct _GstBaseVideoCodecClass GstBaseVideoCodecClass;
struct _GstVideoState
{
GstVideoFormat format;
int width, height;
int fps_n, fps_d;
int par_n, par_d;
gboolean have_interlaced;
gboolean interlaced;
gboolean top_field_first;
int clean_width, clean_height;
int clean_offset_left, clean_offset_top;
int bytes_per_picture;
//GstSegment segment;
int picture_number;
GstBuffer *codec_data;
};
struct _GstVideoFrame
{
GstClockTime decode_timestamp;
GstClockTime presentation_timestamp;
GstClockTime presentation_duration;
gint system_frame_number;
gint decode_frame_number;
gint presentation_frame_number;
int distance_from_sync;
gboolean is_sync_point;
gboolean is_eos;
GstBuffer *sink_buffer;
GstBuffer *src_buffer;
int field_index;
int n_fields;
void *coder_hook;
GstClockTime deadline;
gboolean force_keyframe;
};
struct _GstBaseVideoCodec struct _GstBaseVideoCodec
{ {
GstElement element; GstElement element;
@ -127,6 +179,16 @@ GstVideoFrame * gst_base_video_codec_new_frame (GstBaseVideoCodec *base_video_co
void gst_base_video_codec_free_frame (GstVideoFrame *frame); void gst_base_video_codec_free_frame (GstVideoFrame *frame);
gboolean gst_base_video_rawvideo_convert (GstVideoState *state,
GstFormat src_format, gint64 src_value,
GstFormat * dest_format, gint64 *dest_value);
gboolean gst_base_video_encoded_video_convert (GstVideoState *state,
GstFormat src_format, gint64 src_value,
GstFormat * dest_format, gint64 *dest_value);
GstClockTime gst_video_state_get_timestamp (const GstVideoState *state,
GstSegment *segment, int frame_number);
G_END_DECLS G_END_DECLS
#endif #endif

1
gst-libs/gst/video/gstbasevideoencoder.c
View file

@ -22,7 +22,6 @@
#endif #endif
#include "gstbasevideoencoder.h" #include "gstbasevideoencoder.h"
#include "gstbasevideoutils.h"
GST_DEBUG_CATEGORY (basevideoencoder_debug); GST_DEBUG_CATEGORY (basevideoencoder_debug);
#define GST_CAT_DEFAULT basevideoencoder_debug #define GST_CAT_DEFAULT basevideoencoder_debug

1
gst-libs/gst/video/gstbasevideoencoder.h
View file

@ -26,7 +26,6 @@
#endif #endif
#include <gst/video/gstbasevideocodec.h> #include <gst/video/gstbasevideocodec.h>
#include <gst/video/gstbasevideoutils.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
gst-libs/gst/video/gstbasevideoutils.c
View file

@ -21,7 +21,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include "gstbasevideoutils.h" #include "gstbasevideocodec.h"
#include <string.h> #include <string.h>

101
gst-libs/gst/video/gstbasevideoutils.h
View file

@ -1,101 +0,0 @@
/* GStreamer
* Copyright (C) 2008 David Schleef <ds@schleef.org>
*
* 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_VIDEO_UTILS_H_
#define _GST_BASE_VIDEO_UTILS_H_
#ifndef GST_USE_UNSTABLE_API
#warning "The base video utils API is unstable and may change in future."
#warning "You can define GST_USE_UNSTABLE_API to avoid this warning."
#endif
#include <gst/gst.h>
#include <gst/video/video.h>
#include <gst/base/gstadapter.h>
G_BEGIN_DECLS
typedef struct _GstVideoState GstVideoState;
typedef struct _GstVideoFrame GstVideoFrame;
struct _GstVideoState
{
GstVideoFormat format;
int width, height;
int fps_n, fps_d;
int par_n, par_d;
gboolean have_interlaced;
gboolean interlaced;
gboolean top_field_first;
int clean_width, clean_height;
int clean_offset_left, clean_offset_top;
int bytes_per_picture;
//GstSegment segment;
int picture_number;
GstBuffer *codec_data;
};
struct _GstVideoFrame
{
GstClockTime decode_timestamp;
GstClockTime presentation_timestamp;
GstClockTime presentation_duration;
gint system_frame_number;
gint decode_frame_number;
gint presentation_frame_number;
int distance_from_sync;
gboolean is_sync_point;
gboolean is_eos;
GstBuffer *sink_buffer;
GstBuffer *src_buffer;
int field_index;
int n_fields;
void *coder_hook;
GstClockTime deadline;
gboolean force_keyframe;
};
gboolean gst_base_video_rawvideo_convert (GstVideoState *state,
GstFormat src_format, gint64 src_value,
GstFormat * dest_format, gint64 *dest_value);
gboolean gst_base_video_encoded_video_convert (GstVideoState *state,
GstFormat src_format, gint64 src_value,
GstFormat * dest_format, gint64 *dest_value);
GstClockTime gst_video_state_get_timestamp (const GstVideoState *state,
GstSegment *segment, int frame_number);
GstBuffer *gst_adapter_get_buffer (GstAdapter *adapter);
G_END_DECLS
#endif