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

Update ffmpeg decoder

Browse Source
This commit is contained in:
dijunkun
2023-09-15 17:34:40 +08:00
parent 44f787b360
commit ebd7d87e91
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/media/video/decode/ffmpeg/ffmpeg_decoder.cpp
View File

@@ -60,8 +60,8 @@ int VideoDecoder::Init() {
codec_ctx_->time_base.den = 29; codec_ctx_->time_base.den = 29;
codec_ctx_->width = 1280; codec_ctx_->width = 1280;
codec_ctx_->height = 720; codec_ctx_->height = 720;
codec_ctx_->pix_fmt = AV_PIX_FMT_NV12; // codec_ctx_->pix_fmt = AV_PIX_FMT_NV12; // yuv420 default?
codec_ctx_->color_range = AVCOL_RANGE_MPEG; codec_ctx_->color_range = AVCOL_RANGE_JPEG;
if (avcodec_open2(codec_ctx_, codec_, NULL) < 0) { if (avcodec_open2(codec_ctx_, codec_, NULL) < 0) {
printf("Could not open codec\n"); printf("Could not open codec\n");
@@ -106,12 +106,31 @@ int VideoDecoder::Decode(
} }
if (on_receive_decoded_frame) { if (on_receive_decoded_frame) {
av_image_fill_arrays(frame_nv12_->data, frame_nv12_->linesize, uint64_t start_ts = static_cast<uint64_t>(
decoded_frame_->GetBuffer(), AV_PIX_FMT_NV12, std::chrono::duration_cast<std::chrono::microseconds>(
frame_->width, frame_->height, 1); std::chrono::high_resolution_clock::now().time_since_epoch())
.count());
sws_scale(img_convert_ctx, frame_->data, frame_->linesize, 0, if (1) {
frame_->height, frame_nv12_->data, frame_nv12_->linesize); av_image_fill_arrays(frame_nv12_->data, frame_nv12_->linesize,
decoded_frame_->GetBuffer(), AV_PIX_FMT_NV12,
frame_->width, frame_->height, 1);
sws_scale(img_convert_ctx, frame_->data, frame_->linesize, 0,
frame_->height, frame_nv12_->data, frame_nv12_->linesize);
} else {
memcpy(decoded_frame_->GetBuffer(), frame_->data[0],
frame_->width * frame_->height);
memcpy(decoded_frame_->GetBuffer() + frame_->width * frame_->height,
frame_->data[1], frame_->width * frame_->height / 2);
}
uint64_t now_ts = static_cast<uint64_t>(
std::chrono::duration_cast<std::chrono::microseconds>(
std::chrono::high_resolution_clock::now().time_since_epoch())
.count());
LOG_ERROR("cost {}", now_ts - start_ts);
on_receive_decoded_frame(*decoded_frame_); on_receive_decoded_frame(*decoded_frame_);
if (SAVE_ENCODER_STREAM) { if (SAVE_ENCODER_STREAM) {