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

[feat] support original resolution screen capture on MacOSX

Browse Source
This commit is contained in:
dijunkun
2024-09-06 15:20:06 +08:00
parent 890615e13a
commit f16a4e8aa2
2 changed files with 46 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/screen_capturer/macosx/screen_capturer_avf.cpp
View File

@@ -4,9 +4,6 @@
#include "rd_log.h" #include "rd_log.h"
#define NV12_BUFFER_SIZE 1280 * 720 * 3 / 2
unsigned char nv12_buffer_[NV12_BUFFER_SIZE];
ScreenCapturerAvf::ScreenCapturerAvf() {} ScreenCapturerAvf::ScreenCapturerAvf() {}
ScreenCapturerAvf::~ScreenCapturerAvf() { ScreenCapturerAvf::~ScreenCapturerAvf() {
@@ -14,10 +11,39 @@ ScreenCapturerAvf::~ScreenCapturerAvf() {
capture_thread_.join(); capture_thread_.join();
inited_ = false; inited_ = false;
} }
if (nv12_frame_) {
delete[] nv12_frame_;
nv12_frame_ = nullptr;
}
if (pFormatCtx_) {
avformat_close_input(&pFormatCtx_);
pFormatCtx_ = nullptr;
}
if (pCodecCtx_) {
avcodec_free_context(&pCodecCtx_);
pCodecCtx_ = nullptr;
}
if (options_) {
av_dict_free(&options_);
options_ = nullptr;
}
if (pFrame_) {
av_frame_free(&pFrame_);
pFrame_ = nullptr;
}
if (packet_) {
av_packet_free(&packet_);
packet_ = nullptr;
}
} }
int ScreenCapturerAvf::Init(const RECORD_DESKTOP_RECT &rect, const int fps, int ScreenCapturerAvf::Init(const int fps, cb_desktop_data cb) {
cb_desktop_data cb) {
if (cb) { if (cb) {
_on_data = cb; _on_data = cb;
} }
@@ -84,19 +110,16 @@ int ScreenCapturerAvf::Init(const RECORD_DESKTOP_RECT &rect, const int fps,
const int screen_h = pFormatCtx_->streams[videoindex_]->codecpar->height; const int screen_h = pFormatCtx_->streams[videoindex_]->codecpar->height;
pFrame_ = av_frame_alloc(); pFrame_ = av_frame_alloc();
pFrameNv12_ = av_frame_alloc();
pFrame_->width = screen_w; pFrame_->width = screen_w;
pFrame_->height = screen_h; pFrame_->height = screen_h;
pFrameNv12_->width = 1280;
pFrameNv12_->height = 720; if (!nv12_frame_) {
nv12_frame_ = new unsigned char[screen_w * screen_h * 3 / 2];
}
packet_ = (AVPacket *)av_malloc(sizeof(AVPacket)); packet_ = (AVPacket *)av_malloc(sizeof(AVPacket));
img_convert_ctx_ = sws_getContext(
pFrame_->width, pFrame_->height, pCodecCtx_->pix_fmt, pFrameNv12_->width,
pFrameNv12_->height, AV_PIX_FMT_NV12, SWS_BICUBIC, NULL, NULL, NULL);
inited_ = true; inited_ = true;
return 0; return 0;
@@ -122,17 +145,15 @@ int ScreenCapturerAvf::Start() {
got_picture_ = avcodec_receive_frame(pCodecCtx_, pFrame_); got_picture_ = avcodec_receive_frame(pCodecCtx_, pFrame_);
if (!got_picture_) { if (!got_picture_) {
av_image_fill_arrays(pFrameNv12_->data, pFrameNv12_->linesize, memcpy(nv12_frame_, pFrame_->data[0],
nv12_buffer_, AV_PIX_FMT_NV12, pFrame_->linesize[0] * pFrame_->height);
pFrameNv12_->width, pFrameNv12_->height, 1); memcpy(nv12_frame_ + pFrame_->linesize[0] * pFrame_->height,
pFrame_->data[1],
pFrame_->linesize[1] * pFrame_->height / 2);
sws_scale(img_convert_ctx_, pFrame_->data, pFrame_->linesize, 0, _on_data((unsigned char *)nv12_frame_,
pFrame_->height, pFrameNv12_->data, pFrame_->width * pFrame_->height * 3 / 2, pFrame_->width,
pFrameNv12_->linesize); pFrame_->height);
_on_data((unsigned char *)nv12_buffer_,
pFrameNv12_->width * pFrameNv12_->height * 3 / 2,
pFrameNv12_->width, pFrameNv12_->height);
} }
} }
} }

9
src/screen_capturer/macosx/screen_capturer_avf.h
View File

@@ -32,8 +32,8 @@ class ScreenCapturerAvf : public ScreenCapturer {
~ScreenCapturerAvf(); ~ScreenCapturerAvf();
public: public:
virtual int Init(const RECORD_DESKTOP_RECT &rect, const int fps, virtual int Init(const int fps, cb_desktop_data cb);
cb_desktop_data cb);
virtual int Destroy(); virtual int Destroy();
virtual int Start(); virtual int Start();
@@ -57,8 +57,6 @@ class ScreenCapturerAvf : public ScreenCapturer {
std::string _device_name; std::string _device_name;
RECORD_DESKTOP_RECT _rect;
int _fps; int _fps;
cb_desktop_data _on_data; cb_desktop_data _on_data;
@@ -77,9 +75,8 @@ class ScreenCapturerAvf : public ScreenCapturer {
AVDictionary *options_ = nullptr; AVDictionary *options_ = nullptr;
AVInputFormat *ifmt_ = nullptr; AVInputFormat *ifmt_ = nullptr;
AVFrame *pFrame_ = nullptr; AVFrame *pFrame_ = nullptr;
AVFrame *pFrameNv12_ = nullptr;
AVPacket *packet_ = nullptr; AVPacket *packet_ = nullptr;
struct SwsContext *img_convert_ctx_ = nullptr; unsigned char *nv12_frame_ = nullptr;
// thread // thread
std::thread capture_thread_; std::thread capture_thread_;