Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
0955e57a
Commit
0955e57a
authored
Jun 23, 2014
by
Nidhi Makhijani
Committed by
Diego Biurrun
Jul 03, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
daud: split muxer and demuxer
Signed-off-by:
Diego Biurrun
<
diego@biurrun.de
>
parent
f920d089
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
38 deletions
+56
-38
Makefile
libavformat/Makefile
+2
-2
dauddec.c
libavformat/dauddec.c
+0
-36
daudenc.c
libavformat/daudenc.c
+54
-0
No files found.
libavformat/Makefile
View file @
0955e57a
...
@@ -90,8 +90,8 @@ OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o
...
@@ -90,8 +90,8 @@ OBJS-$(CONFIG_CAVSVIDEO_MUXER) += rawenc.o
OBJS-$(CONFIG_CDG_DEMUXER)
+=
cdg.o
OBJS-$(CONFIG_CDG_DEMUXER)
+=
cdg.o
OBJS-$(CONFIG_CDXL_DEMUXER)
+=
cdxl.o
OBJS-$(CONFIG_CDXL_DEMUXER)
+=
cdxl.o
OBJS-$(CONFIG_CRC_MUXER)
+=
crcenc.o
OBJS-$(CONFIG_CRC_MUXER)
+=
crcenc.o
OBJS-$(CONFIG_DAUD_DEMUXER)
+=
daud.o
OBJS-$(CONFIG_DAUD_DEMUXER)
+=
daud
dec
.o
OBJS-$(CONFIG_DAUD_MUXER)
+=
daud.o
OBJS-$(CONFIG_DAUD_MUXER)
+=
daud
enc
.o
OBJS-$(CONFIG_DFA_DEMUXER)
+=
dfa.o
OBJS-$(CONFIG_DFA_DEMUXER)
+=
dfa.o
OBJS-$(CONFIG_DIRAC_DEMUXER)
+=
diracdec.o
rawdec.o
OBJS-$(CONFIG_DIRAC_DEMUXER)
+=
diracdec.o
rawdec.o
OBJS-$(CONFIG_DIRAC_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_DIRAC_MUXER)
+=
rawenc.o
...
...
libavformat/daud.c
→
libavformat/daud
dec
.c
View file @
0955e57a
...
@@ -50,28 +50,6 @@ static int daud_packet(AVFormatContext *s, AVPacket *pkt) {
...
@@ -50,28 +50,6 @@ static int daud_packet(AVFormatContext *s, AVPacket *pkt) {
return
ret
;
return
ret
;
}
}
static
int
daud_write_header
(
struct
AVFormatContext
*
s
)
{
AVCodecContext
*
codec
=
s
->
streams
[
0
]
->
codec
;
if
(
codec
->
channels
!=
6
||
codec
->
sample_rate
!=
96000
)
return
-
1
;
return
0
;
}
static
int
daud_write_packet
(
struct
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
if
(
pkt
->
size
>
65535
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Packet size too large for s302m. (%d > 65535)
\n
"
,
pkt
->
size
);
return
-
1
;
}
avio_wb16
(
s
->
pb
,
pkt
->
size
);
avio_wb16
(
s
->
pb
,
0x8010
);
// unknown
avio_write
(
s
->
pb
,
pkt
->
data
,
pkt
->
size
);
return
0
;
}
#if CONFIG_DAUD_DEMUXER
AVInputFormat
ff_daud_demuxer
=
{
AVInputFormat
ff_daud_demuxer
=
{
.
name
=
"daud"
,
.
name
=
"daud"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"D-Cinema audio"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"D-Cinema audio"
),
...
@@ -79,17 +57,3 @@ AVInputFormat ff_daud_demuxer = {
...
@@ -79,17 +57,3 @@ AVInputFormat ff_daud_demuxer = {
.
read_packet
=
daud_packet
,
.
read_packet
=
daud_packet
,
.
extensions
=
"302"
,
.
extensions
=
"302"
,
};
};
#endif
#if CONFIG_DAUD_MUXER
AVOutputFormat
ff_daud_muxer
=
{
.
name
=
"daud"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"D-Cinema audio"
),
.
extensions
=
"302"
,
.
audio_codec
=
AV_CODEC_ID_PCM_S24DAUD
,
.
video_codec
=
AV_CODEC_ID_NONE
,
.
write_header
=
daud_write_header
,
.
write_packet
=
daud_write_packet
,
.
flags
=
AVFMT_NOTIMESTAMPS
,
};
#endif
libavformat/daudenc.c
0 → 100644
View file @
0955e57a
/*
* D-Cinema audio muxer
* Copyright (c) 2005 Reimar Döffinger
*
* This file is part of Libav.
*
* Libav 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.
*
* Libav 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 Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
static
int
daud_write_header
(
struct
AVFormatContext
*
s
)
{
AVCodecContext
*
codec
=
s
->
streams
[
0
]
->
codec
;
if
(
codec
->
channels
!=
6
||
codec
->
sample_rate
!=
96000
)
return
-
1
;
return
0
;
}
static
int
daud_write_packet
(
struct
AVFormatContext
*
s
,
AVPacket
*
pkt
)
{
if
(
pkt
->
size
>
65535
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Packet size too large for s302m. (%d > 65535)
\n
"
,
pkt
->
size
);
return
-
1
;
}
avio_wb16
(
s
->
pb
,
pkt
->
size
);
avio_wb16
(
s
->
pb
,
0x8010
);
// unknown
avio_write
(
s
->
pb
,
pkt
->
data
,
pkt
->
size
);
return
0
;
}
AVOutputFormat
ff_daud_muxer
=
{
.
name
=
"daud"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"D-Cinema audio"
),
.
extensions
=
"302"
,
.
audio_codec
=
AV_CODEC_ID_PCM_S24DAUD
,
.
video_codec
=
AV_CODEC_ID_NONE
,
.
write_header
=
daud_write_header
,
.
write_packet
=
daud_write_packet
,
.
flags
=
AVFMT_NOTIMESTAMPS
,
};
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