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
2386cfc1
Commit
2386cfc1
authored
Oct 07, 2017
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/rtpenc: Add support for little-endian G.726.
parent
50462e3e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
1 deletion
+12
-1
Changelog
Changelog
+1
-0
rtpenc.c
libavformat/rtpenc.c
+2
-0
sdp.c
libavformat/sdp.c
+8
-0
version.h
libavformat/version.h
+1
-1
No files found.
Changelog
View file @
2386cfc1
...
...
@@ -52,6 +52,7 @@ version <next>:
- V4L2 mem2mem HW assisted codecs
- Rockchip MPP hardware decoding
- vmafmotion video filter
- use MIME type "G726" for little-endian G.726, "AAL2-G726" for big-endian G.726
version 3.3:
...
...
libavformat/rtpenc.c
View file @
2386cfc1
...
...
@@ -78,6 +78,7 @@ static int is_supported(enum AVCodecID id)
case
AV_CODEC_ID_VP9
:
case
AV_CODEC_ID_ADPCM_G722
:
case
AV_CODEC_ID_ADPCM_G726
:
case
AV_CODEC_ID_ADPCM_G726LE
:
case
AV_CODEC_ID_ILBC
:
case
AV_CODEC_ID_MJPEG
:
case
AV_CODEC_ID_SPEEX
:
...
...
@@ -550,6 +551,7 @@ static int rtp_write_packet(AVFormatContext *s1, AVPacket *pkt)
* clock. */
return
rtp_send_samples
(
s1
,
pkt
->
data
,
size
,
8
*
st
->
codecpar
->
channels
);
case
AV_CODEC_ID_ADPCM_G726
:
case
AV_CODEC_ID_ADPCM_G726LE
:
return
rtp_send_samples
(
s1
,
pkt
->
data
,
size
,
st
->
codecpar
->
bits_per_coded_sample
*
st
->
codecpar
->
channels
);
case
AV_CODEC_ID_MP2
:
...
...
libavformat/sdp.c
View file @
2386cfc1
...
...
@@ -680,6 +680,14 @@ static char *sdp_write_media_attributes(char *buff, int size, AVStream *st, int
p
->
sample_rate
);
break
;
}
case
AV_CODEC_ID_ADPCM_G726LE
:
{
if
(
payload_type
>=
RTP_PT_PRIVATE
)
av_strlcatf
(
buff
,
size
,
"a=rtpmap:%d G726-%d/%d
\r\n
"
,
payload_type
,
p
->
bits_per_coded_sample
*
8
,
p
->
sample_rate
);
break
;
}
case
AV_CODEC_ID_ILBC
:
av_strlcatf
(
buff
,
size
,
"a=rtpmap:%d iLBC/%d
\r\n
"
"a=fmtp:%d mode=%d
\r\n
"
,
...
...
libavformat/version.h
View file @
2386cfc1
...
...
@@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 82
#define LIBAVFORMAT_VERSION_MICRO 10
3
#define LIBAVFORMAT_VERSION_MICRO 10
4
#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