Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 269363 Details for
Bug 362883
media-libs/mediastreamer-2.7.3-r1: undefined references in libmediastreamer
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Fix for mediastreamer / videoout.c refactoring
mediastreamer-2.7.3-ms_sws_fix.patch (text/plain), 4.24 KB, created by
Luigi 'Comio' Mantellini
on 2011-04-10 18:34:12 UTC
(
hide
)
Description:
Fix for mediastreamer / videoout.c refactoring
Filename:
MIME Type:
Creator:
Luigi 'Comio' Mantellini
Created:
2011-04-10 18:34:12 UTC
Size:
4.24 KB
patch
obsolete
>--- ./src/videoout.c.old 2011-04-10 20:18:39.956618945 +0200 >+++ ./src/videoout.c 2011-04-10 20:26:30.321738571 +0200 >@@ -474,8 +474,8 @@ > float sv_posx,sv_posy; > int background_color[3]; > >- struct ms_SwsContext *sws1; >- struct ms_SwsContext *sws2; >+ MSScalerContext *sws1; >+ MSScalerContext *sws2; > MSDisplay *display; > bool_t own_display; > bool_t ready; >@@ -552,11 +552,11 @@ > if (obj->display!=NULL && obj->own_display) > ms_display_destroy(obj->display); > if (obj->sws1!=NULL){ >- ms_sws_freeContext(obj->sws1); >+ ms_scaler_context_free(obj->sws1); > obj->sws1=NULL; > } > if (obj->sws2!=NULL){ >- ms_sws_freeContext(obj->sws2); >+ ms_scaler_context_free(obj->sws2); > obj->sws2=NULL; > } > if (obj->local_msg!=NULL) { >@@ -581,11 +581,11 @@ > obj->display=NULL; > } > if (obj->sws1!=NULL){ >- ms_sws_freeContext(obj->sws1); >+ ms_scaler_context_free(obj->sws1); > obj->sws1=NULL; > } > if (obj->sws2!=NULL){ >- ms_sws_freeContext(obj->sws2); >+ ms_scaler_context_free(obj->sws2); > obj->sws2=NULL; > } > if (obj->local_msg!=NULL) { >@@ -665,14 +665,14 @@ > if (ms_yuv_buf_init_from_mblk(&src,inm)==0){ > > if (obj->sws2==NULL){ >- obj->sws2=ms_sws_getContext(src.w,src.h,PIX_FMT_YUV420P, >- obj->fbuf_selfview.w,obj->fbuf_selfview.h,PIX_FMT_YUV420P, >- SWS_FAST_BILINEAR, NULL, NULL, NULL); >+ obj->sws2=ms_scaler_create_context(src.w,src.h,MS_YUV420P, >+ obj->fbuf_selfview.w,obj->fbuf_selfview.h,MS_YUV420P, >+ MS_SCALER_METHOD_BILINEAR); > } > ms_display_lock(obj->display); >- if (ms_sws_scale(obj->sws2,src.planes,src.strides, 0, >- src.h, obj->fbuf_selfview.planes, obj->fbuf_selfview.strides)<0){ >- ms_error("Error in ms_sws_scale()."); >+ if (ms_scaler_process(obj->sws2,src.planes,src.strides, >+ obj->fbuf_selfview.planes, obj->fbuf_selfview.strides)<0){ >+ ms_error("Error in ms_scaler_process()."); > } > if (!mblk_get_precious_flag(inm)) ms_yuv_buf_mirror(&obj->fbuf_selfview); > ms_display_unlock(obj->display); >@@ -683,9 +683,9 @@ > if (ms_yuv_buf_init_from_mblk(&src,inm)==0){ > > if (obj->sws2==NULL){ >- obj->sws2=ms_sws_getContext(src.w,src.h,PIX_FMT_YUV420P, >- obj->local_pic.w,obj->local_pic.h,PIX_FMT_YUV420P, >- SWS_FAST_BILINEAR, NULL, NULL, NULL); >+ obj->sws2=ms_scaler_create_context(src.w,src.h,MS_YUV420P, >+ obj->local_pic.w,obj->local_pic.h,MS_YUV420P, >+ MS_SCALER_METHOD_BILINEAR); > } > if (obj->local_msg==NULL){ > obj->local_msg=ms_yuv_buf_alloc(&obj->local_pic, >@@ -693,9 +693,9 @@ > } > if (obj->local_pic.planes[0]!=NULL) > { >- if (ms_sws_scale(obj->sws2,src.planes,src.strides, 0, >- src.h, obj->local_pic.planes, obj->local_pic.strides)<0){ >- ms_error("Error in ms_sws_scale()."); >+ if (ms_scaler_process(obj->sws2,src.planes,src.strides, >+ obj->local_pic.planes, obj->local_pic.strides)<0){ >+ ms_error("Error in ms_scaler_process()."); > } > if (!mblk_get_precious_flag(inm)) ms_yuv_buf_mirror(&obj->local_pic); > update=1; >@@ -731,14 +731,14 @@ > } > } > if (obj->sws1==NULL){ >- obj->sws1=ms_sws_getContext(src.w,src.h,PIX_FMT_YUV420P, >- obj->fbuf.w,obj->fbuf.h,PIX_FMT_YUV420P, >- SWS_FAST_BILINEAR, NULL, NULL, NULL); >+ obj->sws1=ms_scaler_create_context(src.w,src.h,MS_YUV420P, >+ obj->fbuf.w,obj->fbuf.h,MS_YUV420P, >+ MS_SCALER_METHOD_BILINEAR); > } > ms_display_lock(obj->display); >- if (ms_sws_scale(obj->sws1,src.planes,src.strides, 0, >- src.h, obj->fbuf.planes, obj->fbuf.strides)<0){ >- ms_error("Error in ms_sws_scale()."); >+ if (ms_scaler_process(obj->sws1,src.planes,src.strides, >+ obj->fbuf.planes, obj->fbuf.strides)<0){ >+ ms_error("Error in ms_scaler_process()."); > } > if (obj->mirror && !mblk_get_precious_flag(inm)) ms_yuv_buf_mirror(&obj->fbuf); > ms_display_unlock(obj->display); >--- ./src/x11video.c.old 2011-04-10 20:19:10.143241560 +0200 >+++ ./src/x11video.c 2011-04-10 20:19:26.812033172 +0200 >@@ -444,7 +444,7 @@ > MS_SCALER_METHOD_BILINEAR); > } > if (ms_scaler_process(obj->sws1,src.planes,src.strides, mainpic.planes, mainpic.strides)<0){ >- ms_error("Error in ms_sws_scale()."); >+ ms_error("Error in ms_scaler_process()."); > } > if (obj->mirror && !precious) ms_yuv_buf_mirror(&mainpic); > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 362883
:
269313
|
269317
| 269363