cqm
|
89e21038c2
|
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into feature/transcode2
# Conflicts:
# src/Common/MediaSource.h
# src/Common/config.h
# src/Rtsp/RtspMediaSourceImp.h
# src/Rtsp/RtspMediaSourceMuxer.h
# src/Rtsp/RtspMuxer.cpp
# webrtc/WebRtcTransport.cpp
|
2024-09-22 11:40:39 +08:00 |
|
alex
|
4152dcd409
|
AI automatically translates all comments in the code into English (#3917)
|
2024-09-19 14:53:50 +08:00 |
|
cqm
|
d329f76edf
|
Merge branch 'master' of https://gitee.com/xia-chu/ZLMediaKit into transcode2
# Conflicts:
# src/Common/config.cpp
# src/Common/config.h
|
2024-08-19 18:03:03 +08:00 |
|
xiongguangjie
|
ba1a88f202
|
修复ffmpeg5以上默认不合并帧导致解码失败的bug (#3809 #3794)
FFmpegDecoder 默认合并帧，ffmpeg 5以上不支持将不完整的帧送入解码器中，根据 issue #3794 做出修改
|
2024-08-10 11:09:54 +08:00 |
|
cqm
|
e6838f24af
|
fixed build issue
|
2024-07-15 08:47:31 +08:00 |
|
cqm
|
2ffdfab71e
|
Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into transcode2
# Conflicts:
# CMakeLists.txt
# conf/config.ini
# src/Common/MediaSink.cpp
# src/Common/MediaSink.h
# src/Common/MediaSource.cpp
# src/Common/MultiMediaSourceMuxer.h
# src/Common/config.cpp
# src/Common/config.h
# src/Extension/AAC.cpp
# src/Extension/AAC.h
# src/Rtsp/RtpCodec.h
# src/Rtsp/RtspMuxer.cpp
# src/Rtsp/RtspMuxer.h
# webrtc/Nack.cpp
# webrtc/WebRtcTransport.cpp
|
2024-07-15 08:47:30 +08:00 |
|
PioLing
|
c7f2f9e883
|
Change fillPicture (av_image_fill_arrays() ) align size from 1 to 32 (#3142)
|
2023-12-18 16:28:00 +08:00 |
|
xiongziliang
|
e593ef5fef
|
Change av_image_fill_arrays align size from 1 to 32
To avoid crash in some cases
|
2023-12-17 18:22:58 +08:00 |
|
夏楚
|
bbe8f4a018
|
release 8.0
|
2023-12-09 16:23:51 +08:00 |
|
cqm
|
5c92b4e48f
|
增加FFmpegEncoder和test_audio_transcode, 主要修改有:
- 使用FFmpegAudioFifo来简化代码
- 修复转码时间戳不规则递增，导致的音频破音和不连续问题
- 使用double来保存_tsp，避免出现2.5ms的frame_size(ffmpeg内置的opus)
|
2023-08-14 12:57:01 +08:00 |
|
夏楚
|
a17e842da2
|
兼容ffmpeg6.0 (#2648 #2689)
|
2023-07-22 17:29:09 +08:00 |
|
ljx0305
|
1cc0f51c07
|
replace ffmpeg deprecated api avpicture_fill to av_image_fill_arrays (#2279)
|
2023-03-09 15:24:32 +08:00 |
|
ziyue
|
b3ba6d4214
|
完善mk_transcode相关接口
|
2023-02-11 11:35:37 +08:00 |
|
mtdxc
|
754073918a
|
Header refactor (#2115)
* 优化MultiMediaSourceMuxer头文件包含
* 将MediaSinkDelegate和Demux移到MediaSink中
* MediaSource头文件重构, 独立出PacketCache.h
精简Frame和Track的头文件
* Rtmp头文件重构
* Rtsp头文件重构
* webrtc头文件重构
* 规范.h头文件包含，并将其移到.cpp中:
- 尽量不包含Common\config.h
- Util\File.h
- Rtsp/RtspPlayer.h
- Rtmp/RtmpPlayer.h
* 删除多余的Stamp.h和Base64包含
|
2022-11-29 11:07:13 +08:00 |
|
ziyue
|
ac1abb34da
|
新增媒体流flush机制：#1996
|
2022-10-16 19:54:17 +08:00 |
|
ziyue
|
35791aac89
|
优化代码，去除编译警告，修复拼写错误
|
2022-08-08 17:36:07 +08:00 |
|
ziyue
|
9c3b8a6a95
|
时间戳改为64位
|
2022-08-08 17:13:39 +08:00 |
|
alexliyu7352
|
9314a6699b
|
兼容ffmpeg4.x (#1758)
|
2022-06-29 11:02:43 +08:00 |
|
xiongziliang
|
cea30f8180
|
修复低版本gcc编译问题:#1667
|
2022-05-29 22:13:07 +08:00 |
|
ziyue
|
9736badcea
|
优化编解码相关代码
|
2022-05-25 15:51:17 +08:00 |
|
ziyue
|
fa70af7cce
|
移动FFmpeg相关代码
|
2022-05-25 15:51:02 +08:00 |
|