summaryrefslogtreecommitdiff
authorzecke <zecke>2002-07-11 23:14:01 (UTC)
committer zecke <zecke>2002-07-11 23:14:01 (UTC)
commit5f010888acabe5d00504b05d159b2837ff115f05 (patch) (unidiff)
tree4c4b02679d0829d55e5b3ab02bf518cdadcf97c1
parenta7b8ef4096c17ba5e0ff96e9292a291390831e69 (diff)
downloadopie-5f010888acabe5d00504b05d159b2837ff115f05.zip
opie-5f010888acabe5d00504b05d159b2837ff115f05.tar.gz
opie-5f010888acabe5d00504b05d159b2837ff115f05.tar.bz2
now play video
sandman saved my nite. Many thanks
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/nullvideo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index e50d7b5..f356e76 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -390,65 +390,65 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
390 * reset dest pointers 390 * reset dest pointers
391 */ 391 */
392 392
393 if (frame->data) { 393 if (frame->data) {
394 switch (flags) { 394 switch (flags) {
395 case VO_TOP_FIELD: 395 case VO_TOP_FIELD:
396 frame->rgb_dst = (uint8_t *)frame->data; 396 frame->rgb_dst = (uint8_t *)frame->data;
397 frame->stripe_inc = 2 * frame->stripe_height * frame->bytes_per_line; 397 frame->stripe_inc = 2 * frame->stripe_height * frame->bytes_per_line;
398 break; 398 break;
399 case VO_BOTTOM_FIELD: 399 case VO_BOTTOM_FIELD:
400 frame->rgb_dst = (uint8_t *)frame->data + frame->bytes_per_line ; 400 frame->rgb_dst = (uint8_t *)frame->data + frame->bytes_per_line ;
401 frame->stripe_inc = 2 * frame->stripe_height * frame->bytes_per_line; 401 frame->stripe_inc = 2 * frame->stripe_height * frame->bytes_per_line;
402 break; 402 break;
403 case VO_BOTH_FIELDS: 403 case VO_BOTH_FIELDS:
404 frame->rgb_dst = (uint8_t *)frame->data; 404 frame->rgb_dst = (uint8_t *)frame->data;
405 frame->stripe_inc = frame->stripe_height * frame->bytes_per_line; 405 frame->stripe_inc = frame->stripe_height * frame->bytes_per_line;
406 break; 406 break;
407 } 407 }
408 } 408 }
409 printf("done\n"); 409 printf("done\n");
410} 410}
411static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){ 411static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){
412 null_driver_t* this = (null_driver_t*) self; 412 null_driver_t* this = (null_driver_t*) self;
413 opie_frame_t* frame = (opie_frame_t*)frame_gen; 413 opie_frame_t* frame = (opie_frame_t*)frame_gen;
414 display_xine_frame_t display = this->frameDis; 414 display_xine_frame_t display = this->frameDis;
415 415
416 printf("display frame\n"); 416 printf("display frame\n");
417 // if( this->m_show_video ) { // return if not displaying 417 // if( this->m_show_video ) { // return if not displaying
418 printf("calling home aye\n" ); 418 printf("calling home aye\n" );
419 if( display != NULL ) { 419 if( display != NULL ) {
420 (*display)(this->caller, frame->data, 420 (*display)(this->caller, frame->data,
421 frame->output_width, frame->output_height, 421 frame->output_width, frame->output_height,
422 this->bytes_per_pixel ); 422 frame->bytes_per_line );
423 printf("display done hope you enyoyed the frame"); 423 printf("display done hope you enyoyed the frame");
424 } 424 }
425 // } 425 // }
426 426
427 frame->frame.displayed (&frame->frame); 427 frame->frame.displayed (&frame->frame);
428} 428}
429 429
430 430
431// blending related 431// blending related
432 432
433 433
434static void null_overlay_clut_yuv2rgb(null_driver_t *this, vo_overlay_t *overlay, 434static void null_overlay_clut_yuv2rgb(null_driver_t *this, vo_overlay_t *overlay,
435 opie_frame_t *frame) { 435 opie_frame_t *frame) {
436 int i; 436 int i;
437 clut_t* clut = (clut_t*) overlay->color; 437 clut_t* clut = (clut_t*) overlay->color;
438 if (!overlay->rgb_clut) { 438 if (!overlay->rgb_clut) {
439 for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) { 439 for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) {
440 *((uint32_t *)&clut[i]) = 440 *((uint32_t *)&clut[i]) =
441 frame->yuv2rgb->yuv2rgb_single_pixel_fun (frame->yuv2rgb, 441 frame->yuv2rgb->yuv2rgb_single_pixel_fun (frame->yuv2rgb,
442 clut[i].y, clut[i].cb, clut[i].cr); 442 clut[i].y, clut[i].cb, clut[i].cr);
443 } 443 }
444 overlay->rgb_clut++; 444 overlay->rgb_clut++;
445 } 445 }
446 if (!overlay->clip_rgb_clut) { 446 if (!overlay->clip_rgb_clut) {
447 clut = (clut_t*) overlay->clip_color; 447 clut = (clut_t*) overlay->clip_color;
448 for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) { 448 for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) {
449 *((uint32_t *)&clut[i]) = 449 *((uint32_t *)&clut[i]) =
450 frame->yuv2rgb->yuv2rgb_single_pixel_fun(frame->yuv2rgb, 450 frame->yuv2rgb->yuv2rgb_single_pixel_fun(frame->yuv2rgb,
451 clut[i].y, clut[i].cb, clut[i].cr); 451 clut[i].y, clut[i].cb, clut[i].cr);
452 } 452 }
453 overlay->clip_rgb_clut++; 453 overlay->clip_rgb_clut++;
454 } 454 }