summaryrefslogtreecommitdiff
authorzecke <zecke>2002-07-11 23:14:01 (UTC)
committer zecke <zecke>2002-07-11 23:14:01 (UTC)
commit5f010888acabe5d00504b05d159b2837ff115f05 (patch) (side-by-side diff)
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) (show 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,
* 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 ){
null_driver_t* this = (null_driver_t*) self;
opie_frame_t* frame = (opie_frame_t*)frame_gen;
display_xine_frame_t display = this->frameDis;
printf("display frame\n");
// if( this->m_show_video ) { // return if not displaying
printf("calling home aye\n" );
if( display != NULL ) {
(*display)(this->caller, frame->data,
frame->output_width, frame->output_height,
- this->bytes_per_pixel );
+ frame->bytes_per_line );
printf("display done hope you enyoyed the frame");
}
// }
frame->frame.displayed (&frame->frame);
}
// blending related
static void null_overlay_clut_yuv2rgb(null_driver_t *this, vo_overlay_t *overlay,
opie_frame_t *frame) {
int i;
clut_t* clut = (clut_t*) overlay->color;
if (!overlay->rgb_clut) {
for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) {
*((uint32_t *)&clut[i]) =
frame->yuv2rgb->yuv2rgb_single_pixel_fun (frame->yuv2rgb,
clut[i].y, clut[i].cb, clut[i].cr);
}
overlay->rgb_clut++;
}
if (!overlay->clip_rgb_clut) {
clut = (clut_t*) overlay->clip_color;
for (i = 0; i < sizeof(overlay->color)/sizeof(overlay->color[0]); i++) {
*((uint32_t *)&clut[i]) =
frame->yuv2rgb->yuv2rgb_single_pixel_fun(frame->yuv2rgb,
clut[i].y, clut[i].cb, clut[i].cr);
}
overlay->clip_rgb_clut++;
}