mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-02 12:32:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

celt: Port to 0.7 API

Browse source 
Fixes bug #600724.
This commit is contained in:
Sebastian Dröge 2009-11-11 10:58:29 +01:00
parent 5df4c86c17
commit aa0795d6c2
2 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ext/celt/gstceltdec.c
View file

@ -497,14 +497,24 @@ celt_dec_chain_parse_header (GstCeltDec * dec, GstBuffer * buf)
if (memcmp (dec->header.codec_id, "CELT ", 8) != 0)
goto invalid_header;
#ifdef HAVE_CELT_0_7
dec->mode =
celt_mode_create (dec->header.sample_rate,
dec->header.frame_size, &error);
#else
dec->mode =
celt_mode_create (dec->header.sample_rate, dec->header.nb_channels,
dec->header.frame_size, &error);
#endif
if (!dec->mode)
goto mode_init_failed;
/* initialize the decoder */
#ifdef HAVE_CELT_0_7
dec->state = celt_decoder_create (dec->mode, dec->header.nb_channels, &error);
#else
dec->state = celt_decoder_create (dec->mode);
#endif
if (!dec->state)
goto init_failed;
@ -545,8 +555,13 @@ mode_init_failed:
}
init_failed:
{
#ifdef HAVE_CELT_0_7
GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE,
(NULL), ("couldn't initialize decoder: %d", error));
#else
GST_ELEMENT_ERROR (GST_ELEMENT (dec), STREAM, DECODE,
(NULL), ("couldn't initialize decoder"));
#endif
return GST_FLOW_ERROR;
}
nego_failed:

16
ext/celt/gstceltenc.c
View file

@ -591,17 +591,29 @@ gst_celt_enc_setup (GstCeltEnc * enc)
enc->setup = FALSE;
#ifdef HAVE_CELT_0_7
enc->mode = celt_mode_create (enc->rate, enc->frame_size, &error);
#else
enc->mode =
celt_mode_create (enc->rate, enc->channels, enc->frame_size, &error);
#endif
if (!enc->mode)
goto mode_initialization_failed;
celt_mode_info (enc->mode, CELT_GET_FRAME_SIZE, &enc->frame_size);
#ifdef HAVE_CELT_0_7
celt_header_init (&enc->header, enc->mode, enc->channels);
#else
celt_header_init (&enc->header, enc->mode);
#endif
enc->header.nb_channels = enc->channels;
#ifdef HAVE_CELT_0_7
enc->state = celt_encoder_create (enc->mode, enc->channels, &error);
#else
enc->state = celt_encoder_create (enc->mode);
#endif
if (!enc->state)
goto encoder_creation_failed;
@ -624,7 +636,11 @@ mode_initialization_failed:
return FALSE;
encoder_creation_failed:
#ifdef HAVE_CELT_0_7
GST_ERROR_OBJECT (enc, "Encoder creation failed: %d", error);
#else
GST_ERROR_OBJECT (enc, "Encoder creation failed");
#endif
return FALSE;
}