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
5f0e161d
Commit
5f0e161d
authored
Oct 24, 2012
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
g722: refactor out of rawdec.c
parent
42c26a48
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
57 additions
and
13 deletions
+57
-13
Makefile
libavformat/Makefile
+1
-1
g722.c
libavformat/g722.c
+56
-0
rawdec.c
libavformat/rawdec.c
+0
-12
No files found.
libavformat/Makefile
View file @
5f0e161d
...
...
@@ -101,7 +101,7 @@ OBJS-$(CONFIG_GIF_MUXER) += gif.o
OBJS-$(CONFIG_GSM_DEMUXER)
+=
gsmdec.o
OBJS-$(CONFIG_GXF_DEMUXER)
+=
gxf.o
OBJS-$(CONFIG_GXF_MUXER)
+=
gxfenc.o
audiointerleave.o
OBJS-$(CONFIG_G722_DEMUXER)
+=
rawdec.o
OBJS-$(CONFIG_G722_DEMUXER)
+=
g722.o
rawdec.o
OBJS-$(CONFIG_G722_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_G723_1_DEMUXER)
+=
g723_1.o
OBJS-$(CONFIG_H261_DEMUXER)
+=
h261dec.o
rawdec.o
...
...
libavformat/g722.c
0 → 100644
View file @
5f0e161d
/*
* g722 raw demuxer
* Copyright (c) 2010 Martin Storsjo
*
* 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"
#include "internal.h"
#include "rawdec.h"
static
int
g722_read_header
(
AVFormatContext
*
s
)
{
AVStream
*
st
;
st
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
st
)
return
AVERROR
(
ENOMEM
);
st
->
codec
->
codec_type
=
AVMEDIA_TYPE_AUDIO
;
st
->
codec
->
codec_id
=
AV_CODEC_ID_ADPCM_G722
;
st
->
codec
->
sample_rate
=
16000
;
st
->
codec
->
channels
=
1
;
st
->
codec
->
bits_per_coded_sample
=
av_get_bits_per_sample
(
st
->
codec
->
codec_id
);
assert
(
st
->
codec
->
bits_per_coded_sample
>
0
);
avpriv_set_pts_info
(
st
,
64
,
1
,
st
->
codec
->
sample_rate
);
return
0
;
}
AVInputFormat
ff_g722_demuxer
=
{
.
name
=
"g722"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"raw G.722"
),
.
read_header
=
g722_read_header
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"g722,722"
,
.
raw_codec_id
=
AV_CODEC_ID_ADPCM_G722
,
};
libavformat/rawdec.c
View file @
5f0e161d
...
...
@@ -177,18 +177,6 @@ const AVOption ff_rawvideo_options[] = {
{
NULL
},
};
#if CONFIG_G722_DEMUXER
AVInputFormat
ff_g722_demuxer
=
{
.
name
=
"g722"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"raw G.722"
),
.
read_header
=
ff_raw_read_header
,
.
read_packet
=
ff_raw_read_partial_packet
,
.
flags
=
AVFMT_GENERIC_INDEX
,
.
extensions
=
"g722,722"
,
.
raw_codec_id
=
AV_CODEC_ID_ADPCM_G722
,
};
#endif
#if CONFIG_LATM_DEMUXER
AVInputFormat
ff_latm_demuxer
=
{
.
name
=
"latm"
,
...
...
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