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
5a79bf02
Commit
5a79bf02
authored
Jun 23, 2015
by
Paul B Mahol
Committed by
Vittorio Giovara
Jun 24, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PCM signed 16-bit big-endian planar decoder
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
41740ef8
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
18 additions
and
1 deletion
+18
-1
general.texi
doc/general.texi
+1
-0
Makefile
libavcodec/Makefile
+1
-0
allcodecs.c
libavcodec/allcodecs.c
+1
-0
avcodec.h
libavcodec/avcodec.h
+1
-0
codec_desc.c
libavcodec/codec_desc.c
+7
-0
pcm.c
libavcodec/pcm.c
+4
-0
utils.c
libavcodec/utils.c
+1
-0
version.h
libavcodec/version.h
+1
-1
nut.c
libavformat/nut.c
+1
-0
No files found.
doc/general.texi
View file @
5a79bf02
...
@@ -880,6 +880,7 @@ following image formats are supported:
...
@@ -880,6 +880,7 @@ following image formats are supported:
@tab supported through external library libopus
@tab supported through external library libopus
@item PCM A-law @tab X @tab X
@item PCM A-law @tab X @tab X
@item PCM mu-law @tab X @tab X
@item PCM mu-law @tab X @tab X
@item PCM signed 16-bit big-endian planar @tab @tab X
@item PCM signed 16-bit little-endian planar @tab @tab X
@item PCM signed 16-bit little-endian planar @tab @tab X
@item PCM signed 24-bit little-endian planar @tab @tab X
@item PCM signed 24-bit little-endian planar @tab @tab X
@item PCM signed 32-bit little-endian planar @tab @tab X
@item PCM signed 32-bit little-endian planar @tab @tab X
...
...
libavcodec/Makefile
View file @
5a79bf02
...
@@ -496,6 +496,7 @@ OBJS-$(CONFIG_PCM_S8_ENCODER) += pcm.o
...
@@ -496,6 +496,7 @@ OBJS-$(CONFIG_PCM_S8_ENCODER) += pcm.o
OBJS-$(CONFIG_PCM_S8_PLANAR_DECODER)
+=
8svx.o
OBJS-$(CONFIG_PCM_S8_PLANAR_DECODER)
+=
8svx.o
OBJS-$(CONFIG_PCM_S16BE_DECODER)
+=
pcm.o
OBJS-$(CONFIG_PCM_S16BE_DECODER)
+=
pcm.o
OBJS-$(CONFIG_PCM_S16BE_ENCODER)
+=
pcm.o
OBJS-$(CONFIG_PCM_S16BE_ENCODER)
+=
pcm.o
OBJS-$(CONFIG_PCM_S16BE_PLANAR_DECODER)
+=
pcm.o
OBJS-$(CONFIG_PCM_S16LE_DECODER)
+=
pcm.o
OBJS-$(CONFIG_PCM_S16LE_DECODER)
+=
pcm.o
OBJS-$(CONFIG_PCM_S16LE_ENCODER)
+=
pcm.o
OBJS-$(CONFIG_PCM_S16LE_ENCODER)
+=
pcm.o
OBJS-$(CONFIG_PCM_S16LE_PLANAR_DECODER)
+=
pcm.o
OBJS-$(CONFIG_PCM_S16LE_PLANAR_DECODER)
+=
pcm.o
...
...
libavcodec/allcodecs.c
View file @
5a79bf02
...
@@ -384,6 +384,7 @@ void avcodec_register_all(void)
...
@@ -384,6 +384,7 @@ void avcodec_register_all(void)
REGISTER_ENCDEC
(
PCM_S8
,
pcm_s8
);
REGISTER_ENCDEC
(
PCM_S8
,
pcm_s8
);
REGISTER_DECODER
(
PCM_S8_PLANAR
,
pcm_s8_planar
);
REGISTER_DECODER
(
PCM_S8_PLANAR
,
pcm_s8_planar
);
REGISTER_ENCDEC
(
PCM_S16BE
,
pcm_s16be
);
REGISTER_ENCDEC
(
PCM_S16BE
,
pcm_s16be
);
REGISTER_DECODER
(
PCM_S16BE_PLANAR
,
pcm_s16be_planar
);
REGISTER_ENCDEC
(
PCM_S16LE
,
pcm_s16le
);
REGISTER_ENCDEC
(
PCM_S16LE
,
pcm_s16le
);
REGISTER_DECODER
(
PCM_S16LE_PLANAR
,
pcm_s16le_planar
);
REGISTER_DECODER
(
PCM_S16LE_PLANAR
,
pcm_s16le_planar
);
REGISTER_ENCDEC
(
PCM_S24BE
,
pcm_s24be
);
REGISTER_ENCDEC
(
PCM_S24BE
,
pcm_s24be
);
...
...
libavcodec/avcodec.h
View file @
5a79bf02
...
@@ -331,6 +331,7 @@ enum AVCodecID {
...
@@ -331,6 +331,7 @@ enum AVCodecID {
AV_CODEC_ID_PCM_S8_PLANAR
,
AV_CODEC_ID_PCM_S8_PLANAR
,
AV_CODEC_ID_PCM_S24LE_PLANAR
,
AV_CODEC_ID_PCM_S24LE_PLANAR
,
AV_CODEC_ID_PCM_S32LE_PLANAR
,
AV_CODEC_ID_PCM_S32LE_PLANAR
,
AV_CODEC_ID_PCM_S16BE_PLANAR
,
/* various ADPCM codecs */
/* various ADPCM codecs */
AV_CODEC_ID_ADPCM_IMA_QT
=
0x11000
,
AV_CODEC_ID_ADPCM_IMA_QT
=
0x11000
,
...
...
libavcodec/codec_desc.c
View file @
5a79bf02
...
@@ -1490,6 +1490,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -1490,6 +1490,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"PCM Zork"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"PCM Zork"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
,
},
},
{
.
id
=
AV_CODEC_ID_PCM_S16BE_PLANAR
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
name
=
"pcm_s16be_planar"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"PCM signed 16-bit big-endian planar"
),
.
props
=
AV_CODEC_PROP_LOSSLESS
,
},
{
{
.
id
=
AV_CODEC_ID_PCM_S16LE_PLANAR
,
.
id
=
AV_CODEC_ID_PCM_S16LE_PLANAR
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
...
...
libavcodec/pcm.c
View file @
5a79bf02
...
@@ -347,6 +347,9 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
...
@@ -347,6 +347,9 @@ static int pcm_decode_frame(AVCodecContext *avctx, void *data,
samples
+=
2
;
samples
+=
2
;
}
}
break
;
break
;
case
AV_CODEC_ID_PCM_S16BE_PLANAR
:
DECODE_PLANAR
(
16
,
be16
,
src
,
samples
,
n
,
0
,
0
);
break
;
case
AV_CODEC_ID_PCM_S16LE_PLANAR
:
case
AV_CODEC_ID_PCM_S16LE_PLANAR
:
DECODE_PLANAR
(
16
,
le16
,
src
,
samples
,
n
,
0
,
0
);
DECODE_PLANAR
(
16
,
le16
,
src
,
samples
,
n
,
0
,
0
);
break
;
break
;
...
@@ -506,6 +509,7 @@ PCM_DECODER(PCM_LXF, AV_SAMPLE_FMT_S32P, pcm_lxf, "PCM signed
...
@@ -506,6 +509,7 @@ PCM_DECODER(PCM_LXF, AV_SAMPLE_FMT_S32P, pcm_lxf, "PCM signed
PCM_CODEC
(
PCM_MULAW
,
AV_SAMPLE_FMT_S16
,
pcm_mulaw
,
"PCM mu-law"
);
PCM_CODEC
(
PCM_MULAW
,
AV_SAMPLE_FMT_S16
,
pcm_mulaw
,
"PCM mu-law"
);
PCM_CODEC
(
PCM_S8
,
AV_SAMPLE_FMT_U8
,
pcm_s8
,
"PCM signed 8-bit"
);
PCM_CODEC
(
PCM_S8
,
AV_SAMPLE_FMT_U8
,
pcm_s8
,
"PCM signed 8-bit"
);
PCM_CODEC
(
PCM_S16BE
,
AV_SAMPLE_FMT_S16
,
pcm_s16be
,
"PCM signed 16-bit big-endian"
);
PCM_CODEC
(
PCM_S16BE
,
AV_SAMPLE_FMT_S16
,
pcm_s16be
,
"PCM signed 16-bit big-endian"
);
PCM_DECODER
(
PCM_S16BE_PLANAR
,
AV_SAMPLE_FMT_S16P
,
pcm_s16be_planar
,
"PCM signed 16-bit big-endian planar"
);
PCM_CODEC
(
PCM_S16LE
,
AV_SAMPLE_FMT_S16
,
pcm_s16le
,
"PCM signed 16-bit little-endian"
);
PCM_CODEC
(
PCM_S16LE
,
AV_SAMPLE_FMT_S16
,
pcm_s16le
,
"PCM signed 16-bit little-endian"
);
PCM_DECODER
(
PCM_S16LE_PLANAR
,
AV_SAMPLE_FMT_S16P
,
pcm_s16le_planar
,
"PCM 16-bit little-endian planar"
);
PCM_DECODER
(
PCM_S16LE_PLANAR
,
AV_SAMPLE_FMT_S16P
,
pcm_s16le_planar
,
"PCM 16-bit little-endian planar"
);
PCM_CODEC
(
PCM_S24BE
,
AV_SAMPLE_FMT_S32
,
pcm_s24be
,
"PCM signed 24-bit big-endian"
);
PCM_CODEC
(
PCM_S24BE
,
AV_SAMPLE_FMT_S32
,
pcm_s24be
,
"PCM signed 24-bit big-endian"
);
...
...
libavcodec/utils.c
View file @
5a79bf02
...
@@ -2134,6 +2134,7 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id)
...
@@ -2134,6 +2134,7 @@ int av_get_exact_bits_per_sample(enum AVCodecID codec_id)
case
AV_CODEC_ID_PCM_ZORK
:
case
AV_CODEC_ID_PCM_ZORK
:
return
8
;
return
8
;
case
AV_CODEC_ID_PCM_S16BE
:
case
AV_CODEC_ID_PCM_S16BE
:
case
AV_CODEC_ID_PCM_S16BE_PLANAR
:
case
AV_CODEC_ID_PCM_S16LE
:
case
AV_CODEC_ID_PCM_S16LE
:
case
AV_CODEC_ID_PCM_S16LE_PLANAR
:
case
AV_CODEC_ID_PCM_S16LE_PLANAR
:
case
AV_CODEC_ID_PCM_U16BE
:
case
AV_CODEC_ID_PCM_U16BE
:
...
...
libavcodec/version.h
View file @
5a79bf02
...
@@ -29,7 +29,7 @@
...
@@ -29,7 +29,7 @@
#include "libavutil/version.h"
#include "libavutil/version.h"
#define LIBAVCODEC_VERSION_MAJOR 56
#define LIBAVCODEC_VERSION_MAJOR 56
#define LIBAVCODEC_VERSION_MINOR 2
8
#define LIBAVCODEC_VERSION_MINOR 2
9
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_MICRO 0
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
...
...
libavformat/nut.c
View file @
5a79bf02
...
@@ -149,6 +149,7 @@ const AVCodecTag ff_nut_audio_tags[] = {
...
@@ -149,6 +149,7 @@ const AVCodecTag ff_nut_audio_tags[] = {
{
AV_CODEC_ID_PCM_U32BE
,
MKTAG
(
32
,
'D'
,
'U'
,
'P'
)
},
{
AV_CODEC_ID_PCM_U32BE
,
MKTAG
(
32
,
'D'
,
'U'
,
'P'
)
},
{
AV_CODEC_ID_PCM_U32LE
,
MKTAG
(
'P'
,
'U'
,
'D'
,
32
)
},
{
AV_CODEC_ID_PCM_U32LE
,
MKTAG
(
'P'
,
'U'
,
'D'
,
32
)
},
{
AV_CODEC_ID_PCM_U8
,
MKTAG
(
'P'
,
'U'
,
'D'
,
8
)
},
{
AV_CODEC_ID_PCM_U8
,
MKTAG
(
'P'
,
'U'
,
'D'
,
8
)
},
{
AV_CODEC_ID_PCM_S16BE_PLANAR
,
MKTAG
(
16
,
'P'
,
'S'
,
'P'
)
},
{
AV_CODEC_ID_PCM_S16LE_PLANAR
,
MKTAG
(
'P'
,
'S'
,
'P'
,
16
)
},
{
AV_CODEC_ID_PCM_S16LE_PLANAR
,
MKTAG
(
'P'
,
'S'
,
'P'
,
16
)
},
{
AV_CODEC_ID_PCM_S24LE_PLANAR
,
MKTAG
(
'P'
,
'S'
,
'P'
,
24
)
},
{
AV_CODEC_ID_PCM_S24LE_PLANAR
,
MKTAG
(
'P'
,
'S'
,
'P'
,
24
)
},
{
AV_CODEC_ID_PCM_S32LE_PLANAR
,
MKTAG
(
'P'
,
'S'
,
'P'
,
32
)
},
{
AV_CODEC_ID_PCM_S32LE_PLANAR
,
MKTAG
(
'P'
,
'S'
,
'P'
,
32
)
},
...
...
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