mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-28 16:01:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix scale screenshot with clutterfb

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-03-22 18:59:39 +01:00
parent 9823295de1
commit 757cce78af
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
generic-pc/video.cpp
View File

@@ -680,12 +680,12 @@ void VDec::run(void)
lt_info("======================== end decoder thread ================================\n"); lt_info("======================== end decoder thread ================================\n");
} }
static bool swscale(unsigned char *src, unsigned char *dst, int sw, int sh, int dw, int dh) static bool swscale(unsigned char *src, unsigned char *dst, int sw, int sh, int dw, int dh, AVPixelFormat sfmt)
{ {
bool ret = false; bool ret = false;
int len = 0; int len = 0;
struct SwsContext *scale = NULL; struct SwsContext *scale = NULL;
scale = sws_getCachedContext(scale, sw, sh, AV_PIX_FMT_RGB32, dw, dh, AV_PIX_FMT_RGB32, SWS_BICUBIC, 0, 0, 0); scale = sws_getCachedContext(scale, sw, sh, sfmt, dw, dh, AV_PIX_FMT_RGB32, SWS_BICUBIC, 0, 0, 0);
if (!scale) { if (!scale) {
lt_info_c("%s: ERROR setting up SWS context\n", __func__); lt_info_c("%s: ERROR setting up SWS context\n", __func__);
return ret; return ret;
@@ -693,7 +693,7 @@ static bool swscale(unsigned char *src, unsigned char *dst, int sw, int sh, int
AVFrame *sframe = av_frame_alloc(); AVFrame *sframe = av_frame_alloc();
AVFrame *dframe = av_frame_alloc(); AVFrame *dframe = av_frame_alloc();
if (sframe && dframe) { if (sframe && dframe) {
len = av_image_fill_arrays(sframe->data, sframe->linesize, &(src)[0], AV_PIX_FMT_RGB32, sw, sh, 1); len = av_image_fill_arrays(sframe->data, sframe->linesize, &(src)[0], sfmt, sw, sh, 1);
if(len>-1) if(len>-1)
ret = true; ret = true;
@@ -765,21 +765,25 @@ bool VDec::GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_
return false; return false;
if (get_video) { if (get_video) {
#if USE_OPENGL //memcpy dont work with copy BGR24 to RGB32
if (vid_w != xres || vid_h != yres){ /* scale video into data... */ if (vid_w != xres || vid_h != yres){ /* scale video into data... */
bool ret = swscale(&video[0], data, vid_w, vid_h, xres, yres); #endif
bool ret = swscale(&video[0], data, vid_w, vid_h, xres, yres,VDEC_PIXFMT);
if(!ret){ if(!ret){
free(data); free(data);
return false; return false;
} }
#if USE_OPENGL //memcpy dont work with copy BGR24 to RGB32
}else{ /* get_video and no fancy scaling needed */ }else{ /* get_video and no fancy scaling needed */
memcpy(data, &video[0], xres * yres * sizeof(uint32_t)); memcpy(data, &video[0], video.size());
} }
#endif
} }
if (get_osd && (osd_w != xres || osd_h != yres)) { if (get_osd && (osd_w != xres || osd_h != yres)) {
/* rescale osd */ /* rescale osd */
s_osd.resize(need); s_osd.resize(need);
bool ret = swscale(&(*osd)[0], &s_osd[0], osd_w, osd_h, xres, yres); bool ret = swscale(&(*osd)[0], &s_osd[0], osd_w, osd_h, xres, yres,AV_PIX_FMT_RGB32);
if(!ret){ if(!ret){
free(data); free(data);
return false; return false;