mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-19 22:05:58 +00:00
Code Issues 1 Projects Releases Wiki Activity

[MOVED FROM BAD 013/134] vp8dec: Fix memory leaks and fail if initializing the decoder fails

Browse source
This commit is contained in:
Sebastian Dröge 2010-05-18 14:28:55 +02:00
parent ba0c0c6bbb
commit 087ecc20eb
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ext/vp8/gstvp8dec.c
View file

@ -1,6 +1,7 @@
/* VP8 plugin /* VP8 plugin
* Copyright (C) 2006 David Schleef <ds@schleef.org> * Copyright (C) 2006 David Schleef <ds@schleef.org>
* Copyright (C) 2008,2009,2010 Entropy Wave Inc * Copyright (C) 2008,2009,2010 Entropy Wave Inc
* Copyright (C) 2010 Sebastian Dröge <sebastian.droege@collabora.co.uk>
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public * modify it under the terms of the GNU Library General Public
@ -155,11 +156,7 @@ gst_vp8_dec_class_init (GstVP8DecClass * klass)
static void static void
gst_vp8_dec_init (GstVP8Dec * gst_vp8_dec, GstVP8DecClass * klass) gst_vp8_dec_init (GstVP8Dec * gst_vp8_dec, GstVP8DecClass * klass)
{ {
GST_DEBUG ("gst_vp8_dec_init"); GST_DEBUG ("gst_vp8_dec_init");
//gst_vp8_dec->decoder = ;
} }
static void static void
@ -173,7 +170,6 @@ gst_vp8_dec_finalize (GObject * object)
gst_vp8_dec = GST_VP8_DEC (object); gst_vp8_dec = GST_VP8_DEC (object);
G_OBJECT_CLASS (parent_class)->finalize (object); G_OBJECT_CLASS (parent_class)->finalize (object);
} }
static void static void
@ -212,22 +208,22 @@ gst_vp8_dec_get_property (GObject * object, guint prop_id, GValue * value,
static gboolean static gboolean
gst_vp8_dec_start (GstBaseVideoDecoder * decoder) gst_vp8_dec_start (GstBaseVideoDecoder * decoder)
{ {
int flags = 0;
GstVP8Dec *gst_vp8_dec = GST_VP8_DEC (decoder); GstVP8Dec *gst_vp8_dec = GST_VP8_DEC (decoder);
decoder->packetized = TRUE; decoder->packetized = TRUE;
gst_vp8_dec->decoder_inited = FALSE; gst_vp8_dec->decoder_inited = FALSE;
vpx_codec_dec_init (&gst_vp8_dec->decoder, &vpx_codec_vp8_dx_algo, NULL,
flags);
return TRUE; return TRUE;
} }
static gboolean static gboolean
gst_vp8_dec_stop (GstBaseVideoDecoder * base_video_decoder) gst_vp8_dec_stop (GstBaseVideoDecoder * base_video_decoder)
{ {
GstVP8Dec *gst_vp8_dec = GST_VP8_DEC (base_video_decoder);
if (gst_vp8_dec->decoder_inited)
vpx_codec_destroy (&gst_vp8_dec->decoder);
gst_vp8_dec->decoder_inited = FALSE;
return TRUE; return TRUE;
} }
@ -235,16 +231,15 @@ static gboolean
gst_vp8_dec_reset (GstBaseVideoDecoder * base_video_decoder) gst_vp8_dec_reset (GstBaseVideoDecoder * base_video_decoder)
{ {
GstVP8Dec *decoder; GstVP8Dec *decoder;
int flags = 0;
GST_DEBUG ("reset"); GST_DEBUG ("reset");
decoder = GST_VP8_DEC (base_video_decoder); decoder = GST_VP8_DEC (base_video_decoder);
if (decoder->decoder_inited)
vpx_codec_destroy (&decoder->decoder);
decoder->decoder_inited = FALSE; decoder->decoder_inited = FALSE;
vpx_codec_dec_init (&decoder->decoder, &vpx_codec_vp8_dx_algo, NULL, flags);
return TRUE; return TRUE;
} }
@ -283,6 +278,7 @@ gst_vp8_dec_handle_frame (GstBaseVideoDecoder * decoder, GstVideoFrame * frame)
dec = GST_VP8_DEC (decoder); dec = GST_VP8_DEC (decoder);
if (!dec->decoder_inited) { if (!dec->decoder_inited) {
int flags = 0;
vpx_codec_stream_info_t stream_info; vpx_codec_stream_info_t stream_info;
memset (&stream_info, 0, sizeof (stream_info)); memset (&stream_info, 0, sizeof (stream_info));
@ -302,6 +298,14 @@ gst_vp8_dec_handle_frame (GstBaseVideoDecoder * decoder, GstVideoFrame * frame)
decoder->state.height = stream_info.h; decoder->state.height = stream_info.h;
decoder->state.format = GST_VIDEO_FORMAT_I420; decoder->state.format = GST_VIDEO_FORMAT_I420;
gst_vp8_dec_send_tags (dec); gst_vp8_dec_send_tags (dec);
res =
vpx_codec_dec_init (&dec->decoder, &vpx_codec_vp8_dx_algo, NULL, flags);
if (res != VPX_CODEC_OK) {
GST_ELEMENT_ERROR (dec, LIBRARY, INIT,
("Failed to initialize VP8 decoder"), (NULL));
return GST_FLOW_ERROR;
}
dec->decoder_inited = TRUE; dec->decoder_inited = TRUE;
} }