Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
48d3af7d
Commit
48d3af7d
authored
May 03, 2016
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
encoder/opus: use CamelCase
parent
9b3470ea
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
15 deletions
+15
-15
OpusEncoderPlugin.cxx
src/encoder/plugins/OpusEncoderPlugin.cxx
+15
-15
No files found.
src/encoder/plugins/OpusEncoderPlugin.cxx
View file @
48d3af7d
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
#include <assert.h>
#include <assert.h>
#include <stdlib.h>
#include <stdlib.h>
struct
opus_e
ncoder
{
struct
OpusE
ncoder
{
/** the base class */
/** the base class */
Encoder
encoder
;
Encoder
encoder
;
...
@@ -66,13 +66,13 @@ struct opus_encoder {
...
@@ -66,13 +66,13 @@ struct opus_encoder {
ogg_int64_t
granulepos
;
ogg_int64_t
granulepos
;
opus_e
ncoder
()
:
encoder
(
opus_encoder_plugin
),
granulepos
(
0
)
{}
OpusE
ncoder
()
:
encoder
(
opus_encoder_plugin
),
granulepos
(
0
)
{}
};
};
static
constexpr
Domain
opus_encoder_domain
(
"opus_encoder"
);
static
constexpr
Domain
opus_encoder_domain
(
"opus_encoder"
);
static
bool
static
bool
opus_encoder_configure
(
struct
opus_e
ncoder
*
encoder
,
opus_encoder_configure
(
OpusE
ncoder
*
encoder
,
const
ConfigBlock
&
block
,
Error
&
error
)
const
ConfigBlock
&
block
,
Error
&
error
)
{
{
const
char
*
value
=
block
.
GetBlockValue
(
"bitrate"
,
"auto"
);
const
char
*
value
=
block
.
GetBlockValue
(
"bitrate"
,
"auto"
);
...
@@ -114,7 +114,7 @@ opus_encoder_configure(struct opus_encoder *encoder,
...
@@ -114,7 +114,7 @@ opus_encoder_configure(struct opus_encoder *encoder,
static
Encoder
*
static
Encoder
*
opus_encoder_init
(
const
ConfigBlock
&
block
,
Error
&
error
)
opus_encoder_init
(
const
ConfigBlock
&
block
,
Error
&
error
)
{
{
opus_encoder
*
encoder
=
new
opus_e
ncoder
();
auto
*
encoder
=
new
OpusE
ncoder
();
/* load configuration from "block" */
/* load configuration from "block" */
if
(
!
opus_encoder_configure
(
encoder
,
block
,
error
))
{
if
(
!
opus_encoder_configure
(
encoder
,
block
,
error
))
{
...
@@ -129,7 +129,7 @@ opus_encoder_init(const ConfigBlock &block, Error &error)
...
@@ -129,7 +129,7 @@ opus_encoder_init(const ConfigBlock &block, Error &error)
static
void
static
void
opus_encoder_finish
(
Encoder
*
_encoder
)
opus_encoder_finish
(
Encoder
*
_encoder
)
{
{
struct
opus_encoder
*
encoder
=
(
struct
opus_e
ncoder
*
)
_encoder
;
auto
*
encoder
=
(
OpusE
ncoder
*
)
_encoder
;
/* the real libopus cleanup was already performed by
/* the real libopus cleanup was already performed by
opus_encoder_close(), so no real work here */
opus_encoder_close(), so no real work here */
...
@@ -141,7 +141,7 @@ opus_encoder_open(Encoder *_encoder,
...
@@ -141,7 +141,7 @@ opus_encoder_open(Encoder *_encoder,
AudioFormat
&
audio_format
,
AudioFormat
&
audio_format
,
Error
&
error
)
Error
&
error
)
{
{
struct
opus_encoder
*
encoder
=
(
struct
opus_e
ncoder
*
)
_encoder
;
auto
*
encoder
=
(
OpusE
ncoder
*
)
_encoder
;
/* libopus supports only 48 kHz */
/* libopus supports only 48 kHz */
audio_format
.
sample_rate
=
48000
;
audio_format
.
sample_rate
=
48000
;
...
@@ -198,7 +198,7 @@ opus_encoder_open(Encoder *_encoder,
...
@@ -198,7 +198,7 @@ opus_encoder_open(Encoder *_encoder,
static
void
static
void
opus_encoder_close
(
Encoder
*
_encoder
)
opus_encoder_close
(
Encoder
*
_encoder
)
{
{
struct
opus_encoder
*
encoder
=
(
struct
opus_e
ncoder
*
)
_encoder
;
auto
*
encoder
=
(
OpusE
ncoder
*
)
_encoder
;
encoder
->
stream
.
Deinitialize
();
encoder
->
stream
.
Deinitialize
();
free
(
encoder
->
buffer
);
free
(
encoder
->
buffer
);
...
@@ -206,7 +206,7 @@ opus_encoder_close(Encoder *_encoder)
...
@@ -206,7 +206,7 @@ opus_encoder_close(Encoder *_encoder)
}
}
static
bool
static
bool
opus_encoder_do_encode
(
struct
opus_e
ncoder
*
encoder
,
bool
eos
,
opus_encoder_do_encode
(
OpusE
ncoder
*
encoder
,
bool
eos
,
Error
&
error
)
Error
&
error
)
{
{
assert
(
encoder
->
buffer_position
==
encoder
->
buffer_size
);
assert
(
encoder
->
buffer_position
==
encoder
->
buffer_size
);
...
@@ -247,7 +247,7 @@ opus_encoder_do_encode(struct opus_encoder *encoder, bool eos,
...
@@ -247,7 +247,7 @@ opus_encoder_do_encode(struct opus_encoder *encoder, bool eos,
static
bool
static
bool
opus_encoder_end
(
Encoder
*
_encoder
,
Error
&
error
)
opus_encoder_end
(
Encoder
*
_encoder
,
Error
&
error
)
{
{
struct
opus_encoder
*
encoder
=
(
struct
opus_e
ncoder
*
)
_encoder
;
auto
*
encoder
=
(
OpusE
ncoder
*
)
_encoder
;
encoder
->
stream
.
Flush
();
encoder
->
stream
.
Flush
();
...
@@ -261,14 +261,14 @@ opus_encoder_end(Encoder *_encoder, Error &error)
...
@@ -261,14 +261,14 @@ opus_encoder_end(Encoder *_encoder, Error &error)
static
bool
static
bool
opus_encoder_flush
(
Encoder
*
_encoder
,
gcc_unused
Error
&
error
)
opus_encoder_flush
(
Encoder
*
_encoder
,
gcc_unused
Error
&
error
)
{
{
struct
opus_encoder
*
encoder
=
(
struct
opus_e
ncoder
*
)
_encoder
;
auto
*
encoder
=
(
OpusE
ncoder
*
)
_encoder
;
encoder
->
stream
.
Flush
();
encoder
->
stream
.
Flush
();
return
true
;
return
true
;
}
}
static
bool
static
bool
opus_encoder_write_silence
(
struct
opus_e
ncoder
*
encoder
,
unsigned
fill_frames
,
opus_encoder_write_silence
(
OpusE
ncoder
*
encoder
,
unsigned
fill_frames
,
Error
&
error
)
Error
&
error
)
{
{
size_t
fill_bytes
=
fill_frames
*
encoder
->
frame_size
;
size_t
fill_bytes
=
fill_frames
*
encoder
->
frame_size
;
...
@@ -297,7 +297,7 @@ opus_encoder_write(Encoder *_encoder,
...
@@ -297,7 +297,7 @@ opus_encoder_write(Encoder *_encoder,
const
void
*
_data
,
size_t
length
,
const
void
*
_data
,
size_t
length
,
Error
&
error
)
Error
&
error
)
{
{
struct
opus_encoder
*
encoder
=
(
struct
opus_e
ncoder
*
)
_encoder
;
auto
*
encoder
=
(
OpusE
ncoder
*
)
_encoder
;
const
uint8_t
*
data
=
(
const
uint8_t
*
)
_data
;
const
uint8_t
*
data
=
(
const
uint8_t
*
)
_data
;
if
(
encoder
->
lookahead
>
0
)
{
if
(
encoder
->
lookahead
>
0
)
{
...
@@ -334,7 +334,7 @@ opus_encoder_write(Encoder *_encoder,
...
@@ -334,7 +334,7 @@ opus_encoder_write(Encoder *_encoder,
}
}
static
void
static
void
opus_encoder_generate_head
(
struct
opus_e
ncoder
*
encoder
)
opus_encoder_generate_head
(
OpusE
ncoder
*
encoder
)
{
{
unsigned
char
header
[
19
];
unsigned
char
header
[
19
];
memcpy
(
header
,
"OpusHead"
,
8
);
memcpy
(
header
,
"OpusHead"
,
8
);
...
@@ -359,7 +359,7 @@ opus_encoder_generate_head(struct opus_encoder *encoder)
...
@@ -359,7 +359,7 @@ opus_encoder_generate_head(struct opus_encoder *encoder)
}
}
static
void
static
void
opus_encoder_generate_tags
(
struct
opus_e
ncoder
*
encoder
)
opus_encoder_generate_tags
(
OpusE
ncoder
*
encoder
)
{
{
const
char
*
version
=
opus_get_version_string
();
const
char
*
version
=
opus_get_version_string
();
size_t
version_length
=
strlen
(
version
);
size_t
version_length
=
strlen
(
version
);
...
@@ -387,7 +387,7 @@ opus_encoder_generate_tags(struct opus_encoder *encoder)
...
@@ -387,7 +387,7 @@ opus_encoder_generate_tags(struct opus_encoder *encoder)
static
size_t
static
size_t
opus_encoder_read
(
Encoder
*
_encoder
,
void
*
dest
,
size_t
length
)
opus_encoder_read
(
Encoder
*
_encoder
,
void
*
dest
,
size_t
length
)
{
{
struct
opus_encoder
*
encoder
=
(
struct
opus_e
ncoder
*
)
_encoder
;
auto
*
encoder
=
(
OpusE
ncoder
*
)
_encoder
;
if
(
encoder
->
packetno
==
0
)
if
(
encoder
->
packetno
==
0
)
opus_encoder_generate_head
(
encoder
);
opus_encoder_generate_head
(
encoder
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment