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
dc2da568
Commit
dc2da568
authored
Apr 17, 2023
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat: add PDV demuxer
parent
40bae5be
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
178 additions
and
3 deletions
+178
-3
Changelog
Changelog
+1
-1
Makefile
libavformat/Makefile
+1
-0
allformats.c
libavformat/allformats.c
+1
-0
pdvdec.c
libavformat/pdvdec.c
+173
-0
version.h
libavformat/version.h
+2
-2
No files found.
Changelog
View file @
dc2da568
...
...
@@ -3,7 +3,7 @@ releases are sorted from youngest to oldest.
version <next>:
- libaribcaption decoder
- Playdate video decoder
- Playdate video decoder
and demuxer
version 6.0:
- Radiance HDR image support
...
...
libavformat/Makefile
View file @
dc2da568
...
...
@@ -471,6 +471,7 @@ OBJS-$(CONFIG_PCM_U8_DEMUXER) += pcmdec.o pcm.o
OBJS-$(CONFIG_PCM_U8_MUXER)
+=
pcmenc.o
rawenc.o
OBJS-$(CONFIG_PCM_VIDC_DEMUXER)
+=
pcmdec.o
pcm.o
OBJS-$(CONFIG_PCM_VIDC_MUXER)
+=
pcmenc.o
rawenc.o
OBJS-$(CONFIG_PDV_DEMUXER)
+=
pdvdec.o
OBJS-$(CONFIG_PJS_DEMUXER)
+=
pjsdec.o
subtitles.o
OBJS-$(CONFIG_PMP_DEMUXER)
+=
pmpdec.o
OBJS-$(CONFIG_PP_BNK_DEMUXER)
+=
pp_bnk.o
...
...
libavformat/allformats.c
View file @
dc2da568
...
...
@@ -369,6 +369,7 @@ extern const AVInputFormat ff_pcm_u16le_demuxer;
extern
const
FFOutputFormat
ff_pcm_u16le_muxer
;
extern
const
AVInputFormat
ff_pcm_u8_demuxer
;
extern
const
FFOutputFormat
ff_pcm_u8_muxer
;
extern
const
AVInputFormat
ff_pdv_demuxer
;
extern
const
AVInputFormat
ff_pjs_demuxer
;
extern
const
AVInputFormat
ff_pmp_demuxer
;
extern
const
AVInputFormat
ff_pp_bnk_demuxer
;
...
...
libavformat/pdvdec.c
0 → 100644
View file @
dc2da568
/*
* PDV demuxer
* Copyright (c) 2023 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 "avformat.h"
#include "internal.h"
#define PDV_MAGIC "Playdate VID\x00\x00\x00\x00"
typedef
struct
PDVDemuxContext
{
int
current_frame
;
uint8_t
*
frame_flags
;
uint32_t
*
frame_offsets
;
}
PDVDemuxContext
;
static
int
pdv_probe
(
const
AVProbeData
*
pd
)
{
if
(
strncmp
(
pd
->
buf
,
PDV_MAGIC
,
sizeof
(
PDV_MAGIC
)
-
1
)
==
0
)
return
AVPROBE_SCORE_MAX
;
return
0
;
}
static
int
pdv_read_header
(
AVFormatContext
*
s
)
{
PDVDemuxContext
*
p
=
s
->
priv_data
;
AVIOContext
*
pb
=
s
->
pb
;
AVCodecParameters
*
par
;
AVStream
*
st
;
uint64_t
start
;
uint32_t
fps
;
avio_skip
(
pb
,
16
);
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
par
=
st
->
codecpar
;
par
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
par
->
codec_id
=
AV_CODEC_ID_PDV
;
st
->
start_time
=
0
;
st
->
duration
=
st
->
nb_frames
=
avio_rl16
(
pb
);
avio_skip
(
pb
,
2
);
fps
=
avio_rl32
(
pb
);
st
->
avg_frame_rate
=
av_d2q
(
av_int2float
(
fps
),
INT_MAX
);
par
->
width
=
avio_rl16
(
pb
);
par
->
height
=
avio_rl16
(
pb
);
avpriv_set_pts_info
(
st
,
64
,
st
->
avg_frame_rate
.
den
,
st
->
avg_frame_rate
.
num
);
p
->
current_frame
=
0
;
p
->
frame_flags
=
av_calloc
(
st
->
nb_frames
+
1
,
sizeof
(
*
p
->
frame_flags
));
p
->
frame_offsets
=
av_calloc
(
st
->
nb_frames
+
1
,
sizeof
(
*
p
->
frame_offsets
));
if
(
!
p
->
frame_flags
||
!
p
->
frame_offsets
)
return
AVERROR
(
ENOMEM
);
for
(
int
n
=
0
;
n
<=
st
->
nb_frames
;
n
++
)
{
const
uint32_t
entry
=
avio_rl32
(
pb
);
p
->
frame_flags
[
n
]
=
entry
&
3
;
p
->
frame_offsets
[
n
]
=
entry
>>
2
;
}
start
=
avio_tell
(
pb
);
for
(
int
n
=
0
;
n
<
st
->
nb_frames
;
n
++
)
{
const
uint64_t
pos
=
start
+
p
->
frame_offsets
[
n
];
const
int32_t
size
=
p
->
frame_offsets
[
n
+
1
]
-
p
->
frame_offsets
[
n
];
const
int
flags
=
p
->
frame_flags
[
n
]
&
1
?
AVINDEX_KEYFRAME
:
0
;
if
(
p
->
frame_flags
[
n
]
==
0
||
size
<=
0
||
((
pb
->
seekable
&
AVIO_SEEKABLE_NORMAL
)
&&
pos
+
size
>
avio_size
(
pb
)))
break
;
av_add_index_entry
(
st
,
pos
,
n
,
size
,
0
,
flags
);
}
return
0
;
}
static
int
pdv_read_packet
(
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
PDVDemuxContext
*
p
=
s
->
priv_data
;
AVStream
*
st
=
s
->
streams
[
0
];
FFStream
*
const
sti
=
ffstream
(
st
);
AVIOContext
*
pb
=
s
->
pb
;
int32_t
size
,
flags
,
ret
;
int64_t
pos
;
if
(
p
->
current_frame
>=
st
->
nb_frames
)
return
AVERROR_EOF
;
if
(
p
->
current_frame
>=
sti
->
nb_index_entries
)
return
AVERROR
(
EIO
);
pos
=
sti
->
index_entries
[
p
->
current_frame
].
pos
;
flags
=
sti
->
index_entries
[
p
->
current_frame
].
flags
;
size
=
sti
->
index_entries
[
p
->
current_frame
].
size
;
avio_seek
(
pb
,
pos
,
SEEK_SET
);
if
(
avio_feof
(
pb
)
||
((
pb
->
seekable
&
AVIO_SEEKABLE_NORMAL
)
&&
pos
+
size
>
avio_size
(
pb
))
||
size
==
0
)
return
AVERROR_EOF
;
ret
=
av_get_packet
(
pb
,
pkt
,
size
);
if
(
ret
<
0
)
return
ret
;
if
(
flags
&
AVINDEX_KEYFRAME
)
pkt
->
flags
|=
AV_PKT_FLAG_KEY
;
pkt
->
stream_index
=
0
;
pkt
->
pts
=
p
->
current_frame
++
;
pkt
->
duration
=
1
;
return
0
;
}
static
int
pdv_read_close
(
AVFormatContext
*
s
)
{
PDVDemuxContext
*
p
=
s
->
priv_data
;
av_freep
(
&
p
->
frame_flags
);
av_freep
(
&
p
->
frame_offsets
);
return
0
;
}
static
int
pdv_read_seek
(
AVFormatContext
*
s
,
int
stream_index
,
int64_t
timestamp
,
int
flags
)
{
PDVDemuxContext
*
p
=
s
->
priv_data
;
AVStream
*
st
=
s
->
streams
[
stream_index
];
int
index
=
av_index_search_timestamp
(
st
,
timestamp
,
flags
);
if
(
index
<
0
)
return
-
1
;
if
(
avio_seek
(
s
->
pb
,
ffstream
(
st
)
->
index_entries
[
index
].
pos
,
SEEK_SET
)
<
0
)
return
-
1
;
p
->
current_frame
=
index
;
return
0
;
}
const
AVInputFormat
ff_pdv_demuxer
=
{
.
name
=
"pdv"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"PlayDate Video"
),
.
priv_data_size
=
sizeof
(
PDVDemuxContext
),
.
flags_internal
=
FF_FMT_INIT_CLEANUP
,
.
read_probe
=
pdv_probe
,
.
read_header
=
pdv_read_header
,
.
read_packet
=
pdv_read_packet
,
.
read_close
=
pdv_read_close
,
.
read_seek
=
pdv_read_seek
,
.
extensions
=
"pdv"
,
};
libavformat/version.h
View file @
dc2da568
...
...
@@ -31,8 +31,8 @@
#include "version_major.h"
#define LIBAVFORMAT_VERSION_MINOR
4
#define LIBAVFORMAT_VERSION_MICRO 10
1
#define LIBAVFORMAT_VERSION_MINOR
5
#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