mirror of
https://gitee.com/xia-chu/ZLMediaKit.git
synced 2026-05-17 07:17:50 +08:00
修复某些流带aud帧不兼容的问题 (#4379)
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
Linux / build (push) Has been cancelled
macOS / build (push) Has been cancelled
Windows / build (push) Has been cancelled
This commit is contained in:
parent
ba877759da
commit
a972fa85ec
@ -153,10 +153,6 @@ bool H264Track::ready() const {
|
|||||||
bool H264Track::inputFrame(const Frame::Ptr &frame) {
|
bool H264Track::inputFrame(const Frame::Ptr &frame) {
|
||||||
using H264FrameInternal = FrameInternal<H264FrameNoCacheAble>;
|
using H264FrameInternal = FrameInternal<H264FrameNoCacheAble>;
|
||||||
int type = H264_TYPE(frame->data()[frame->prefixSize()]);
|
int type = H264_TYPE(frame->data()[frame->prefixSize()]);
|
||||||
if (type == H264Frame::NAL_AUD) {
|
|
||||||
// AUD帧丢弃
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if ((type == H264Frame::NAL_B_P || type == H264Frame::NAL_IDR) && ready()) {
|
if ((type == H264Frame::NAL_B_P || type == H264Frame::NAL_IDR) && ready()) {
|
||||||
return inputFrame_l(frame);
|
return inputFrame_l(frame);
|
||||||
}
|
}
|
||||||
@ -266,6 +262,10 @@ Track::Ptr H264Track::clone() const {
|
|||||||
|
|
||||||
bool H264Track::inputFrame_l(const Frame::Ptr &frame) {
|
bool H264Track::inputFrame_l(const Frame::Ptr &frame) {
|
||||||
int type = H264_TYPE(frame->data()[frame->prefixSize()]);
|
int type = H264_TYPE(frame->data()[frame->prefixSize()]);
|
||||||
|
if (type == H264Frame::NAL_AUD) {
|
||||||
|
// AUD帧丢弃
|
||||||
|
return false;
|
||||||
|
}
|
||||||
bool ret = true;
|
bool ret = true;
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case H264Frame::NAL_SPS: {
|
case H264Frame::NAL_SPS: {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user