Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
a41a5db7
Commit
a41a5db7
authored
Dec 01, 2017
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: add NSP demuxer
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
299a6222
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
114 additions
and
2 deletions
+114
-2
Changelog
Changelog
+1
-0
general.texi
doc/general.texi
+1
-0
Makefile
libavformat/Makefile
+1
-0
allformats.c
libavformat/allformats.c
+1
-0
nspdec.c
libavformat/nspdec.c
+108
-0
version.h
libavformat/version.h
+2
-2
No files found.
Changelog
View file @
a41a5db7
...
...
@@ -25,6 +25,7 @@ version <next>:
- AMD AMF H.264 and HEVC encoders
- video fillborders filter
- video setrange filter
- nsp demuxer
version 3.4:
...
...
doc/general.texi
View file @
a41a5db7
...
...
@@ -425,6 +425,7 @@ library:
@item NC camera feed @tab @tab X
@tab NC (AVIP NC4600) camera streams
@item NIST SPeech HEader REsources @tab @tab X
@item Computerized Speech Lab NSP @tab @tab X
@item NTT TwinVQ (VQF) @tab @tab X
@tab Nippon Telegraph and Telephone Corporation TwinVQ.
@item Nullsoft Streaming Video @tab @tab X
...
...
libavformat/Makefile
View file @
a41a5db7
...
...
@@ -331,6 +331,7 @@ OBJS-$(CONFIG_MXF_MUXER) += mxfenc.o mxf.o audiointerleave.o
OBJS-$(CONFIG_MXG_DEMUXER)
+=
mxg.o
OBJS-$(CONFIG_NC_DEMUXER)
+=
ncdec.o
OBJS-$(CONFIG_NISTSPHERE_DEMUXER)
+=
nistspheredec.o
pcm.o
OBJS-$(CONFIG_NSP_DEMUXER)
+=
nspdec.o
OBJS-$(CONFIG_NSV_DEMUXER)
+=
nsvdec.o
OBJS-$(CONFIG_NULL_MUXER)
+=
nullenc.o
OBJS-$(CONFIG_NUT_DEMUXER)
+=
nutdec.o
nut.o
isom.o
...
...
libavformat/allformats.c
View file @
a41a5db7
...
...
@@ -224,6 +224,7 @@ static void register_all(void)
REGISTER_DEMUXER
(
MXG
,
mxg
);
REGISTER_DEMUXER
(
NC
,
nc
);
REGISTER_DEMUXER
(
NISTSPHERE
,
nistsphere
);
REGISTER_DEMUXER
(
NSP
,
nsp
);
REGISTER_DEMUXER
(
NSV
,
nsv
);
REGISTER_MUXER
(
NULL
,
null
);
REGISTER_MUXDEMUX
(
NUT
,
nut
);
...
...
libavformat/nspdec.c
0 → 100644
View file @
a41a5db7
/*
* NSP demuxer
* Copyright (c) 2017 Paul B Mahol
*
* This file is part of FFmpeg.
*
* FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "libavutil/avstring.h"
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "internal.h"
#include "pcm.h"
static
int
nsp_probe
(
AVProbeData
*
p
)
{
if
(
AV_RB32
(
p
->
buf
)
==
AV_RB32
(
"FORM"
)
&&
AV_RB32
(
p
->
buf
+
4
)
==
AV_RB32
(
"DS16"
))
return
AVPROBE_SCORE_MAX
;
return
0
;
}
static
int
nsp_read_header
(
AVFormatContext
*
s
)
{
int
channels
=
0
,
rate
=
0
;
uint32_t
chunk
,
size
;
AVStream
*
st
;
int64_t
pos
;
avio_skip
(
s
->
pb
,
12
);
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
while
(
!
avio_feof
(
s
->
pb
))
{
char
value
[
1024
];
chunk
=
avio_rb32
(
s
->
pb
);
size
=
avio_rl32
(
s
->
pb
);
pos
=
avio_tell
(
s
->
pb
);
switch
(
chunk
)
{
case
MKBETAG
(
'H'
,
'E'
,
'D'
,
'R'
):
case
MKBETAG
(
'H'
,
'D'
,
'R'
,
'8'
):
if
(
size
<
32
)
return
AVERROR_INVALIDDATA
;
avio_skip
(
s
->
pb
,
20
);
rate
=
avio_rl32
(
s
->
pb
);
avio_skip
(
s
->
pb
,
size
-
(
avio_tell
(
s
->
pb
)
-
pos
));
break
;
case
MKBETAG
(
'N'
,
'O'
,
'T'
,
'E'
):
avio_get_str
(
s
->
pb
,
size
,
value
,
sizeof
(
value
));
av_dict_set
(
&
s
->
metadata
,
"Comment"
,
value
,
0
);
avio_skip
(
s
->
pb
,
size
&
1
);
break
;
case
MKBETAG
(
'S'
,
'D'
,
'A'
,
'B'
):
channels
=
2
;
break
;
case
MKBETAG
(
'S'
,
'D'
,
'_'
,
'2'
):
case
MKBETAG
(
'S'
,
'D'
,
'_'
,
'3'
):
case
MKBETAG
(
'S'
,
'D'
,
'_'
,
'4'
):
case
MKBETAG
(
'S'
,
'D'
,
'_'
,
'5'
):
case
MKBETAG
(
'S'
,
'D'
,
'_'
,
'6'
):
case
MKBETAG
(
'S'
,
'D'
,
'_'
,
'7'
):
case
MKBETAG
(
'S'
,
'D'
,
'_'
,
'8'
):
av_log
(
s
,
AV_LOG_WARNING
,
"Unsupported chunk!
\n
"
);
case
MKBETAG
(
'S'
,
'D'
,
'A'
,
'_'
):
case
MKBETAG
(
'S'
,
'D'
,
'_'
,
'A'
):
channels
=
1
;
break
;
}
if
(
channels
)
break
;
}
st
->
codecpar
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codecpar
->
channels
=
channels
;
st
->
codecpar
->
sample_rate
=
rate
;
st
->
codecpar
->
codec_id
=
AV_CODEC_ID_PCM_S16LE
;
st
->
codecpar
->
block_align
=
2
*
channels
;
return
0
;
}
AVInputFormat
ff_nsp_demuxer
=
{
.
name
=
"nsp"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Computerized Speech Lab NSP"
),
.
read_probe
=
nsp_probe
,
.
read_header
=
nsp_read_header
,
.
read_packet
=
ff_pcm_read_packet
,
.
read_seek
=
ff_pcm_read_seek
,
.
extensions
=
"nsp"
,
.
flags
=
AVFMT_GENERIC_INDEX
,
};
libavformat/version.h
View file @
a41a5db7
...
...
@@ -32,8 +32,8 @@
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 58
#define LIBAVFORMAT_VERSION_MINOR
2
#define LIBAVFORMAT_VERSION_MICRO 10
3
#define LIBAVFORMAT_VERSION_MINOR
3
#define LIBAVFORMAT_VERSION_MICRO 10
0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
...
...
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