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

generic-pc/video: reuse swscale context

Browse Source
This commit is contained in:
Stefan Seyfried
2013-05-26 20:50:58 +02:00
parent 62f0c20738
commit 40d1bb8b63
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
generic-pc/video.cpp
View File

@@ -394,6 +394,7 @@ void cVideo::run(void)
AVFrame *frame, *rgbframe; AVFrame *frame, *rgbframe;
uint8_t *inbuf = (uint8_t *)av_malloc(INBUF_SIZE); uint8_t *inbuf = (uint8_t *)av_malloc(INBUF_SIZE);
AVPacket avpkt; AVPacket avpkt;
struct SwsContext *convert = NULL;
time_t warn_r = 0; /* last read error */ time_t warn_r = 0; /* last read error */
time_t warn_d = 0; /* last decode error */ time_t warn_d = 0; /* last decode error */
@@ -475,9 +476,10 @@ void cVideo::run(void)
lt_info("%s: WARN: pkt->size %d != len %d\n", __func__, avpkt.size, len); lt_info("%s: WARN: pkt->size %d != len %d\n", __func__, avpkt.size, len);
if (got_frame) { if (got_frame) {
unsigned int need = avpicture_get_size(PIX_FMT_RGB32, c->width, c->height); unsigned int need = avpicture_get_size(PIX_FMT_RGB32, c->width, c->height);
struct SwsContext *convert = sws_getContext(c->width, c->height, c->pix_fmt, convert = sws_getCachedContext(convert,
c->width, c->height, PIX_FMT_RGB32, c->width, c->height, c->pix_fmt,
SWS_BICUBIC, 0, 0, 0); c->width, c->height, PIX_FMT_RGB32,
SWS_BICUBIC, 0, 0, 0);
if (!convert) if (!convert)
lt_info("%s: ERROR setting up SWS context\n", __func__); lt_info("%s: ERROR setting up SWS context\n", __func__);
else { else {
@@ -489,7 +491,6 @@ void cVideo::run(void)
c->width, c->height); c->width, c->height);
sws_scale(convert, frame->data, frame->linesize, 0, c->height, sws_scale(convert, frame->data, frame->linesize, 0, c->height,
rgbframe->data, rgbframe->linesize); rgbframe->data, rgbframe->linesize);
sws_freeContext(convert);
if (dec_w != c->width || dec_h != c->height) { if (dec_w != c->width || dec_h != c->height) {
lt_info("%s: pic changed %dx%d -> %dx%d\n", __func__, lt_info("%s: pic changed %dx%d -> %dx%d\n", __func__,
dec_w, dec_h, c->width, c->height); dec_w, dec_h, c->width, c->height);
@@ -523,6 +524,7 @@ void cVideo::run(void)
} }
av_free_packet(&avpkt); av_free_packet(&avpkt);
} }
sws_freeContext(convert);
out2: out2:
avcodec_close(c); avcodec_close(c);
avcodec_free_frame(&frame); avcodec_free_frame(&frame);