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
47818b2a
Commit
47818b2a
authored
Aug 19, 2011
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add LOAS demuxer.
parent
60b54e4b
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
94 additions
and
1 deletion
+94
-1
Changelog
Changelog
+1
-0
general.texi
doc/general.texi
+2
-0
Makefile
libavformat/Makefile
+1
-0
allformats.c
libavformat/allformats.c
+1
-0
loasdec.c
libavformat/loasdec.c
+88
-0
version.h
libavformat/version.h
+1
-1
No files found.
Changelog
View file @
47818b2a
...
@@ -43,6 +43,7 @@ easier to use. The changes are:
...
@@ -43,6 +43,7 @@ easier to use. The changes are:
'-preset <presetname>'.
'-preset <presetname>'.
* -intra option was removed, it's equivalent to -g 0.
* -intra option was removed, it's equivalent to -g 0.
- XMV demuxer
- XMV demuxer
- LOAS demuxer
version 0.8:
version 0.8:
...
...
doc/general.texi
View file @
47818b2a
...
@@ -120,6 +120,8 @@ library:
...
@@ -120,6 +120,8 @@ library:
@tab A format used by libvpx
@tab A format used by libvpx
@item LMLM4 @tab @tab X
@item LMLM4 @tab @tab X
@tab Used by Linux Media Labs MPEG-4 PCI boards
@tab Used by Linux Media Labs MPEG-4 PCI boards
@item LOAS @tab @tab X
@tab contains LATM multiplexed AAC audio
@item LXF @tab @tab X
@item LXF @tab @tab X
@tab VR native stream format, used by Leitch/Harris' video servers.
@tab VR native stream format, used by Leitch/Harris' video servers.
@item Matroska @tab X @tab X
@item Matroska @tab X @tab X
...
...
libavformat/Makefile
View file @
47818b2a
...
@@ -113,6 +113,7 @@ OBJS-$(CONFIG_IVF_DEMUXER) += ivfdec.o riff.o
...
@@ -113,6 +113,7 @@ OBJS-$(CONFIG_IVF_DEMUXER) += ivfdec.o riff.o
OBJS-$(CONFIG_IVF_MUXER)
+=
ivfenc.o
OBJS-$(CONFIG_IVF_MUXER)
+=
ivfenc.o
OBJS-$(CONFIG_JV_DEMUXER)
+=
jvdec.o
OBJS-$(CONFIG_JV_DEMUXER)
+=
jvdec.o
OBJS-$(CONFIG_LMLM4_DEMUXER)
+=
lmlm4.o
OBJS-$(CONFIG_LMLM4_DEMUXER)
+=
lmlm4.o
OBJS-$(CONFIG_LOAS_DEMUXER)
+=
loasdec.o
OBJS-$(CONFIG_LXF_DEMUXER)
+=
lxfdec.o
OBJS-$(CONFIG_LXF_DEMUXER)
+=
lxfdec.o
OBJS-$(CONFIG_M4V_DEMUXER)
+=
m4vdec.o
rawdec.o
OBJS-$(CONFIG_M4V_DEMUXER)
+=
m4vdec.o
rawdec.o
OBJS-$(CONFIG_M4V_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_M4V_MUXER)
+=
rawenc.o
...
...
libavformat/allformats.c
View file @
47818b2a
...
@@ -114,6 +114,7 @@ void av_register_all(void)
...
@@ -114,6 +114,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX
(
IVF
,
ivf
);
REGISTER_MUXDEMUX
(
IVF
,
ivf
);
REGISTER_DEMUXER
(
JV
,
jv
);
REGISTER_DEMUXER
(
JV
,
jv
);
REGISTER_DEMUXER
(
LMLM4
,
lmlm4
);
REGISTER_DEMUXER
(
LMLM4
,
lmlm4
);
REGISTER_DEMUXER
(
LOAS
,
loas
);
REGISTER_DEMUXER
(
LXF
,
lxf
);
REGISTER_DEMUXER
(
LXF
,
lxf
);
REGISTER_MUXDEMUX
(
M4V
,
m4v
);
REGISTER_MUXDEMUX
(
M4V
,
m4v
);
REGISTER_MUXER
(
MD5
,
md5
);
REGISTER_MUXER
(
MD5
,
md5
);
...
...
libavformat/loasdec.c
0 → 100644
View file @
47818b2a
/*
* LOAS AudioSyncStream demuxer
* Copyright (c) 2008 Michael Niedermayer <michaelni@gmx.at>
*
* 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 "libavutil/internal.h"
#include "avformat.h"
#include "rawdec.h"
static
int
loas_probe
(
AVProbeData
*
p
)
{
int
max_frames
=
0
,
first_frames
=
0
;
int
fsize
,
frames
;
uint8_t
*
buf0
=
p
->
buf
;
uint8_t
*
buf2
;
uint8_t
*
buf
;
uint8_t
*
end
=
buf0
+
p
->
buf_size
-
3
;
buf
=
buf0
;
for
(;
buf
<
end
;
buf
=
buf2
+
1
)
{
buf2
=
buf
;
for
(
frames
=
0
;
buf2
<
end
;
frames
++
)
{
uint32_t
header
=
AV_RB24
(
buf2
);
if
((
header
>>
13
)
!=
0x2B7
)
break
;
fsize
=
(
header
&
0x1FFF
)
+
3
;
if
(
fsize
<
7
)
break
;
fsize
=
FFMIN
(
fsize
,
end
-
buf2
);
buf2
+=
fsize
;
}
max_frames
=
FFMAX
(
max_frames
,
frames
);
if
(
buf
==
buf0
)
first_frames
=
frames
;
}
if
(
first_frames
>=
3
)
return
AVPROBE_SCORE_MAX
/
2
+
1
;
else
if
(
max_frames
>
100
)
return
AVPROBE_SCORE_MAX
/
2
;
else
if
(
max_frames
>=
3
)
return
AVPROBE_SCORE_MAX
/
4
;
else
if
(
max_frames
>=
1
)
return
1
;
else
return
0
;
}
static
int
loas_read_header
(
AVFormatContext
*
s
,
AVFormatParameters
*
ap
)
{
AVStream
*
st
;
st
=
av_new_stream
(
s
,
0
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_id
=
s
->
iformat
->
value
;
st
->
need_parsing
=
AVSTREAM_PARSE_FULL
;
//LCM of all possible AAC sample rates
av_set_pts_info
(
st
,
64
,
1
,
28224000
);
return
0
;
}
AVInputFormat
ff_loas_demuxer
=
{
.
name
=
"loas"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"LOAS AudioSyncStream"
),
.
read_probe
=
loas_probe
,
.
read_header
=
loas_read_header
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
value
=
CODEC_ID_AAC_LATM
,
};
libavformat/version.h
View file @
47818b2a
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
#include "libavutil/avutil.h"
#include "libavutil/avutil.h"
#define LIBAVFORMAT_VERSION_MAJOR 53
#define LIBAVFORMAT_VERSION_MAJOR 53
#define LIBAVFORMAT_VERSION_MINOR
8
#define LIBAVFORMAT_VERSION_MINOR
9
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
...
...
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