Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
05f95443
Commit
05f95443
authored
Jan 08, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pcmenc: use AVCodec.encode2()
parent
a6ccae3f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
10 deletions
+17
-10
pcm.c
libavcodec/pcm.c
+17
-10
No files found.
libavcodec/pcm.c
View file @
05f95443
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
#include "avcodec.h"
#include "avcodec.h"
#include "libavutil/common.h"
/* for av_reverse */
#include "libavutil/common.h"
/* for av_reverse */
#include "bytestream.h"
#include "bytestream.h"
#include "internal.h"
#include "pcm_tablegen.h"
#include "pcm_tablegen.h"
#define MAX_CHANNELS 64
#define MAX_CHANNELS 64
...
@@ -77,10 +78,10 @@ static av_cold int pcm_encode_close(AVCodecContext *avctx)
...
@@ -77,10 +78,10 @@ static av_cold int pcm_encode_close(AVCodecContext *avctx)
bytestream_put_##endian(&dst, v); \
bytestream_put_##endian(&dst, v); \
}
}
static
int
pcm_encode_frame
(
AVCodecContext
*
avctx
,
static
int
pcm_encode_frame
(
AVCodecContext
*
avctx
,
AVPacket
*
avpkt
,
unsigned
char
*
frame
,
int
buf_size
,
void
*
data
)
const
AVFrame
*
frame
,
int
*
got_packet_ptr
)
{
{
int
n
,
sample_size
,
v
;
int
n
,
sample_size
,
v
,
ret
;
const
short
*
samples
;
const
short
*
samples
;
unsigned
char
*
dst
;
unsigned
char
*
dst
;
const
uint8_t
*
srcu8
;
const
uint8_t
*
srcu8
;
...
@@ -91,9 +92,14 @@ static int pcm_encode_frame(AVCodecContext *avctx,
...
@@ -91,9 +92,14 @@ static int pcm_encode_frame(AVCodecContext *avctx,
const
uint32_t
*
samples_uint32_t
;
const
uint32_t
*
samples_uint32_t
;
sample_size
=
av_get_bits_per_sample
(
avctx
->
codec
->
id
)
/
8
;
sample_size
=
av_get_bits_per_sample
(
avctx
->
codec
->
id
)
/
8
;
n
=
buf_size
/
sample_size
;
n
=
frame
->
nb_samples
*
avctx
->
channels
;
samples
=
data
;
samples
=
(
const
short
*
)
frame
->
data
[
0
];
dst
=
frame
;
if
((
ret
=
ff_alloc_packet
(
avpkt
,
n
*
sample_size
)))
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Error getting output packet
\n
"
);
return
ret
;
}
dst
=
avpkt
->
data
;
switch
(
avctx
->
codec
->
id
)
{
switch
(
avctx
->
codec
->
id
)
{
case
CODEC_ID_PCM_U32LE
:
case
CODEC_ID_PCM_U32LE
:
...
@@ -130,7 +136,7 @@ static int pcm_encode_frame(AVCodecContext *avctx,
...
@@ -130,7 +136,7 @@ static int pcm_encode_frame(AVCodecContext *avctx,
ENCODE
(
uint16_t
,
be16
,
samples
,
dst
,
n
,
0
,
0x8000
)
ENCODE
(
uint16_t
,
be16
,
samples
,
dst
,
n
,
0
,
0x8000
)
break
;
break
;
case
CODEC_ID_PCM_S8
:
case
CODEC_ID_PCM_S8
:
srcu8
=
data
;
srcu8
=
frame
->
data
[
0
]
;
for
(;
n
>
0
;
n
--
)
{
for
(;
n
>
0
;
n
--
)
{
v
=
*
srcu8
++
;
v
=
*
srcu8
++
;
*
dst
++
=
v
-
128
;
*
dst
++
=
v
-
128
;
...
@@ -186,9 +192,10 @@ static int pcm_encode_frame(AVCodecContext *avctx,
...
@@ -186,9 +192,10 @@ static int pcm_encode_frame(AVCodecContext *avctx,
default:
default:
return
-
1
;
return
-
1
;
}
}
//avctx->frame_size = (dst - frame) / (sample_size * avctx->channels);
return
dst
-
frame
;
avpkt
->
size
=
frame
->
nb_samples
*
avctx
->
channels
*
sample_size
;
*
got_packet_ptr
=
1
;
return
0
;
}
}
typedef
struct
PCMDecode
{
typedef
struct
PCMDecode
{
...
@@ -472,7 +479,7 @@ AVCodec ff_ ## name_ ## _encoder = { \
...
@@ -472,7 +479,7 @@ AVCodec ff_ ## name_ ## _encoder = { \
.type = AVMEDIA_TYPE_AUDIO, \
.type = AVMEDIA_TYPE_AUDIO, \
.id = id_, \
.id = id_, \
.init = pcm_encode_init, \
.init = pcm_encode_init, \
.encode
= pcm_encode_frame, \
.encode
2
= pcm_encode_frame, \
.close = pcm_encode_close, \
.close = pcm_encode_close, \
.capabilities = CODEC_CAP_VARIABLE_FRAME_SIZE, \
.capabilities = CODEC_CAP_VARIABLE_FRAME_SIZE, \
.sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \
.sample_fmts = (const enum AVSampleFormat[]){sample_fmt_,AV_SAMPLE_FMT_NONE}, \
...
...
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