YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-10-27 20:55:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

OpenH264 supports Windows platform

Browse Source
This commit is contained in:
dijunkun
2023-11-07 15:27:57 +08:00
parent 325f626fb5
commit e456ae3577
11 changed files with 116 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/media/video/decode/openh264/openh264_decoder.cpp
View File

@@ -134,14 +134,6 @@ int OpenH264Decoder::Init() {
frame_width_ = 1280;
frame_height_ = 720;
// SEncParamExt sParam;
// sParam.iPicWidth = frame_width_;
// sParam.iPicHeight = frame_height_;
// sParam.iTargetBitrate = 1000000000;
// sParam.iTemporalLayerNum = 1;
// sParam.fMaxFrameRate = 30;
// sParam.iSpatialLayerNum = 1;
decoded_frame_size_ = YUV420P_BUFFER_SIZE;
decoded_frame_ = new uint8_t[YUV420P_BUFFER_SIZE];
nv12_frame_ = new uint8_t[YUV420P_BUFFER_SIZE];
@@ -192,14 +184,27 @@ int OpenH264Decoder::Decode(
unsigned char *dst[3];
int iRet =
openh264_decoder_->DecodeFrameNoDelay(data, size, dst, &sDstBufInfo);
int iRet = openh264_decoder_->DecodeFrame2(data, size, dst, &sDstBufInfo);
// int iRet =
// openh264_decoder_->DecodeFrameNoDelay(data, size, dst, &sDstBufInfo);
if (iRet != 0) {
return -1;
}
if (sDstBufInfo.iBufferStatus == 1) {
// int num_of_buffer = 0;
// iRet = openh264_decoder_->GetOption(
// DECODER_OPTION_NUM_OF_FRAMES_REMAINING_IN_BUFFER, &num_of_buffer);
// LOG_ERROR("Number of buffer {} {}", num_of_buffer, iRet);
// iRet = openh264_decoder_->FlushFrame(dst, &sDstBufInfo);
// if (iRet != 0) {
// LOG_ERROR("FlushFrame state: {}", iRet);
// return -1;
// }
if (1) {
if (on_receive_decoded_frame) {
CopyYUVWithStride(
dst[0], dst[1], dst[2], sDstBufInfo.UsrData.sSystemBuffer.iWidth,

4
src/media/video/decode/video_decoder_factory.cpp
View File

@@ -26,8 +26,8 @@ std::unique_ptr<VideoDecoder> VideoDecoderFactory::CreateVideoDecoder(
return nullptr;
}
} else {
// return std::make_unique<FfmpegVideoDecoder>(FfmpegVideoDecoder());
return std::make_unique<OpenH264Decoder>(OpenH264Decoder());
return std::make_unique<FfmpegVideoDecoder>(FfmpegVideoDecoder());
// return std::make_unique<OpenH264Decoder>(OpenH264Decoder());
}
#endif
}