mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

androidmedia: Make everything compile with the new wrappers

Browse source
This commit is contained in:
Sebastian Dröge 2012-12-13 17:40:04 +00:00 committed by Nicolas Dufresne
parent ade8590778
commit e3801c041f
2 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
sys/androidmedia/gst-android-media-mediacodec.c
View file

@ -275,18 +275,25 @@ gst_am_mediacodec_flush (GstAmMediaCodec * self)
} }
void void
gst_am_mediacodec_release (GstAmMediaCodec * self) gst_am_mediacodec_free (GstAmMediaCodec * self)
{ {
JNIEnv *env = gst_dvm_get_env (); JNIEnv *env = gst_dvm_get_env ();
AMMC_CALL (, Void, release);
(*env)->DeleteGlobalRef (env, self->object); (*env)->DeleteGlobalRef (env, self->object);
g_slice_free (GstAmMediaCodec, self); g_slice_free (GstAmMediaCodec, self);
} }
void void
gst_am_mediacodec_free_buffers (GstAmcBuffer * buffers, gsize n_buffers) gst_am_mediacodec_release (GstAmMediaCodec * self)
{
JNIEnv *env = gst_dvm_get_env ();
AMMC_CALL (, Void, release);
}
void
gst_am_mediacodec_free_buffers (GstAmMediaCodecBuffer * buffers,
gsize n_buffers)
{ {
JNIEnv *env = gst_dvm_get_env (); JNIEnv *env = gst_dvm_get_env ();
jsize i; jsize i;
@ -298,13 +305,13 @@ gst_am_mediacodec_free_buffers (GstAmcBuffer * buffers, gsize n_buffers)
g_free (buffers); g_free (buffers);
} }
GstAmcBuffer * GstAmMediaCodecBuffer *
gst_am_mediacodec_get_output_buffers (GstAmMediaCodec * self, gsize * n_buffers) gst_am_mediacodec_get_output_buffers (GstAmMediaCodec * self, gsize * n_buffers)
{ {
JNIEnv *env = gst_dvm_get_env (); JNIEnv *env = gst_dvm_get_env ();
jobject output_buffers = NULL; jobject output_buffers = NULL;
jsize n_output_buffers; jsize n_output_buffers;
GstAmcBuffer *ret = NULL; GstAmMediaCodecBuffer *ret = NULL;
jsize i; jsize i;
*n_buffers = 0; *n_buffers = 0;
@ -320,7 +327,7 @@ gst_am_mediacodec_get_output_buffers (GstAmMediaCodec * self, gsize * n_buffers)
} }
*n_buffers = n_output_buffers; *n_buffers = n_output_buffers;
ret = g_new0 (GstAmcBuffer, n_output_buffers); ret = g_new0 (GstAmMediaCodecBuffer, n_output_buffers);
for (i = 0; i < n_output_buffers; i++) { for (i = 0; i < n_output_buffers; i++) {
jobject buffer = NULL; jobject buffer = NULL;
@ -363,13 +370,13 @@ error:
goto done; goto done;
} }
GstAmcBuffer * GstAmMediaCodecBuffer *
gst_am_mediacodec_get_input_buffers (GstAmMediaCodec * self, gsize * n_buffers) gst_am_mediacodec_get_input_buffers (GstAmMediaCodec * self, gsize * n_buffers)
{ {
JNIEnv *env = gst_dvm_get_env (); JNIEnv *env = gst_dvm_get_env ();
jobject input_buffers = NULL; jobject input_buffers = NULL;
jsize n_input_buffers; jsize n_input_buffers;
GstAmcBuffer *ret = NULL; GstAmMediaCodecBuffer *ret = NULL;
jsize i; jsize i;
*n_buffers = 0; *n_buffers = 0;
@ -386,7 +393,7 @@ gst_am_mediacodec_get_input_buffers (GstAmMediaCodec * self, gsize * n_buffers)
} }
*n_buffers = n_input_buffers; *n_buffers = n_input_buffers;
ret = g_new0 (GstAmcBuffer, n_input_buffers); ret = g_new0 (GstAmMediaCodecBuffer, n_input_buffers);
for (i = 0; i < n_input_buffers; i++) { for (i = 0; i < n_input_buffers; i++) {
jobject buffer = NULL; jobject buffer = NULL;
@ -446,7 +453,8 @@ gst_am_mediacodec_dequeue_input_buffer (GstAmMediaCodec * self,
android_media_mediacodec_bufferinfo, field); android_media_mediacodec_bufferinfo, field);
static gboolean static gboolean
_fill_buffer_info (JNIEnv * env, jobject buffer_info, GstAmmcBufferInfo * info) _fill_buffer_info (JNIEnv * env, jobject buffer_info,
GstAmMediaCodecBufferInfo * info)
{ {
info->flags = AMMCBI_FIELD (return FALSE, Int, flags); info->flags = AMMCBI_FIELD (return FALSE, Int, flags);
info->offset = AMMCBI_FIELD (return FALSE, Int, offset); info->offset = AMMCBI_FIELD (return FALSE, Int, offset);
@ -459,7 +467,7 @@ _fill_buffer_info (JNIEnv * env, jobject buffer_info, GstAmmcBufferInfo * info)
gint gint
gst_am_mediacodec_dequeue_output_buffer (GstAmMediaCodec * self, gst_am_mediacodec_dequeue_output_buffer (GstAmMediaCodec * self,
GstAmmcBufferInfo * info, gint64 timeoutUs) GstAmMediaCodecBufferInfo * info, gint64 timeoutUs)
{ {
JNIEnv *env = gst_dvm_get_env (); JNIEnv *env = gst_dvm_get_env ();
gint ret = G_MININT; gint ret = G_MININT;
@ -492,7 +500,7 @@ error:
gboolean gboolean
gst_am_mediacodec_queue_input_buffer (GstAmMediaCodec * self, gint index, gst_am_mediacodec_queue_input_buffer (GstAmMediaCodec * self, gint index,
const GstAmmcBufferInfo * info) const GstAmMediaCodecBufferInfo * info)
{ {
JNIEnv *env = gst_dvm_get_env (); JNIEnv *env = gst_dvm_get_env ();

20
sys/androidmedia/gst-android-media-mediacodec.h
View file

@ -29,18 +29,18 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef struct _GstAmcBuffer GstAmcBuffer; typedef struct _GstAmMediaCodecBuffer GstAmMediaCodecBuffer;
typedef struct _GstAmmcBufferInfo GstAmmcBufferInfo; typedef struct _GstAmMediaCodecBufferInfo GstAmMediaCodecBufferInfo;
typedef struct _GstAmMediaCodec GstAmMediaCodec; typedef struct _GstAmMediaCodec GstAmMediaCodec;
struct _GstAmcBuffer { struct _GstAmMediaCodecBuffer {
guint8 *data; guint8 *data;
gsize size; gsize size;
/*< private >*/ /*< private >*/
jobject object; /* global reference */ jobject object; /* global reference */
}; };
struct _GstAmmcBufferInfo { struct _GstAmMediaCodecBufferInfo {
gint flags; gint flags;
gint offset; gint offset;
gint64 presentation_time_us; gint64 presentation_time_us;
@ -72,21 +72,23 @@ GstAmMediaCodec * gst_am_mediacodec_create_by_codec_name (const gchar *name);
GstAmMediaCodec * gst_am_mediacodec_create_decoder_by_type (const gchar *type); GstAmMediaCodec * gst_am_mediacodec_create_decoder_by_type (const gchar *type);
GstAmMediaCodec * gst_am_mediacodec_create_encoder_by_type (const gchar *type); GstAmMediaCodec * gst_am_mediacodec_create_encoder_by_type (const gchar *type);
void gst_am_mediacodec_free (GstAmMediaCodec * self);
gint gst_am_mediacodec_dequeue_input_buffer (GstAmMediaCodec * self, gint gst_am_mediacodec_dequeue_input_buffer (GstAmMediaCodec * self,
gint64 timeoutUs); gint64 timeoutUs);
gint gst_am_mediacodec_dequeue_output_buffer (GstAmMediaCodec * self, gint gst_am_mediacodec_dequeue_output_buffer (GstAmMediaCodec * self,
GstAmmcBufferInfo *info, gint64 timeoutUs); GstAmMediaCodecBufferInfo *info, gint64 timeoutUs);
gboolean gst_am_mediacodec_flush (GstAmMediaCodec * self); gboolean gst_am_mediacodec_flush (GstAmMediaCodec * self);
GstAmcBuffer * gst_am_mediacodec_get_input_buffers (GstAmMediaCodec * self, GstAmMediaCodecBuffer * gst_am_mediacodec_get_input_buffers (GstAmMediaCodec * self,
gsize * n_buffers); gsize * n_buffers);
GstAmcBuffer * gst_am_mediacodec_get_output_buffers (GstAmMediaCodec * self, GstAmMediaCodecBuffer * gst_am_mediacodec_get_output_buffers (GstAmMediaCodec * self,
gsize * n_buffers); gsize * n_buffers);
void gst_am_mediacodec_free_buffers (GstAmcBuffer * buffers, gsize n_buffers); void gst_am_mediacodec_free_buffers (GstAmMediaCodecBuffer * buffers, gsize n_buffers);
GstAmMediaFormat * gst_am_mediacodec_get_output_format (GstAmMediaCodec * self); GstAmMediaFormat * gst_am_mediacodec_get_output_format (GstAmMediaCodec * self);
gboolean gst_am_mediacodec_queue_input_buffer (GstAmMediaCodec * self, gboolean gst_am_mediacodec_queue_input_buffer (GstAmMediaCodec * self,
gint index, const GstAmmcBufferInfo *info); gint index, const GstAmMediaCodecBufferInfo *info);
void gst_am_mediacodec_release (GstAmMediaCodec * self); void gst_am_mediacodec_release (GstAmMediaCodec * self);
gboolean gst_am_mediacodec_release_output_buffer (GstAmMediaCodec * self, gboolean gst_am_mediacodec_release_output_buffer (GstAmMediaCodec * self,
gint index); gint index);