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

Merge remote-tracking branch 'tuxbox/master'

Browse Source
This commit is contained in:
Stefan Seyfried
2017-03-07 19:43:06 +01:00
parent c2f7e1b1c0 bfa589eb08
commit 6f1cfd42bb
54 changed files with 216 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/movieplayer.cpp
View File

@@ -1355,12 +1355,12 @@ void CMoviePlayerGui::PlayFileLoop(void)
}
#endif
/* in case ffmpeg report incorrect values */
if((playstate == CMoviePlayerGui::PLAY) && (speed == 1)){
if(file_prozent > 96 && (playstate == CMoviePlayerGui::PLAY) && (speed == 1)){
if(position_tmp != position){
position_tmp = position ;
eof2 = 0;
}else{
if (++eof2 > 6) {
if (++eof2 > 12) {
at_eof = true;
break;
}
@@ -2501,8 +2501,11 @@ void CMoviePlayerGui::showSubtitle(neutrino_msg_data_t data)
clearSubtitle();
for (unsigned i = 0; i < sub->num_rects; i++) {
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 5, 0)
uint32_t * colors = (uint32_t *) sub->rects[i]->pict.data[1];
#else
uint32_t * colors = (uint32_t *) sub->rects[i]->data[1];
#endif
int xoff = (double) sub->rects[i]->x * xc;
int yoff = (double) sub->rects[i]->y * yc;
int nw = frameBuffer->getWidth4FB_HW_ACC(xoff, (double) sub->rects[i]->w * xc);
@@ -2511,9 +2514,14 @@ void CMoviePlayerGui::showSubtitle(neutrino_msg_data_t data)
printf("Draw: #%d at %d,%d size %dx%d colors %d (x=%d y=%d w=%d h=%d) \n", i+1,
sub->rects[i]->x, sub->rects[i]->y, sub->rects[i]->w, sub->rects[i]->h,
sub->rects[i]->nb_colors, xoff, yoff, nw, nh);
#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(57, 5, 0)
fb_pixel_t * newdata = simple_resize32 (sub->rects[i]->pict.data[0], colors,
sub->rects[i]->nb_colors, sub->rects[i]->w, sub->rects[i]->h, nw, nh);
#else
fb_pixel_t * newdata = simple_resize32 (sub->rects[i]->data[0], colors,
sub->rects[i]->nb_colors, sub->rects[i]->w, sub->rects[i]->h, nw, nh);
#endif
frameBuffer->blit2FB(newdata, nw, nh, xoff, yoff);
free(newdata);