FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

voaacenc: Some minor cleanup

Browse Source
This commit is contained in:
Sebastian Dröge 2011-04-19 09:40:48 +02:00
parent 55d8c52640
commit 41bb35f38c
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ext/voaacenc/gstvoaacenc.c
View File

@ -42,8 +42,6 @@
#include "gstvoaacenc.h" #include "gstvoaacenc.h"
#define VOAAC_ENC_DEFAULT_BITRATE (128000) #define VOAAC_ENC_DEFAULT_BITRATE (128000)
#define VOAAC_ENC_DEFAULT_CHANNELS (2)
#define VOAAC_ENC_DEFAULT_RATE (44100)
#define VOAAC_ENC_DEFAULT_OUTPUTFORMAT (0) /* RAW */ #define VOAAC_ENC_DEFAULT_OUTPUTFORMAT (0) /* RAW */
#define VOAAC_ENC_MPEGVERSION (4) #define VOAAC_ENC_MPEGVERSION (4)
#define VOAAC_ENC_CODECDATA_LEN (2) #define VOAAC_ENC_CODECDATA_LEN (2)
@ -233,8 +231,6 @@ gst_voaacenc_init (GstVoAacEnc * voaacenc, GstVoAacEncClass * klass)
voaacenc->adapter = gst_adapter_new (); voaacenc->adapter = gst_adapter_new ();
voaacenc->bitrate = VOAAC_ENC_DEFAULT_BITRATE; voaacenc->bitrate = VOAAC_ENC_DEFAULT_BITRATE;
voaacenc->rate = VOAAC_ENC_DEFAULT_RATE;
voaacenc->channels = VOAAC_ENC_DEFAULT_CHANNELS;
voaacenc->output_format = VOAAC_ENC_DEFAULT_OUTPUTFORMAT; voaacenc->output_format = VOAAC_ENC_DEFAULT_OUTPUTFORMAT;
/* init rest */ /* init rest */
@ -283,17 +279,15 @@ gst_voaacenc_negotiate (GstVoAacEnc * voaacenc)
voaacenc->output_format = 0; voaacenc->output_format = 0;
} else { } else {
GST_DEBUG_OBJECT (voaacenc, "unknown stream-format: %s", str); GST_DEBUG_OBJECT (voaacenc, "unknown stream-format: %s", str);
voaacenc->output_format = 0; voaacenc->output_format = VOAAC_ENC_DEFAULT_OUTPUTFORMAT;
} }
} }
} }
if (caps) if (caps)
gst_caps_unref (caps); gst_caps_unref (caps);
} }
static GstCaps * static GstCaps *
gst_voaacenc_generate_sink_caps (void) gst_voaacenc_generate_sink_caps (void)
{ {
@ -400,7 +394,6 @@ gst_voaacenc_chain (GstPad * pad, GstBuffer * buffer)
* encoder flag to mask the discont. */ * encoder flag to mask the discont. */
if (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DISCONT)) { if (GST_BUFFER_FLAG_IS_SET (buffer, GST_BUFFER_FLAG_DISCONT)) {
gst_adapter_clear (voaacenc->adapter); gst_adapter_clear (voaacenc->adapter);
voaacenc->ts = 0;
voaacenc->discont = TRUE; voaacenc->discont = TRUE;
} }
@ -461,8 +454,6 @@ gst_voaacenc_chain (GstPad * pad, GstBuffer * buffer)
GST_FRAMES_TO_CLOCK_TIME (voaacenc->inbuf_size / voaacenc->channels / GST_FRAMES_TO_CLOCK_TIME (voaacenc->inbuf_size / voaacenc->channels /
VOAAC_ENC_BITS_PER_SAMPLE, voaacenc->rate); VOAAC_ENC_BITS_PER_SAMPLE, voaacenc->rate);
voaacenc->ts = GST_BUFFER_TIMESTAMP (out) + GST_BUFFER_DURATION (out);
GST_LOG_OBJECT (voaacenc, "Pushing out buffer time: %" GST_TIME_FORMAT GST_LOG_OBJECT (voaacenc, "Pushing out buffer time: %" GST_TIME_FORMAT
" duration: %" GST_TIME_FORMAT, " duration: %" GST_TIME_FORMAT,
GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (out)), GST_TIME_ARGS (GST_BUFFER_TIMESTAMP (out)),
@ -504,7 +495,6 @@ gst_voaacenc_state_change (GstElement * element, GstStateChange transition)
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
voaacenc->rate = 0; voaacenc->rate = 0;
voaacenc->channels = 0; voaacenc->channels = 0;
voaacenc->ts = 0;
voaacenc->discont = FALSE; voaacenc->discont = FALSE;
gst_adapter_clear (voaacenc->adapter); gst_adapter_clear (voaacenc->adapter);
break; break;
@ -533,7 +523,6 @@ gst_voaacenc_create_source_pad_caps (GstVoAacEnc * voaacenc)
gint index; gint index;
if ((index = voaacenc_get_rate_index (voaacenc->rate)) >= 0) { if ((index = voaacenc_get_rate_index (voaacenc->rate)) >= 0) {
caps = gst_caps_new_simple ("audio/mpeg", caps = gst_caps_new_simple ("audio/mpeg",
"mpegversion", G_TYPE_INT, VOAAC_ENC_MPEGVERSION, "mpegversion", G_TYPE_INT, VOAAC_ENC_MPEGVERSION,
"channels", G_TYPE_INT, voaacenc->channels, "channels", G_TYPE_INT, voaacenc->channels,

4
ext/voaacenc/gstvoaacenc.h
View File

@ -48,14 +48,14 @@ struct _GstVoAacEnc {
/* pads */ /* pads */
GstPad *sinkpad, *srcpad; GstPad *sinkpad, *srcpad;
GstCaps *sinkcaps; GstCaps *sinkcaps;
guint64 ts;
gboolean discont; gboolean discont;
GstAdapter *adapter; GstAdapter *adapter;
/* desired bitrate */ /* desired bitrate */
gint bitrate; gint bitrate;
/* caps */
gint channels; gint channels;
gint rate; gint rate;
gint output_format; gint output_format;