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

fdkaac: Syntax tweaks to increase readability

Browse Source 
Mostly move some assignments out of conditionals that gst-indent
completely destroys.
This commit is contained in:
Jan Alexander Steffens (heftig) 2018-12-05 01:29:18 +01:00 committed by Sebastian Dröge
parent c5a17000b6
commit f964fb38b6
2 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ext/fdkaac/gstfdkaacdec.c
View File

@ -151,9 +151,8 @@ gst_fdkaacdec_set_format (GstAudioDecoder * dec, GstCaps * caps)
gst_buffer_unref (codec_data); gst_buffer_unref (codec_data);
} }
if ((err = err = aacDecoder_SetParam (self->dec, AAC_PCM_MAX_OUTPUT_CHANNELS, 0);
aacDecoder_SetParam (self->dec, AAC_PCM_MAX_OUTPUT_CHANNELS, if (err != AAC_DEC_OK) {
0)) != AAC_DEC_OK) {
GST_ERROR_OBJECT (self, "Failed to disable downmixing: %d", err); GST_ERROR_OBJECT (self, "Failed to disable downmixing: %d", err);
return FALSE; return FALSE;
} }
@ -161,9 +160,8 @@ gst_fdkaacdec_set_format (GstAudioDecoder * dec, GstCaps * caps)
/* Choose WAV channel mapping to get interleaving even with libfdk-aac 2.0.0 /* Choose WAV channel mapping to get interleaving even with libfdk-aac 2.0.0
* The pChannelIndices retain the indices from the standard MPEG mapping so * The pChannelIndices retain the indices from the standard MPEG mapping so
* we're agnostic to the actual order. */ * we're agnostic to the actual order. */
if ((err = err = aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_CHANNEL_MAPPING, 1);
aacDecoder_SetParam (self->dec, AAC_PCM_OUTPUT_CHANNEL_MAPPING, if (err != AAC_DEC_OK) {
1)) != AAC_DEC_OK) {
GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err); GST_ERROR_OBJECT (self, "Failed to set output channel mapping: %d", err);
return FALSE; return FALSE;
} }
@ -197,28 +195,27 @@ gst_fdkaacdec_handle_frame (GstAudioDecoder * dec, GstBuffer * inbuf)
gst_buffer_map (inbuf, &imap, GST_MAP_READ); gst_buffer_map (inbuf, &imap, GST_MAP_READ);
valid = size = imap.size; valid = size = imap.size;
if ((err = err = aacDecoder_Fill (self->dec, (guint8 **) & imap.data, &size, &valid);
aacDecoder_Fill (self->dec, (guint8 **) & imap.data, &size, if (err != AAC_DEC_OK) {
&valid)) != AAC_DEC_OK) {
GST_AUDIO_DECODER_ERROR (self, 1, STREAM, DECODE, (NULL), GST_AUDIO_DECODER_ERROR (self, 1, STREAM, DECODE, (NULL),
("filling error: %d", err), ret); ("filling error: %d", err), ret);
goto out; goto out;
} }
if (GST_BUFFER_IS_DISCONT (inbuf)) if (GST_BUFFER_IS_DISCONT (inbuf)) {
flags |= AACDEC_INTR; flags |= AACDEC_INTR;
}
} else { } else {
flags |= AACDEC_FLUSH; flags |= AACDEC_FLUSH;
} }
if ((err = err = aacDecoder_DecodeFrame (self->dec, self->decode_buffer,
aacDecoder_DecodeFrame (self->dec, self->decode_buffer, self->decode_buffer_size, flags);
self->decode_buffer_size, flags)) != AAC_DEC_OK) { if (err == AAC_DEC_TRANSPORT_SYNC_ERROR) {
if (err == AAC_DEC_TRANSPORT_SYNC_ERROR) { ret = GST_FLOW_OK;
ret = GST_FLOW_OK; outbuf = NULL;
outbuf = NULL; goto finish;
goto finish; } else if (err != AAC_DEC_OK) {
}
GST_AUDIO_DECODER_ERROR (self, 1, STREAM, DECODE, (NULL), GST_AUDIO_DECODER_ERROR (self, 1, STREAM, DECODE, (NULL),
("decoding error: %d", err), ret); ("decoding error: %d", err), ret);
goto out; goto out;
@ -423,9 +420,9 @@ gst_fdkaacdec_flush (GstAudioDecoder * dec, gboolean hard)
if (self->dec) { if (self->dec) {
AAC_DECODER_ERROR err; AAC_DECODER_ERROR err;
if ((err = err = aacDecoder_DecodeFrame (self->dec, self->decode_buffer,
aacDecoder_DecodeFrame (self->dec, self->decode_buffer, self->decode_buffer_size, AACDEC_FLUSH);
self->decode_buffer_size, AACDEC_FLUSH)) != AAC_DEC_OK) { if (err != AAC_DEC_OK) {
GST_ERROR_OBJECT (self, "flushing error: %d", err); GST_ERROR_OBJECT (self, "flushing error: %d", err);
} }
} }

14
ext/fdkaac/gstfdkaacenc.c
View File

@ -346,9 +346,8 @@ gst_fdkaacenc_set_format (GstAudioEncoder * enc, GstAudioInfo * info)
if (allowed_caps) if (allowed_caps)
gst_caps_unref (allowed_caps); gst_caps_unref (allowed_caps);
if ((err = err = aacEncOpen (&self->enc, 0, GST_AUDIO_INFO_CHANNELS (info));
aacEncOpen (&self->enc, 0, if (err != AACENC_OK) {
GST_AUDIO_INFO_CHANNELS (info))) != AACENC_OK) {
GST_ERROR_OBJECT (self, "Unable to open encoder: %d\n", err); GST_ERROR_OBJECT (self, "Unable to open encoder: %d\n", err);
return FALSE; return FALSE;
} }
@ -583,11 +582,10 @@ gst_fdkaacenc_handle_frame (GstAudioEncoder * enc, GstBuffer * inbuf)
out_desc.bufSizes = &out_sizes; out_desc.bufSizes = &out_sizes;
out_desc.bufElSizes = &out_el_sizes; out_desc.bufElSizes = &out_el_sizes;
if ((err = aacEncEncode (self->enc, &in_desc, &out_desc, &in_args, err = aacEncEncode (self->enc, &in_desc, &out_desc, &in_args, &out_args);
&out_args)) != AACENC_OK) { if (err == AACENC_ENCODE_EOF && !inbuf)
if (!inbuf && err == AACENC_ENCODE_EOF) goto out;
goto out; else if (err != AACENC_OK) {
GST_ERROR_OBJECT (self, "Failed to encode data: %d", err); GST_ERROR_OBJECT (self, "Failed to encode data: %d", err);
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
goto out; goto out;