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
34d2bf30
Commit
34d2bf30
authored
Sep 14, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pcmdec: use unique classes for all pcm demuxers.
parent
d906f49a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
15 deletions
+15
-15
pcmdec.c
libavformat/pcmdec.c
+15
-1
rawdec.c
libavformat/rawdec.c
+0
-13
rawdec.h
libavformat/rawdec.h
+0
-1
No files found.
libavformat/pcmdec.c
View file @
34d2bf30
...
@@ -22,6 +22,8 @@
...
@@ -22,6 +22,8 @@
#include "avformat.h"
#include "avformat.h"
#include "rawdec.h"
#include "rawdec.h"
#include "pcm.h"
#include "pcm.h"
#include "libavutil/log.h"
#include "libavutil/opt.h"
#define RAW_SAMPLES 1024
#define RAW_SAMPLES 1024
...
@@ -46,7 +48,19 @@ static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
...
@@ -46,7 +48,19 @@ static int raw_read_packet(AVFormatContext *s, AVPacket *pkt)
return
ret
;
return
ret
;
}
}
static
const
AVOption
pcm_options
[]
=
{
{
"sample_rate"
,
""
,
offsetof
(
RawAudioDemuxerContext
,
sample_rate
),
FF_OPT_TYPE_INT
,
{.
dbl
=
0
},
0
,
INT_MAX
,
AV_OPT_FLAG_DECODING_PARAM
},
{
"channels"
,
""
,
offsetof
(
RawAudioDemuxerContext
,
channels
),
FF_OPT_TYPE_INT
,
{.
dbl
=
0
},
0
,
INT_MAX
,
AV_OPT_FLAG_DECODING_PARAM
},
{
NULL
},
};
#define PCMDEF(name, long_name, ext, codec) \
#define PCMDEF(name, long_name, ext, codec) \
static const AVClass name ## _demuxer_class = {\
.class_name = #name " demuxer",\
.item_name = av_default_item_name,\
.option = pcm_options,\
.version = LIBAVUTIL_VERSION_INT,\
};\
AVInputFormat ff_pcm_ ## name ## _demuxer = {\
AVInputFormat ff_pcm_ ## name ## _demuxer = {\
#name,\
#name,\
NULL_IF_CONFIG_SMALL(long_name),\
NULL_IF_CONFIG_SMALL(long_name),\
...
@@ -59,7 +73,7 @@ AVInputFormat ff_pcm_ ## name ## _demuxer = {\
...
@@ -59,7 +73,7 @@ AVInputFormat ff_pcm_ ## name ## _demuxer = {\
.flags= AVFMT_GENERIC_INDEX,\
.flags= AVFMT_GENERIC_INDEX,\
.extensions = ext,\
.extensions = ext,\
.value = codec,\
.value = codec,\
.priv_class = &
ff_rawaudio
_demuxer_class,\
.priv_class = &
name ##
_demuxer_class,\
};
};
PCMDEF
(
f64be
,
"PCM 64 bit floating-point big-endian format"
,
PCMDEF
(
f64be
,
"PCM 64 bit floating-point big-endian format"
,
...
...
libavformat/rawdec.c
View file @
34d2bf30
...
@@ -167,19 +167,6 @@ fail:
...
@@ -167,19 +167,6 @@ fail:
/* Note: Do not forget to add new entries to the Makefile as well. */
/* Note: Do not forget to add new entries to the Makefile as well. */
static
const
AVOption
audio_options
[]
=
{
{
"sample_rate"
,
""
,
offsetof
(
RawAudioDemuxerContext
,
sample_rate
),
FF_OPT_TYPE_INT
,
{.
dbl
=
0
},
0
,
INT_MAX
,
AV_OPT_FLAG_DECODING_PARAM
},
{
"channels"
,
""
,
offsetof
(
RawAudioDemuxerContext
,
channels
),
FF_OPT_TYPE_INT
,
{.
dbl
=
0
},
0
,
INT_MAX
,
AV_OPT_FLAG_DECODING_PARAM
},
{
NULL
},
};
const
AVClass
ff_rawaudio_demuxer_class
=
{
.
class_name
=
"rawaudio demuxer"
,
.
item_name
=
av_default_item_name
,
.
option
=
audio_options
,
.
version
=
LIBAVUTIL_VERSION_INT
,
};
#define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
#define OFFSET(x) offsetof(FFRawVideoDemuxerContext, x)
#define DEC AV_OPT_FLAG_DECODING_PARAM
#define DEC AV_OPT_FLAG_DECODING_PARAM
static
const
AVOption
video_options
[]
=
{
static
const
AVOption
video_options
[]
=
{
...
...
libavformat/rawdec.h
View file @
34d2bf30
...
@@ -38,7 +38,6 @@ typedef struct FFRawVideoDemuxerContext {
...
@@ -38,7 +38,6 @@ typedef struct FFRawVideoDemuxerContext {
char
*
framerate
;
/**< String describing framerate, set by a private option. */
char
*
framerate
;
/**< String describing framerate, set by a private option. */
}
FFRawVideoDemuxerContext
;
}
FFRawVideoDemuxerContext
;
extern
const
AVClass
ff_rawaudio_demuxer_class
;
extern
const
AVClass
ff_rawvideo_demuxer_class
;
extern
const
AVClass
ff_rawvideo_demuxer_class
;
int
ff_raw_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
);
int
ff_raw_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
);
...
...
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