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
3ce6fa6b
Commit
3ce6fa6b
authored
Sep 07, 2022
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: add bonk demuxer
parent
88170070
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
103 additions
and
3 deletions
+103
-3
Changelog
Changelog
+1
-1
Makefile
libavformat/Makefile
+1
-0
allformats.c
libavformat/allformats.c
+1
-0
bonk.c
libavformat/bonk.c
+98
-0
version.h
libavformat/version.h
+2
-2
No files found.
Changelog
View file @
3ce6fa6b
...
...
@@ -11,7 +11,7 @@ version <next>:
- VAAPI decoding and encoding for 10/12bit 422, 10/12bit 444 HEVC and VP9
- WBMP (Wireless Application Protocol Bitmap) image format
- a3dscope filter
- bonk decoder
- bonk decoder
and demuxer
version 5.1:
...
...
libavformat/Makefile
View file @
3ce6fa6b
...
...
@@ -147,6 +147,7 @@ OBJS-$(CONFIG_BIT_MUXER) += bit.o
OBJS-$(CONFIG_BITPACKED_DEMUXER)
+=
rawvideodec.o
OBJS-$(CONFIG_BMV_DEMUXER)
+=
bmv.o
OBJS-$(CONFIG_BOA_DEMUXER)
+=
boadec.o
OBJS-$(CONFIG_BONK_DEMUXER)
+=
bonk.o
rawdec.o
OBJS-$(CONFIG_BFSTM_DEMUXER)
+=
brstm.o
OBJS-$(CONFIG_BRSTM_DEMUXER)
+=
brstm.o
OBJS-$(CONFIG_C93_DEMUXER)
+=
c93.o
voc_packet.o
voc.o
...
...
libavformat/allformats.c
View file @
3ce6fa6b
...
...
@@ -102,6 +102,7 @@ extern const AVInputFormat ff_bmv_demuxer;
extern
const
AVInputFormat
ff_bfstm_demuxer
;
extern
const
AVInputFormat
ff_brstm_demuxer
;
extern
const
AVInputFormat
ff_boa_demuxer
;
extern
const
AVInputFormat
ff_bonk_demuxer
;
extern
const
AVInputFormat
ff_c93_demuxer
;
extern
const
AVInputFormat
ff_caf_demuxer
;
extern
const
AVOutputFormat
ff_caf_muxer
;
...
...
libavformat/bonk.c
0 → 100644
View file @
3ce6fa6b
/*
* Bonk demuxer
* Copyright (c) 2016 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/intreadwrite.h"
#include "avformat.h"
#include "demux.h"
#include "internal.h"
#include "rawdec.h"
static
int
bonk_probe
(
const
AVProbeData
*
p
)
{
for
(
int
i
=
0
;
i
<
p
->
buf_size
-
22
;
i
++
)
{
if
(
!
p
->
buf
[
i
]
&&
AV_RL32
(
p
->
buf
+
i
+
1
)
==
MKTAG
(
'B'
,
'O'
,
'N'
,
'K'
))
{
if
(
p
->
buf
[
i
+
5
])
return
0
;
if
(
AV_RL32
(
p
->
buf
+
i
+
6
)
==
0
)
return
0
;
if
(
AV_RL32
(
p
->
buf
+
i
+
10
)
==
0
)
return
0
;
if
(
p
->
buf
[
i
+
14
]
==
0
)
return
0
;
if
(
AV_RL16
(
p
->
buf
+
i
+
17
)
==
0
||
AV_RL16
(
p
->
buf
+
i
+
17
)
>
2048
)
return
0
;
if
(
p
->
buf
[
i
+
19
]
==
0
)
return
0
;
if
(
AV_RL16
(
p
->
buf
+
i
+
20
)
==
0
)
return
0
;
return
AVPROBE_SCORE_MAX
;
}
else
if
(
!
p
->
buf
[
i
])
{
break
;
}
}
return
0
;
}
static
int
bonk_read_header
(
AVFormatContext
*
s
)
{
AVStream
*
st
;
int
ret
;
for
(
int
i
=
0
;
!
avio_feof
(
s
->
pb
);
i
++
)
{
int
b
=
avio_r8
(
s
->
pb
);
if
(
!
b
&&
avio_rl32
(
s
->
pb
)
==
MKTAG
(
'B'
,
'O'
,
'N'
,
'K'
))
break
;
else
if
(
!
b
)
return
AVERROR_INVALIDDATA
;
}
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
if
((
ret
=
ff_get_extradata
(
s
,
st
->
codecpar
,
s
->
pb
,
17
))
<
0
)
return
ret
;
st
->
codecpar
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codecpar
->
codec_id
=
AV_CODEC_ID_BONK
;
st
->
codecpar
->
sample_rate
=
AV_RL32
(
st
->
codecpar
->
extradata
+
5
);
st
->
codecpar
->
ch_layout
.
nb_channels
=
st
->
codecpar
->
extradata
[
9
];
if
(
st
->
codecpar
->
ch_layout
.
nb_channels
==
0
)
return
AVERROR_INVALIDDATA
;
st
->
duration
=
AV_RL32
(
st
->
codecpar
->
extradata
+
1
)
/
st
->
codecpar
->
ch_layout
.
nb_channels
;
avpriv_set_pts_info
(
st
,
64
,
1
,
st
->
codecpar
->
sample_rate
);
ffformatcontext
(
s
)
->
data_offset
=
avio_tell
(
s
->
pb
);
return
0
;
}
const
AVInputFormat
ff_bonk_demuxer
=
{
.
name
=
"bonk"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"raw Bonk"
),
.
read_probe
=
bonk_probe
,
.
read_header
=
bonk_read_header
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
extensions
=
"bonk"
,
.
flags
=
AVFMT_NOBINSEARCH
|
AVFMT_NOGENSEARCH
|
AVFMT_NO_BYTE_SEEK
|
AVFMT_NOTIMESTAMPS
,
.
raw_codec_id
=
AV_CODEC_ID_BONK
,
.
priv_data_size
=
sizeof
(
FFRawDemuxerContext
),
.
priv_class
=
&
ff_raw_demuxer_class
,
};
libavformat/version.h
View file @
3ce6fa6b
...
...
@@ -31,8 +31,8 @@
#include "version_major.h"
#define LIBAVFORMAT_VERSION_MINOR 3
0
#define LIBAVFORMAT_VERSION_MICRO 10
1
#define LIBAVFORMAT_VERSION_MINOR 3
1
#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