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

fix error handling in swscale

Browse Source
This commit is contained in:
Jacek Jendrzej
2017-03-18 15:12:21 +01:00
parent e8ad377b4f
commit 85819d69ee
1 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
generic-pc/video.cpp
View File

@@ -682,28 +682,45 @@ void VDec::run(void)
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)
{ {
bool ret = false; bool ret = false;
int len = 0;
struct SwsContext *scale = NULL; struct SwsContext *scale = NULL;
AVFrame *sframe, *dframe;
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, AV_PIX_FMT_RGB32, 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 false; return ret;
} }
sframe = av_frame_alloc(); AVFrame *sframe = av_frame_alloc();
dframe = av_frame_alloc(); AVFrame *dframe = av_frame_alloc();
if (!sframe || !dframe) { if (sframe && dframe) {
if(len = av_image_fill_arrays(sframe->data, sframe->linesize, &(src)[0], AV_PIX_FMT_RGB32, sw, sh, 1)<0)
ret = false;
if(ret && (len = av_image_fill_arrays(dframe->data, dframe->linesize, &(dst)[0], AV_PIX_FMT_RGB32, dw, dh, 1)<0))
ret = false;
if(ret && (len = sws_scale(scale, sframe->data, sframe->linesize, 0, sh, dframe->data, dframe->linesize)<0))
ret = false;
else
ret = true;
}else{
lt_info_c("%s: could not alloc sframe (%p) or dframe (%p)\n", __func__, sframe, dframe); lt_info_c("%s: could not alloc sframe (%p) or dframe (%p)\n", __func__, sframe, dframe);
goto out; ret = false;
} }
if (av_image_fill_arrays(sframe->data, sframe->linesize, &(src)[0], AV_PIX_FMT_RGB32, sw, sh, 1) < 0) {
if (av_image_fill_arrays(dframe->data, dframe->linesize, &(dst)[0], AV_PIX_FMT_RGB32, sw, sh, 1) < 0) { if(sframe){
sws_scale(scale, sframe->data, sframe->linesize, 0, sh, dframe->data, dframe->linesize); av_frame_free(&sframe);
} sframe = NULL;
} }
out: if(dframe){
av_frame_free(&sframe); av_frame_free(&dframe);
av_frame_free(&dframe); dframe = NULL;
sws_freeContext(scale); }
if(scale){
sws_freeContext(scale);
scale = NULL;
}
lt_info_c("%s: %s scale %ix%i to %ix%i ,len %i\n",ret?" ":"ERROR",__func__, sw, sh, dw, dh,len);
return ret; return ret;
} }
bool cVideo::GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_video, bool get_osd, bool scale_to_video) bool cVideo::GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_video, bool get_osd, bool scale_to_video)
@@ -746,16 +763,25 @@ bool VDec::GetScreenImage(unsigned char * &data, int &xres, int &yres, bool get_
return false; return false;
if (get_video) { if (get_video) {
if (vid_w != xres || vid_h != yres) /* scale video into data... */ if (vid_w != xres || vid_h != yres){ /* scale video into data... */
swscale(&video[0], data, vid_w, vid_h, xres, yres); bool ret = swscale(&video[0], data, vid_w, vid_h, xres, yres);
else /* get_video and no fancy scaling needed */ if(!ret){
free(data);
return false;
}
}else{ /* get_video and no fancy scaling needed */
memcpy(data, &video[0], xres * yres * sizeof(uint32_t)); memcpy(data, &video[0], xres * yres * sizeof(uint32_t));
}
} }
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);
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);
if(!ret){
free(data);
return false;
}
osd = &s_osd; osd = &s_osd;
} }