RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-04 23:40:47 +00:00
Code Issues Releases Wiki Activity

options: move -a52drc to option struct

Browse Source 
Also allow a range up to 2.
This commit is contained in:
Uoti Urpala 2010-06-02 18:30:51 +03:00
parent 57e0904baa
commit 3f076c0fb3
4 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cfg-common-opts.h
View File

@ -213,9 +213,7 @@
{"ignore-start", &ignore_start, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"ignore-start", &ignore_start, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"noignore-start", &ignore_start, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"noignore-start", &ignore_start, CONF_TYPE_FLAG, 0, 1, 0, NULL},
#ifdef CONFIG_LIBA52 OPT_FLOATRANGE("a52drc", drc_level, 0, 0, 2),
{"a52drc", &a52_drc_level, CONF_TYPE_FLOAT, CONF_RANGE, 0, 1, NULL},
#endif
// ------------------------- codec/vfilter options -------------------- // ------------------------- codec/vfilter options --------------------

2
cfg-common.h
View File

@ -52,8 +52,6 @@ extern int reuse_socket;
extern int dvd_speed; /* stream/stream_dvd.c */ extern int dvd_speed; /* stream/stream_dvd.c */
extern float a52_drc_level;
/* defined in libmpdemux: */ /* defined in libmpdemux: */
extern int hr_mp3_seek; extern int hr_mp3_seek;
extern const m_option_t demux_rawaudio_opts[]; extern const m_option_t demux_rawaudio_opts[];

17
libmpcodecs/ad_liba52.c
View File

@ -24,7 +24,7 @@
#include <assert.h> #include <assert.h>
#include "config.h" #include "config.h"
#include "options.h"
#include "mp_msg.h" #include "mp_msg.h"
#include "mpbswap.h" #include "mpbswap.h"
@ -53,8 +53,6 @@ static uint32_t channel_map;
/** The output is multiplied by this var. Used for volume control */ /** The output is multiplied by this var. Used for volume control */
static sample_t a52_level = 1; static sample_t a52_level = 1;
/** The value of the -a52drc switch. */
float a52_drc_level = 1.0;
static int a52_drc_action = DRC_NO_ACTION; static int a52_drc_action = DRC_NO_ACTION;
static const ad_info_t info = static const ad_info_t info =
@ -135,8 +133,9 @@ int channels=0;
static sample_t dynrng_call (sample_t c, void *data) static sample_t dynrng_call (sample_t c, void *data)
{ {
// fprintf(stderr, "(%lf, %lf): %lf\n", (double)c, (double)a52_drc_level, (double)pow((double)c, a52_drc_level)); struct MPOpts *opts = data;
return pow((double)c, a52_drc_level); //fprintf(stderr, "(%lf, %lf): %lf\n", (double)c, opts->drc_level, pow(c, opts->drc_level));
return pow(c, opts->drc_level);
} }
@ -177,6 +176,7 @@ static int a52_resample_float(float *in, int16_t *out)
static int init(sh_audio_t *sh_audio) static int init(sh_audio_t *sh_audio)
{ {
struct MPOpts *opts = sh_audio->opts;
uint32_t a52_accel=0; uint32_t a52_accel=0;
sample_t level=a52_level, bias=384; sample_t level=a52_level, bias=384;
int flags=0; int flags=0;
@ -204,12 +204,11 @@ static int init(sh_audio_t *sh_audio)
return 0; return 0;
} }
/* Init a52 dynrng */ /* Init a52 dynrng */
if (a52_drc_level < 0.001) { if (opts->drc_level < 0.001) {
/* level == 0 --> no compression, init library without callback */ /* level == 0 --> no compression, init library without callback */
a52_drc_action = DRC_NO_COMPRESSION; a52_drc_action = DRC_NO_COMPRESSION;
} else if (a52_drc_level > 0.999) { } else if (opts->drc_level > 0.999 || opts->drc_level < 1.001) {
/* level == 1 --> full compression, do nothing at all (library default = full compression) */ /* level == 1 --> full compression, do nothing at all (library default = full compression) */
a52_drc_action = DRC_NO_ACTION; a52_drc_action = DRC_NO_ACTION;
} else { } else {
@ -328,7 +327,7 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m
if (a52_drc_action == DRC_NO_COMPRESSION) if (a52_drc_action == DRC_NO_COMPRESSION)
a52_dynrng(a52_state, NULL, NULL); a52_dynrng(a52_state, NULL, NULL);
else else
a52_dynrng(a52_state, dynrng_call, NULL); a52_dynrng(a52_state, dynrng_call, sh_audio->opts);
} }
len=0; len=0;

1
options.h
View File

@ -42,6 +42,7 @@ typedef struct MPOpts {
char *audio_lang; char *audio_lang;
char *sub_lang; char *sub_lang;
float playback_speed; float playback_speed;
float drc_level;
struct m_obj_settings *vf_settings; struct m_obj_settings *vf_settings;
int softzoom; int softzoom;
float movie_aspect; float movie_aspect;