summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c34
1 files changed, 19 insertions, 15 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index 5ee8d5d..79337c2 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -154,85 +154,86 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
frame->frame.copy = null_frame_copy;
frame->frame.field = null_frame_field;
frame->frame.dispose = null_frame_dispose;
frame->yuv2rgb = 0;
/*
* colorspace converter for this frame
*/
frame->yuv2rgb = this->yuv2rgb_factory->create_converter (this->yuv2rgb_factory);
return (vo_frame_t*) frame;
}
// size specific
static void null_compute_ideal_size (null_driver_t *this, opie_frame_t *frame) {
if (!this->m_is_scaling /*|| !this->m_show_video*/) {
printf("Not scaling\n");
frame->ideal_width = frame->width;
frame->ideal_height = frame->height;
frame->ratio_factor = 1.0;
} else {
double image_ratio, desired_ratio, corr_factor;
image_ratio = (double) frame->width / (double) frame->height;
switch (frame->user_ratio) {
case ASPECT_AUTO:
switch (frame->ratio_code) {
case XINE_ASPECT_RATIO_ANAMORPHIC: /* anamorphic */
+ case XINE_ASPECT_RATIO_PAN_SCAN:
desired_ratio = 16.0 /9.0;
break;
case XINE_ASPECT_RATIO_211_1: /* 2.11:1 */
desired_ratio = 2.11/1.0;
break;
case XINE_ASPECT_RATIO_SQUARE: /* square pels */
case XINE_ASPECT_RATIO_DONT_TOUCH: /* probably non-mpeg stream => don't touch aspect ratio */
desired_ratio = image_ratio;
break;
case 0: /* forbidden -> 4:3 */
printf ("video_out_fb: invalid ratio, using 4:3\n");
default:
printf ("video_out_fb: unknown aspect ratio (%d) in stream => using 4:3\n",
frame->ratio_code);
case XINE_ASPECT_RATIO_4_3: /* 4:3 */
desired_ratio = 4.0 / 3.0;
break;
}
break;
case ASPECT_ANAMORPHIC:
- desired_ratio = 16.0 / 9.0;
+ desired_ratio = 16.0 / 9.0;
break;
case ASPECT_DVB:
desired_ratio = 2.0 / 1.0;
break;
case ASPECT_SQUARE:
desired_ratio = image_ratio;
break;
case ASPECT_FULL:
default:
desired_ratio = 4.0 / 3.0;
}
frame->ratio_factor = this->display_ratio * desired_ratio;
corr_factor = frame->ratio_factor / image_ratio ;
if (fabs(corr_factor - 1.0) < 0.005) {
frame->ideal_width = frame->width;
frame->ideal_height = frame->height;
} else {
if (corr_factor >= 1.0) {
frame->ideal_width = frame->width * corr_factor + 0.5;
frame->ideal_height = frame->height;
} else {
frame->ideal_width = frame->width;
frame->ideal_height = frame->height / corr_factor + 0.5;
}
}
}
@@ -305,111 +306,114 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
frame->user_ratio = this->user_ratio;
this->gui_changed = 0;
// frame->show_video = this->m_show_video;
frame->gui_width = this->gui_width;
frame->gui_height = this->gui_height;
null_compute_ideal_size (this, frame);
null_compute_rgb_size (this, frame);
/*
* (re-) allocate
*/
if( frame->data ) {
if(frame->chunk[0] ){
free( frame->chunk[0] );
frame->chunk[0] = NULL;
}
if(frame->chunk[1] ){
free ( frame->chunk[1] );
frame->chunk[1] = NULL;
}
if(frame->chunk[2] ){
free ( frame->chunk[2] );
frame->chunk[2] = NULL;
}
free ( frame->data );
}
printf("after freeing\n");
frame->data = xine_xmalloc (frame->output_width * frame->output_height *
this->bytes_per_pixel );
if( format == IMGFMT_YV12 ) {
- int image_size = width * height; /* cast ouch*/
- frame->frame.base[0] = xine_xmalloc_aligned(16, image_size,
- (void **)&frame->chunk[0] );
- frame->frame.base[1] = xine_xmalloc_aligned(16, image_size,
- (void **)&frame->chunk[1] );
- frame->frame.base[2] = xine_xmalloc_aligned(16, image_size,
- (void **)&frame->chunk[2] );
+ frame->frame.pitches[0] = 8*((width + 7) / 8);
+ frame->frame.pitches[1] = 8*((width + 15) / 16);
+ frame->frame.pitches[2] = 8*((width + 15) / 16);
+ frame->frame.base[0] = xine_xmalloc_aligned (16, frame->frame.pitches[0] * height,(void **)&frame->chunk[0]);
+ frame->frame.base[1] = xine_xmalloc_aligned (16, frame->frame.pitches[1] * ((height+ 1)/2), (void **)&frame->chunk[1]);
+ frame->frame.base[2] = xine_xmalloc_aligned (16, frame->frame.pitches[2] * ((height+ 1)/2), (void **)&frame->chunk[2]);
+
}else{
- int image_size = width * height; /* cast ouch*/
- frame->frame.base[0] = xine_xmalloc_aligned(16, image_size,
- (void **)&frame->chunk[0] );
+ frame->frame.pitches[0] = 8*((width + 3) / 4);
+ frame->frame.pitches[1] = 8*((width + 3) / 4);
+ frame->frame.pitches[2] = 8*((width + 3) / 4);
+
+ frame->frame.base[0] = xine_xmalloc_aligned (16, frame->frame.pitches[0] * height,
+ (void **)&frame->chunk[0]);
frame->chunk[1] = NULL;
frame->chunk[2] = NULL;
}
frame->format = format;
frame->width = width;
frame->height = height;
frame->stripe_height = 16 * frame->output_height / frame->height;
frame->bytes_per_line = frame->output_width * this->bytes_per_pixel;
/*
* set up colorspace converter
*/
if(1 /*this->m_show_video*/ ){
printf("showing video\n");
switch (flags) {
case VO_TOP_FIELD:
case VO_BOTTOM_FIELD:
frame->yuv2rgb->configure (frame->yuv2rgb,
frame->width,
16,
- frame->width*2,
- frame->width,
+ 2*frame->frame.pitches[0],
+ 2*frame->frame.pitches[1],
frame->output_width,
frame->stripe_height,
frame->bytes_per_line*2);
frame->yuv_stride = frame->bytes_per_line*2;
break;
case VO_BOTH_FIELDS:
frame->yuv2rgb->configure (frame->yuv2rgb,
frame->width,
16,
- frame->width,
- frame->width/2,
+ frame->frame.pitches[0],
+ frame->frame.pitches[1],
frame->output_width,
frame->stripe_height,
frame->bytes_per_line);
frame->yuv_stride = frame->bytes_per_line;
break;
}
}
}
printf("after gui changed\n");
/*
* reset dest pointers
*/
if (frame->data) {
switch (flags) {
case VO_TOP_FIELD:
frame->rgb_dst = (uint8_t *)frame->data;
frame->stripe_inc = 2 * frame->stripe_height * frame->bytes_per_line;
break;
case VO_BOTTOM_FIELD:
frame->rgb_dst = (uint8_t *)frame->data + frame->bytes_per_line ;
frame->stripe_inc = 2 * frame->stripe_height * frame->bytes_per_line;
break;
case VO_BOTH_FIELDS:
frame->rgb_dst = (uint8_t *)frame->data;
frame->stripe_inc = frame->stripe_height * frame->bytes_per_line;
break;
}
}
printf("done\n");
}
static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){