RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-20 14:56:55 +00:00
Code Issues Releases Wiki Activity

dec_audio: uncrustify

Browse Source
This commit is contained in:
wm4 2013-01-31 10:44:15 +01:00
parent a1be0e1aec
commit bb8da97205
2 changed files with 203 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
audio/decode/dec_audio.c
View File

@ -44,7 +44,8 @@ struct af_cfg af_cfg = { 1, NULL }; // Configuration for audio filters
void afm_help(void)
{
int i;
mp_tmsg(MSGT_DECAUDIO, MSGL_INFO, "Available (compiled-in) audio codec families/drivers:\n");
mp_tmsg(MSGT_DECAUDIO, MSGL_INFO,
"Available (compiled-in) audio codec families/drivers:\n");
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_DRIVERS\n");
mp_msg(MSGT_DECAUDIO, MSGL_INFO, " afm: info: (comment)\n");
for (i = 0; mpcodecs_ad_drivers[i] != NULL; i++)
@ -83,7 +84,8 @@ static int init_audio_codec(sh_audio_t *sh_audio)
/* allocate audio in buffer: */
if (sh_audio->audio_in_minsize > 0) {
sh_audio->a_in_buffer_size = sh_audio->audio_in_minsize;
mp_tmsg(MSGT_DECAUDIO, MSGL_V, "dec_audio: Allocating %d bytes for input buffer.\n",
mp_tmsg(MSGT_DECAUDIO, MSGL_V,
"dec_audio: Allocating %d bytes for input buffer.\n",
sh_audio->a_in_buffer_size);
sh_audio->a_in_buffer = av_mallocz(sh_audio->a_in_buffer_size);
}
@ -92,8 +94,10 @@ static int init_audio_codec(sh_audio_t *sh_audio)
// At least 64 KiB plus rounding up to next decodable unit size
sh_audio->a_buffer_size = base_size + sh_audio->audio_out_minsize;
mp_tmsg(MSGT_DECAUDIO, MSGL_V, "dec_audio: Allocating %d + %d = %d bytes for output buffer.\n",
sh_audio->audio_out_minsize, base_size, sh_audio->a_buffer_size);
mp_tmsg(MSGT_DECAUDIO, MSGL_V,
"dec_audio: Allocating %d + %d = %d bytes for output buffer.\n",
sh_audio->audio_out_minsize, base_size,
sh_audio->a_buffer_size);
sh_audio->a_buffer = av_mallocz(sh_audio->a_buffer_size);
if (!sh_audio->a_buffer)
@ -133,8 +137,7 @@ static int init_audio(sh_audio_t *sh_audio, char *codecname, char *afm,
while (1) {
const ad_functions_t *mpadec;
sh_audio->ad_driver = 0;
if (!(sh_audio->codec = find_audio_codec(sh_audio->format,
NULL,
if (!(sh_audio->codec = find_audio_codec(sh_audio->format, NULL,
sh_audio->codec, force)))
break;
// ok we found one codec
@ -155,8 +158,8 @@ static int init_audio(sh_audio_t *sh_audio, char *codecname, char *afm,
break;
mpadec = mpcodecs_ad_drivers[i];
if (!mpadec) { // driver not available (==compiled in)
mp_tmsg(MSGT_DECAUDIO, MSGL_ERR,
"Requested audio codec family [%s] (afm=%s) not available.\nEnable it at compilation.\n",
mp_tmsg(MSGT_DECAUDIO, MSGL_ERR, "Requested audio codec family "
"[%s] (afm=%s) not available.\nEnable it at compilation.\n",
sh_audio->codec->name, sh_audio->codec->drv);
continue;
}
@ -180,7 +183,9 @@ int init_best_audio_codec(sh_audio_t *sh_audio, char **audio_codec_list,
char **audio_fm_list)
{
stringset_t selected;
char *ac_l_default[2] = { "", (char *) NULL };
char *ac_l_default[2] = {
"", (char *) NULL
};
// hack:
if (!audio_codec_list)
audio_codec_list = ac_l_default;
@ -208,11 +213,13 @@ int init_best_audio_codec(sh_audio_t *sh_audio, char **audio_codec_list,
// try first the preferred codec families:
while (!sh_audio->initialized && *fmlist) {
char *audio_fm = *(fmlist++);
mp_tmsg(MSGT_DECAUDIO, MSGL_INFO, "Trying to force audio codec driver family %s...\n",
mp_tmsg(MSGT_DECAUDIO, MSGL_INFO,
"Trying to force audio codec driver family %s...\n",
audio_fm);
for (status = CODECS_STATUS__MAX;
status >= CODECS_STATUS__MIN; --status)
if (init_audio(sh_audio, NULL, audio_fm, status, &selected))
if (init_audio(sh_audio, NULL, audio_fm, status,
&selected))
break;
}
}
@ -226,7 +233,8 @@ int init_best_audio_codec(sh_audio_t *sh_audio, char **audio_codec_list,
stringset_free(&selected);
if (!sh_audio->initialized) {
mp_tmsg(MSGT_DECAUDIO, MSGL_ERR, "Cannot find codec for audio format 0x%X.\n",
mp_tmsg(MSGT_DECAUDIO, MSGL_ERR,
"Cannot find codec for audio format 0x%X.\n",
sh_audio->format);
return 0; // failed
}
@ -295,7 +303,8 @@ int init_audio_filters(sh_audio_t *sh_audio, int in_samplerate,
// filter config:
memcpy(&afs->cfg, &af_cfg, sizeof(struct af_cfg));
mp_tmsg(MSGT_DECAUDIO, MSGL_V, "Building audio filter chain for %dHz/%dch/%s -> %dHz/%dch/%s...\n",
mp_tmsg(MSGT_DECAUDIO, MSGL_V,
"Building audio filter chain for %dHz/%dch/%s -> %dHz/%dch/%s...\n",
afs->input.rate, afs->input.nch,
af_fmt2str_short(afs->input.format), afs->output.rate,
afs->output.nch, af_fmt2str_short(afs->output.format));
@ -408,8 +417,8 @@ int decode_audio(sh_audio_t *sh_audio, struct bstr *outbuf, int minlen)
max_decode_len -= max_decode_len % unitsize;
while (minlen >= 0 && outbuf->len < minlen) {
int declen = (minlen - outbuf->len) / filter_multiplier
+ (unitsize << 5); // some extra for possible filter buffering
// + some extra for possible filter buffering
int declen = (minlen - outbuf->len) / filter_multiplier + (unitsize << 5);
if (huge_filter_buffer)
/* Some filter must be doing significant buffering if the estimated
* input length didn't produce enough output from filters.
@ -456,8 +465,8 @@ void skip_audio_frame(sh_audio_t *sh_audio)
{
if (!sh_audio->initialized)
return;
if (sh_audio->ad_driver->control(sh_audio, ADCTRL_SKIP_FRAME, NULL) ==
CONTROL_TRUE)
if (sh_audio->ad_driver->control(sh_audio, ADCTRL_SKIP_FRAME, NULL)
== CONTROL_TRUE)
return;
// default skip code:
ds_fill_buffer(sh_audio->ds); // skip block

3
audio/decode/dec_audio.h
View File

@ -25,7 +25,8 @@ struct bstr;
// dec_audio.c:
void afm_help(void);
int init_best_audio_codec(sh_audio_t *sh_audio, char** audio_codec_list, char** audio_fm_list);
int init_best_audio_codec(sh_audio_t *sh_audio, char **audio_codec_list,
char **audio_fm_list);
int decode_audio(sh_audio_t *sh_audio, struct bstr *outbuf, int minlen);
void decode_audio_prepend_bytes(struct bstr *outbuf, int count, int byte);
void resync_audio_stream(sh_audio_t *sh_audio);