Skip to content

opusenc: add 4x opusenc options #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

opusenc: add 4x opusenc options #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dccbb13
opusenc: Add --bandwidth option
chemag Aug 19, 2021
9b53032
opusenc: Add --dtx option
chemag Aug 19, 2021
8c3be20
opusenc: Add --inbandfec option
chemag Aug 19, 2021
570d19b
opusenc: Add --application option
chemag Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions man/opusenc.1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,12 @@ In CVBR and Hard-CBR mode it specifies the specific output bitrate.
The default for input with a sample rate of 44.1 kHz or higher is
64 kbit/s per mono stream and 96 kbit/s per coupled pair.
.TP
.BI --bandwidth " N"
Set audio bandwidth (NB, MB, WB, SWB, FB, default: auto).
.TP
.BI --application " N"
Set audio application (voip, audio, lowdelay, default: auto).
.TP
.B --vbr
Use variable bitrate encoding (default).
In VBR mode the bitrate may go up and down freely depending on the content
Expand Down Expand Up @@ -106,6 +112,12 @@ Downmix to mono.
.B --downmix-stereo
Downmix multichannel speaker configurations to stereo.
.TP
.B --dtx
Enable SILK DTX.
.TP
.B --inbandfec
Enable in-band FEC.
.TP
.B --no-phase-inv
Disable use of phase inversion for intensity stereo.
This trades some stereo quality for a higher quality mono downmix,
Expand Down
71 changes: 71 additions & 0 deletions src/opusenc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,11 +138,15 @@ static void usage(void)
printf(" --quiet Enable quiet mode\n");
printf("\nEncoding options:\n");
printf(" --bitrate n.nnn Set target bitrate in kbit/s (6-256/channel)\n");
printf(" --bandwidth <bw> Set audio bandwidth (NB, MB, WB, SWB, FB)\n");
printf(" --application <app> Set audio application (voip, audio, lowdelay)\n");
printf(" --vbr Use variable bitrate encoding (default)\n");
printf(" --cvbr Use constrained variable bitrate encoding\n");
printf(" --hard-cbr Use hard constant bitrate encoding\n");
printf(" --music Tune low bitrates for music (override automatic detection)\n");
printf(" --speech Tune low bitrates for speech (override automatic detection)\n");
printf(" --dtx Enable DTX mode (default disabled)\n");
printf(" --inbandfec Enable enable SILK inband FEC (default disabled)\n");
printf(" --comp n Set encoding complexity (0-10, default: 10 (slowest))\n");
printf(" --framesize n Set maximum frame size in milliseconds\n");
printf(" (2.5, 5, 10, 20, 40, 60, default: 20)\n");
Expand Down Expand Up @@ -367,11 +371,15 @@ int main(int argc, char **argv)
{
{"quiet", no_argument, NULL, 0},
{"bitrate", required_argument, NULL, 0},
{"bandwidth", required_argument, NULL, 0},
{"application", required_argument, NULL, 0},
{"hard-cbr",no_argument,NULL, 0},
{"vbr",no_argument,NULL, 0},
{"cvbr",no_argument,NULL, 0},
{"music", no_argument, NULL, 0},
{"speech", no_argument, NULL, 0},
{"dtx",no_argument,NULL, 0},
{"inbandfec",no_argument,NULL, 0},
{"comp", required_argument, NULL, 0},
{"complexity", required_argument, NULL, 0},
{"framesize", required_argument, NULL, 0},
Expand Down Expand Up @@ -433,12 +441,16 @@ int main(int argc, char **argv)
/*Settings*/
int quiet=0;
opus_int32 bitrate=-1;
int bandwidth=OPUS_AUTO;
int application=OPUS_AUTO;
opus_int32 rate=48000;
opus_int32 frame_size=960;
opus_int32 opus_frame_param = OPUS_FRAMESIZE_20_MS;
int chan=2;
int with_hard_cbr=0;
int with_cvbr=0;
int with_dtx=0;
int with_inbandfec=0;
int signal_type=OPUS_AUTO;
int expect_loss=0;
int complexity=10;
Expand Down Expand Up @@ -535,6 +547,32 @@ int main(int argc, char **argv)
save_cmd=0;
} else if (strcmp(optname, "bitrate")==0) {
bitrate=(opus_int32)(atof(optarg)*1000.);
} else if (strcmp(optname, "bandwidth")==0) {
if (strcmp(optarg, "NB")==0) {
bandwidth = OPUS_BANDWIDTH_NARROWBAND;
} else if (strcmp(optarg, "MB")==0) {
bandwidth = OPUS_BANDWIDTH_MEDIUMBAND;
} else if (strcmp(optarg, "WB")==0) {
bandwidth = OPUS_BANDWIDTH_WIDEBAND;
} else if (strcmp(optarg, "SWB")==0) {
bandwidth = OPUS_BANDWIDTH_SUPERWIDEBAND;
} else if (strcmp(optarg, "FB")==0) {
bandwidth = OPUS_BANDWIDTH_FULLBAND;
} else {
fatal("Unknown bandwidth %s. Supported are NB, MB, WB, SWB, FB.\n",
optarg);
}
} else if (strcmp(optname, "application")==0) {
if (strcmp(optarg, "voip")==0) {
application = OPUS_APPLICATION_VOIP;
} else if (strcmp(optarg, "audio")==0) {
application = OPUS_APPLICATION_AUDIO;
} else if (strcmp(optarg, "lowdelay")==0) {
application = OPUS_APPLICATION_RESTRICTED_LOWDELAY;
} else {
fatal("Unknown application %s. Supported are voip, audio, lowdelay.\n",
optarg);
}
} else if (strcmp(optname, "hard-cbr")==0) {
with_hard_cbr=1;
with_cvbr=0;
Expand All @@ -544,6 +582,10 @@ int main(int argc, char **argv)
} else if (strcmp(optname, "vbr")==0) {
with_cvbr=0;
with_hard_cbr=0;
} else if (strcmp(optname, "dtx")==0) {
with_dtx=1;
} else if (strcmp(optname, "inbandfec")==0) {
with_inbandfec=1;
} else if (strcmp(optname, "help")==0) {
usage();
exit(0);
Expand Down Expand Up @@ -965,6 +1007,21 @@ int main(int argc, char **argv)
if (ret != OPE_OK) {
fatal("Error: OPUS_SET_BITRATE %d failed: %s\n", bitrate, ope_strerror(ret));
}

if (bandwidth!=OPUS_AUTO) {
ret = ope_encoder_ctl(enc, OPUS_SET_BANDWIDTH(bandwidth));
if (ret != OPE_OK) {
fatal("Error: OPUS_SET_BANDWIDTH %d failed: %s\n", bandwidth, ope_strerror(ret));
}
}

if (application!=OPUS_AUTO) {
ret = ope_encoder_ctl(enc, OPUS_SET_APPLICATION(application));
if (ret != OPE_OK) {
fatal("Error: OPUS_SET_APPLICATION %d failed: %s\n", application, ope_strerror(ret));
}
}

ret = ope_encoder_ctl(enc, OPUS_SET_VBR(!with_hard_cbr));
if (ret != OPE_OK) {
fatal("Error: OPUS_SET_VBR %d failed: %s\n", !with_hard_cbr, ope_strerror(ret));
Expand All @@ -980,6 +1037,20 @@ int main(int argc, char **argv)
if (ret != OPE_OK) {
fatal("Error: OPUS_SET_SIGNAL failed: %s\n", ope_strerror(ret));
}
if (with_dtx) {
ret = ope_encoder_ctl(enc, OPUS_SET_DTX(with_dtx));
if (ret != OPE_OK) {
fatal("Error: OPUS_SET_DTX %d failed: %s\n",
with_dtx, ope_strerror(ret));
}
}
if (with_inbandfec) {
ret = ope_encoder_ctl(enc, OPUS_SET_INBAND_FEC(with_inbandfec));
if (ret != OPE_OK) {
fatal("Error: OPUS_SET_INBAND_FEC %d failed: %s\n",
with_inbandfec, ope_strerror(ret));
}
}
ret = ope_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complexity));
if (ret != OPE_OK) {
fatal("Error: OPUS_SET_COMPLEXITY %d failed: %s\n", complexity, ope_strerror(ret));
Expand Down