Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 189774
Collapse All | Expand All

(-)mediastreamer2/src/nowebcam.c (-1 / +3 lines)
Lines 70-76 Link Here
70 
	sws_ctx=sws_getContext(av_context.width,av_context.height,PIX_FMT_YUV420P,
 70 
	sws_ctx=sws_getContext(av_context.width,av_context.height,PIX_FMT_YUV420P,
71 
		reqsize->width,reqsize->height,PIX_FMT_YUV420P,SWS_FAST_BILINEAR,
 71 
		reqsize->width,reqsize->height,PIX_FMT_YUV420P,SWS_FAST_BILINEAR,
72 
                NULL, NULL, NULL);
 72 
                NULL, NULL, NULL);
73 
	sws_scale(sws_ctx,orig.data,orig.linesize,0,0,dest.data,dest.linesize);
 73 
	if (sws_scale(sws_ctx,orig.data,orig.linesize,0,av_context.height,dest.data,dest.linesize)<0){
74 
		ms_error("jpeg2yuv: sws_scale() failed.");
75 
	}
74 
	sws_freeContext(sws_ctx);
 76 
	sws_freeContext(sws_ctx);
75 
	avcodec_close(&av_context);
 77 
	avcodec_close(&av_context);
76 
	return ret;
 78 
	return ret;
(-)mediastreamer2/src/pixconv.c (-1 / +1 lines)
Lines 139-145 Link Here
139 
                		NULL, NULL, NULL);
 139 
                		NULL, NULL, NULL);
140 
			}
 140 
			}
141 
			if (sws_scale(s->sws_ctx,inbuf.data,inbuf.linesize, 0,
 141 
			if (sws_scale(s->sws_ctx,inbuf.data,inbuf.linesize, 0,
142 
				0, s->outbuf.planes, s->outbuf.strides)!=0){
 142 
				s->size.height, s->outbuf.planes, s->outbuf.strides)<0){
143 
				ms_error("MSPixConv: Error in sws_scale().");
 143 
				ms_error("MSPixConv: Error in sws_scale().");
144 
			}
 144 
			}
145 
			freemsg(im);
 145 
			freemsg(im);
(-)mediastreamer2/src/sizeconv.c (-1 / +1 lines)
Lines 160-166 Link Here
160 
				struct SwsContext *sws_ctx=get_resampler(s,inbuf.w,inbuf.h);
 160 
				struct SwsContext *sws_ctx=get_resampler(s,inbuf.w,inbuf.h);
161 
				mblk_t *om=size_conv_alloc_mblk(s);
 161 
				mblk_t *om=size_conv_alloc_mblk(s);
162 
				if (sws_scale(sws_ctx,inbuf.planes,inbuf.strides, 0,
 162 
				if (sws_scale(sws_ctx,inbuf.planes,inbuf.strides, 0,
163 
					0, s->outbuf.planes, s->outbuf.strides)!=0){
 163 
					inbuf.h, s->outbuf.planes, s->outbuf.strides)<0){
164 
					ms_error("MSSizeConv: error in sws_scale().");
 164 
					ms_error("MSSizeConv: error in sws_scale().");
165 
				}
 165 
				}
166 
				ms_queue_put(f->outputs[0],om);
 166 
				ms_queue_put(f->outputs[0],om);
(-)mediastreamer2/src/videodec.c (-1 / +1 lines)
Lines 241-247 Link Here
241 
                	NULL, NULL, NULL);
 241 
                	NULL, NULL, NULL);
242 
	}
 242 
	}
243 
	if (sws_scale(s->sws_ctx,orig->data,orig->linesize, 0,
 243 
	if (sws_scale(s->sws_ctx,orig->data,orig->linesize, 0,
244 
					0, s->outbuf.planes, s->outbuf.strides)!=0){
 244 
					ctx->height, s->outbuf.planes, s->outbuf.strides)<0){
245 
		ms_error("%s: error in sws_scale().",f->desc->name);
 245 
		ms_error("%s: error in sws_scale().",f->desc->name);
246 
	}
 246 
	}
247 
	return dupmsg(s->yuv_msg);
 247 
	return dupmsg(s->yuv_msg);
(-)mediastreamer2/src/videoout.c (-3 / +3 lines)
Lines 355-361 Link Here
355 
			src->w,src->h,PIX_FMT_RGB24,
 355 
			src->w,src->h,PIX_FMT_RGB24,
356 
			0, NULL, NULL, NULL);
 356 
			0, NULL, NULL, NULL);
357 
	if (sws_scale(sws,src->planes,src->strides, 0,
 357 
	if (sws_scale(sws,src->planes,src->strides, 0,
358 
           			0, &p, &rgb_stride)!=0){
 358 
           			0, &p, &rgb_stride)<0){
359 
			ms_error("Error in 420->rgb sws_scale().");
 359 
			ms_error("Error in 420->rgb sws_scale().");
360 
	}
 360 
	}
361 
	sws_freeContext(sws);
 361 
	sws_freeContext(sws);
Lines 665-671 Link Here
665 
					       obj->local_pic.w,obj->local_pic.h);
 665 
					       obj->local_pic.w,obj->local_pic.h);
666 
		}
 666 
		}
667 
		if (sws_scale(obj->sws2,src.planes,src.strides, 0,
 667 
		if (sws_scale(obj->sws2,src.planes,src.strides, 0,
668 
			      0, obj->local_pic.planes, obj->local_pic.strides)!=0){
 668 
			      src.h, obj->local_pic.planes, obj->local_pic.strides)<0){
669 
		  ms_error("Error in sws_scale().");
 669 
		  ms_error("Error in sws_scale().");
670 
		}
 670 
		}
671 
	      }
 671 
	      }
Lines 683-689 Link Here
683 
			}
 683 
			}
684 
			ms_display_lock(obj->display);
 684 
			ms_display_lock(obj->display);
685 
			if (sws_scale(obj->sws1,src.planes,src.strides, 0,
 685 
			if (sws_scale(obj->sws1,src.planes,src.strides, 0,
686 
            			0, obj->fbuf.planes, obj->fbuf.strides)!=0){
 686 
            			src.h, obj->fbuf.planes, obj->fbuf.strides)<0){
687 
				ms_error("Error in sws_scale().");
 687 
				ms_error("Error in sws_scale().");
688 
			}
 688 
			}
689 
			ms_display_unlock(obj->display);
 689 
			ms_display_unlock(obj->display);

Return to bug 189774