Skip to content

F
ffmpeg.wasm-core
Commit 7d43fbe3 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '45ff7c93' 

* commit '45ff7c93':
  dca: K&R formatting cosmetics

Conflicts:
	libavcodec/dca_parser.c
	libavcodec/dcadec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9bf260b2 45ff7c93
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7952 additions and 7979 deletions
libavcodec/dca.c
View file @ 7d43fbe3
......@@ -30,8 +30,7 @@
#include "dca.h"
#include "put_bits.h"
const uint32_t avpriv_dca_sample_rates[16] =
{
const uint32_t avpriv_dca_sample_rates[16] = {
0, 8000, 16000, 32000, 0, 0, 11025, 22050, 44100, 0, 0,
12000, 24000, 48000, 96000, 192000
};
......
libavcodec/dca_parser.c
View file @ 7d43fbe3
......@@ -22,9 +22,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "parser.h"
#include "dca.h"
#include "get_bits.h"
#include "parser.h"
typedef struct DCAParseContext {
ParseContext pc;
......@@ -35,15 +35,15 @@ typedef struct DCAParseContext {
} DCAParseContext;
#define IS_MARKER(state, i, buf, buf_size) \
((state == DCA_MARKER_14B_LE && (i < buf_size-2) && (buf[i+1] & 0xF0) == 0xF0 && buf[i+2] == 0x07) \
|| (state == DCA_MARKER_14B_BE && (i < buf_size-2) && buf[i+1] == 0x07 && (buf[i+2] & 0xF0) == 0xF0) \
|| state == DCA_MARKER_RAW_LE || state == DCA_MARKER_RAW_BE || state == DCA_HD_MARKER)
((state == DCA_MARKER_14B_LE && (i < buf_size - 2) && (buf[i + 1] & 0xF0) == 0xF0 && buf[i + 2] == 0x07) || \
(state == DCA_MARKER_14B_BE && (i < buf_size - 2) && buf[i + 1] == 0x07 && (buf[i + 2] & 0xF0) == 0xF0) || \
state == DCA_MARKER_RAW_LE || state == DCA_MARKER_RAW_BE || state == DCA_HD_MARKER)
/**
* Find the end of the current frame in the bitstream.
* @return the position of the first byte of the next frame, or -1
*/
static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
static int dca_find_frame_end(DCAParseContext *pc1, const uint8_t *buf,
int buf_size)
{
int start_found, i;
......@@ -51,7 +51,7 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
ParseContext *pc = &pc1->pc;
start_found = pc->frame_start_found;
state = pc->state;
state = pc->state;
i = 0;
if (!start_found) {
......@@ -59,7 +59,7 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
state = (state << 8) | buf[i];
if (IS_MARKER(state, i, buf, buf_size)) {
if (!pc1->lastmarker || state == pc1->lastmarker || pc1->lastmarker == DCA_HD_MARKER) {
start_found = 1;
start_found = 1;
pc1->lastmarker = state;
i++;
break;
......@@ -74,21 +74,21 @@ static int dca_find_frame_end(DCAParseContext * pc1, const uint8_t * buf,
if (state == DCA_HD_MARKER && !pc1->hd_pos)
pc1->hd_pos = pc1->size;
if (IS_MARKER(state, i, buf, buf_size) && (state == pc1->lastmarker || pc1->lastmarker == DCA_HD_MARKER)) {
if(pc1->framesize > pc1->size)
if (pc1->framesize > pc1->size)
continue;
pc->frame_start_found = 0;
pc->state = -1;
pc1->size = 0;
pc->state = -1;
pc1->size = 0;
return i - 3;
}
}
}
pc->frame_start_found = start_found;
pc->state = state;
pc->state = state;
return END_NOT_FOUND;
}
static av_cold int dca_parse_init(AVCodecParserContext * s)
static av_cold int dca_parse_init(AVCodecParserContext *s)
{
DCAParseContext *pc1 = s->priv_data;
......@@ -122,7 +122,7 @@ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
return AVERROR_INVALIDDATA;
skip_bits(&gb, 6);
sr_code = get_bits(&gb, 4);
sr_code = get_bits(&gb, 4);
*sample_rate = avpriv_dca_sample_rates[sr_code];
if (*sample_rate == 0)
return AVERROR_INVALIDDATA;
......@@ -130,10 +130,9 @@ static int dca_parse_params(const uint8_t *buf, int buf_size, int *duration,
return 0;
}
static int dca_parse(AVCodecParserContext * s,
AVCodecContext * avctx,
const uint8_t ** poutbuf, int *poutbuf_size,
const uint8_t * buf, int buf_size)
static int dca_parse(AVCodecParserContext *s, AVCodecContext *avctx,
const uint8_t **poutbuf, int *poutbuf_size,
const uint8_t *buf, int buf_size)
{
DCAParseContext *pc1 = s->priv_data;
ParseContext *pc = &pc1->pc;
......@@ -145,7 +144,7 @@ static int dca_parse(AVCodecParserContext * s,
next = dca_find_frame_end(pc1, buf, buf_size);
if (ff_combine_frame(pc, next, &buf, &buf_size) < 0) {
*poutbuf = NULL;
*poutbuf = NULL;
*poutbuf_size = 0;
return buf_size;
}
......@@ -153,12 +152,12 @@ static int dca_parse(AVCodecParserContext * s,
/* read the duration and sample rate from the frame header */
if (!dca_parse_params(buf, buf_size, &duration, &sample_rate, &pc1->framesize)) {
s->duration = duration;
s->duration = duration;
avctx->sample_rate = sample_rate;
} else
s->duration = 0;
*poutbuf = buf;
*poutbuf = buf;
*poutbuf_size = buf_size;
return next;
}
......
libavcodec/dcadata.h
View file @ 7d43fbe3
This diff is collapsed.
libavcodec/dcadec.c
View file @ 7d43fbe3
This diff is collapsed.
libavcodec/dcadsp.c
View file @ 7d43fbe3
......@@ -20,8 +20,10 @@
*/
#include "config.h"
#include "libavutil/attributes.h"
#include "libavutil/intreadwrite.h"
#include "dcadsp.h"
static void decode_hf_c(float dst[DCA_SUBBANDS][8],
......@@ -42,9 +44,8 @@ static void decode_hf_c(float dst[DCA_SUBBANDS][8],
}
}
static inline void
dca_lfe_fir(float *out, const float *in, const float *coefs,
int decifactor)
static inline void dca_lfe_fir(float *out, const float *in, const float *coefs,
int decifactor)
{
float *out2 = out + 2 * decifactor - 1;
int num_coeffs = 256 / decifactor;
......@@ -55,7 +56,7 @@ dca_lfe_fir(float *out, const float *in, const float *coefs,
float v0 = 0.0;
float v1 = 0.0;
for (j = 0; j < num_coeffs; j++, coefs++) {
v0 += in[-j] * *coefs;
v0 += in[-j] * *coefs;
v1 += in[j + 1 - num_coeffs] * *coefs;
}
*out++ = v0;
......@@ -86,7 +87,8 @@ static void dca_qmf_32_subbands(float samples_in[32][8], int sb_act,
}
synth->synth_filter_float(imdct, synth_buf_ptr, synth_buf_offset,
synth_buf2, window, samples_out, raXin, scale);
synth_buf2, window, samples_out, raXin,
scale);
samples_out += 32;
}
}
......@@ -103,10 +105,13 @@ static void dca_lfe_fir1_c(float *out, const float *in, const float *coefs)
av_cold void ff_dcadsp_init(DCADSPContext *s)
{
s->lfe_fir[0] = dca_lfe_fir0_c;
s->lfe_fir[1] = dca_lfe_fir1_c;
s->lfe_fir[0] = dca_lfe_fir0_c;
s->lfe_fir[1] = dca_lfe_fir1_c;
s->qmf_32_subbands = dca_qmf_32_subbands;
s->decode_hf = decode_hf_c;
if (ARCH_ARM) ff_dcadsp_init_arm(s);
if (ARCH_X86) ff_dcadsp_init_x86(s);
s->decode_hf = decode_hf_c;
if (ARCH_ARM)
ff_dcadsp_init_arm(s);
if (ARCH_X86)
ff_dcadsp_init_x86(s);
}
libavcodec/dcahuff.h
View file @ 7d43fbe3
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment