change due to xine 0.9.13 changes

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
@@ -178,16 +178,17 @@ static void null_compute_ideal_size (null_driver_t *this, opie_frame_t *frame) {
       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;
@@ -198,17 +199,17 @@ static void null_compute_ideal_size (null_driver_t *this, opie_frame_t *frame) {
                       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:
@@ -329,27 +330,30 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
             }
             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;
 
@@ -363,29 +367,29 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
                     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;
         }
         }
     }