Mercurial > mplayer.hg

comparison libswscale/swscale.c @ 26150:1df4a811aa9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove redundant SwScaler text since av_log uses AVClass context
author bcoudurier
date Thu, 06 Mar 2008 09:51:25 +0000
parents 1b59dfbe0308
children 5884743208b6
comparison
equal deleted inserted replaced
26149:484bf3498911 26150:1df4a811aa9c
2242 ff_bfin_get_unscaled_swscale (c); 2242 ff_bfin_get_unscaled_swscale (c);
2243 #endif 2243 #endif
2244 2244
2245 if (c->swScale){ 2245 if (c->swScale){
2246 if (flags&SWS_PRINT_INFO) 2246 if (flags&SWS_PRINT_INFO)
2247 av_log(c, AV_LOG_INFO, "SwScaler: using unscaled %s -> %s special converter\n", 2247 av_log(c, AV_LOG_INFO, "using unscaled %s -> %s special converter\n",
2248 sws_format_name(srcFormat), sws_format_name(dstFormat)); 2248 sws_format_name(srcFormat), sws_format_name(dstFormat));
2249 return c; 2249 return c;
2250 } 2250 }
2251 } 2251 }
2252 2252
2254 { 2254 {
2255 c->canMMX2BeUsed= (dstW >=srcW && (dstW&31)==0 && (srcW&15)==0) ? 1 : 0; 2255 c->canMMX2BeUsed= (dstW >=srcW && (dstW&31)==0 && (srcW&15)==0) ? 1 : 0;
2256 if (!c->canMMX2BeUsed && dstW >=srcW && (srcW&15)==0 && (flags&SWS_FAST_BILINEAR)) 2256 if (!c->canMMX2BeUsed && dstW >=srcW && (srcW&15)==0 && (flags&SWS_FAST_BILINEAR))
2257 { 2257 {
2258 if (flags&SWS_PRINT_INFO) 2258 if (flags&SWS_PRINT_INFO)
2259 av_log(c, AV_LOG_INFO, "SwScaler: output Width is not a multiple of 32 -> no MMX2 scaler\n"); 2259 av_log(c, AV_LOG_INFO, "output Width is not a multiple of 32 -> no MMX2 scaler\n");
2260 } 2260 }
2261 if (usesHFilter) c->canMMX2BeUsed=0; 2261 if (usesHFilter) c->canMMX2BeUsed=0;
2262 } 2262 }
2263 else 2263 else
2264 c->canMMX2BeUsed=0; 2264 c->canMMX2BeUsed=0;
2405 char *dither= " dithered"; 2405 char *dither= " dithered";
2406 #else 2406 #else
2407 char *dither= ""; 2407 char *dither= "";
2408 #endif 2408 #endif
2409 if (flags&SWS_FAST_BILINEAR) 2409 if (flags&SWS_FAST_BILINEAR)
2410 av_log(c, AV_LOG_INFO, "SwScaler: FAST_BILINEAR scaler, "); 2410 av_log(c, AV_LOG_INFO, "FAST_BILINEAR scaler, ");
2411 else if (flags&SWS_BILINEAR) 2411 else if (flags&SWS_BILINEAR)
2412 av_log(c, AV_LOG_INFO, "SwScaler: BILINEAR scaler, "); 2412 av_log(c, AV_LOG_INFO, "BILINEAR scaler, ");
2413 else if (flags&SWS_BICUBIC) 2413 else if (flags&SWS_BICUBIC)
2414 av_log(c, AV_LOG_INFO, "SwScaler: BICUBIC scaler, "); 2414 av_log(c, AV_LOG_INFO, "BICUBIC scaler, ");
2415 else if (flags&SWS_X) 2415 else if (flags&SWS_X)
2416 av_log(c, AV_LOG_INFO, "SwScaler: Experimental scaler, "); 2416 av_log(c, AV_LOG_INFO, "Experimental scaler, ");
2417 else if (flags&SWS_POINT) 2417 else if (flags&SWS_POINT)
2418 av_log(c, AV_LOG_INFO, "SwScaler: Nearest Neighbor / POINT scaler, "); 2418 av_log(c, AV_LOG_INFO, "Nearest Neighbor / POINT scaler, ");
2419 else if (flags&SWS_AREA) 2419 else if (flags&SWS_AREA)
2420 av_log(c, AV_LOG_INFO, "SwScaler: Area Averageing scaler, "); 2420 av_log(c, AV_LOG_INFO, "Area Averageing scaler, ");
2421 else if (flags&SWS_BICUBLIN) 2421 else if (flags&SWS_BICUBLIN)
2422 av_log(c, AV_LOG_INFO, "SwScaler: luma BICUBIC / chroma BILINEAR scaler, "); 2422 av_log(c, AV_LOG_INFO, "luma BICUBIC / chroma BILINEAR scaler, ");
2423 else if (flags&SWS_GAUSS) 2423 else if (flags&SWS_GAUSS)
2424 av_log(c, AV_LOG_INFO, "SwScaler: Gaussian scaler, "); 2424 av_log(c, AV_LOG_INFO, "Gaussian scaler, ");
2425 else if (flags&SWS_SINC) 2425 else if (flags&SWS_SINC)
2426 av_log(c, AV_LOG_INFO, "SwScaler: Sinc scaler, "); 2426 av_log(c, AV_LOG_INFO, "Sinc scaler, ");
2427 else if (flags&SWS_LANCZOS) 2427 else if (flags&SWS_LANCZOS)
2428 av_log(c, AV_LOG_INFO, "SwScaler: Lanczos scaler, "); 2428 av_log(c, AV_LOG_INFO, "Lanczos scaler, ");
2429 else if (flags&SWS_SPLINE) 2429 else if (flags&SWS_SPLINE)
2430 av_log(c, AV_LOG_INFO, "SwScaler: Bicubic spline scaler, "); 2430 av_log(c, AV_LOG_INFO, "Bicubic spline scaler, ");
2431 else 2431 else
2432 av_log(c, AV_LOG_INFO, "SwScaler: ehh flags invalid?! "); 2432 av_log(c, AV_LOG_INFO, "ehh flags invalid?! ");
2433 2433
2434 if (dstFormat==PIX_FMT_BGR555 || dstFormat==PIX_FMT_BGR565) 2434 if (dstFormat==PIX_FMT_BGR555 || dstFormat==PIX_FMT_BGR565)
2435 av_log(c, AV_LOG_INFO, "from %s to%s %s ", 2435 av_log(c, AV_LOG_INFO, "from %s to%s %s ",
2436 sws_format_name(srcFormat), dither, sws_format_name(dstFormat)); 2436 sws_format_name(srcFormat), dither, sws_format_name(dstFormat));
2437 else 2437 else
2453 if (flags & SWS_PRINT_INFO) 2453 if (flags & SWS_PRINT_INFO)
2454 { 2454 {
2455 if (flags & SWS_CPU_CAPS_MMX) 2455 if (flags & SWS_CPU_CAPS_MMX)
2456 { 2456 {
2457 if (c->canMMX2BeUsed && (flags&SWS_FAST_BILINEAR)) 2457 if (c->canMMX2BeUsed && (flags&SWS_FAST_BILINEAR))
2458 av_log(c, AV_LOG_VERBOSE, "SwScaler: using FAST_BILINEAR MMX2 scaler for horizontal scaling\n"); 2458 av_log(c, AV_LOG_VERBOSE, "using FAST_BILINEAR MMX2 scaler for horizontal scaling\n");
2459 else 2459 else
2460 { 2460 {
2461 if (c->hLumFilterSize==4) 2461 if (c->hLumFilterSize==4)
2462 av_log(c, AV_LOG_VERBOSE, "SwScaler: using 4-tap MMX scaler for horizontal luminance scaling\n"); 2462 av_log(c, AV_LOG_VERBOSE, "using 4-tap MMX scaler for horizontal luminance scaling\n");
2463 else if (c->hLumFilterSize==8) 2463 else if (c->hLumFilterSize==8)
2464 av_log(c, AV_LOG_VERBOSE, "SwScaler: using 8-tap MMX scaler for horizontal luminance scaling\n"); 2464 av_log(c, AV_LOG_VERBOSE, "using 8-tap MMX scaler for horizontal luminance scaling\n");
2465 else 2465 else
2466 av_log(c, AV_LOG_VERBOSE, "SwScaler: using n-tap MMX scaler for horizontal luminance scaling\n"); 2466 av_log(c, AV_LOG_VERBOSE, "using n-tap MMX scaler for horizontal luminance scaling\n");
2467 2467
2468 if (c->hChrFilterSize==4) 2468 if (c->hChrFilterSize==4)
2469 av_log(c, AV_LOG_VERBOSE, "SwScaler: using 4-tap MMX scaler for horizontal chrominance scaling\n"); 2469 av_log(c, AV_LOG_VERBOSE, "using 4-tap MMX scaler for horizontal chrominance scaling\n");
2470 else if (c->hChrFilterSize==8) 2470 else if (c->hChrFilterSize==8)
2471 av_log(c, AV_LOG_VERBOSE, "SwScaler: using 8-tap MMX scaler for horizontal chrominance scaling\n"); 2471 av_log(c, AV_LOG_VERBOSE, "using 8-tap MMX scaler for horizontal chrominance scaling\n");
2472 else 2472 else
2473 av_log(c, AV_LOG_VERBOSE, "SwScaler: using n-tap MMX scaler for horizontal chrominance scaling\n"); 2473 av_log(c, AV_LOG_VERBOSE, "using n-tap MMX scaler for horizontal chrominance scaling\n");
2474 } 2474 }
2475 } 2475 }
2476 else 2476 else
2477 { 2477 {
2478 #if defined(ARCH_X86) 2478 #if defined(ARCH_X86)
2479 av_log(c, AV_LOG_VERBOSE, "SwScaler: using X86-Asm scaler for horizontal scaling\n"); 2479 av_log(c, AV_LOG_VERBOSE, "using X86-Asm scaler for horizontal scaling\n");
2480 #else 2480 #else
2481 if (flags & SWS_FAST_BILINEAR) 2481 if (flags & SWS_FAST_BILINEAR)
2482 av_log(c, AV_LOG_VERBOSE, "SwScaler: using FAST_BILINEAR C scaler for horizontal scaling\n"); 2482 av_log(c, AV_LOG_VERBOSE, "using FAST_BILINEAR C scaler for horizontal scaling\n");
2483 else 2483 else
2484 av_log(c, AV_LOG_VERBOSE, "SwScaler: using C scaler for horizontal scaling\n"); 2484 av_log(c, AV_LOG_VERBOSE, "using C scaler for horizontal scaling\n");
2485 #endif 2485 #endif
2486 } 2486 }
2487 if (isPlanarYUV(dstFormat)) 2487 if (isPlanarYUV(dstFormat))
2488 { 2488 {
2489 if (c->vLumFilterSize==1) 2489 if (c->vLumFilterSize==1)
2490 av_log(c, AV_LOG_VERBOSE, "SwScaler: using 1-tap %s \"scaler\" for vertical scaling (YV12 like)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C"); 2490 av_log(c, AV_LOG_VERBOSE, "using 1-tap %s \"scaler\" for vertical scaling (YV12 like)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
2491 else 2491 else
2492 av_log(c, AV_LOG_VERBOSE, "SwScaler: using n-tap %s scaler for vertical scaling (YV12 like)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C"); 2492 av_log(c, AV_LOG_VERBOSE, "using n-tap %s scaler for vertical scaling (YV12 like)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
2493 } 2493 }
2494 else 2494 else
2495 { 2495 {
2496 if (c->vLumFilterSize==1 && c->vChrFilterSize==2) 2496 if (c->vLumFilterSize==1 && c->vChrFilterSize==2)
2497 av_log(c, AV_LOG_VERBOSE, "SwScaler: using 1-tap %s \"scaler\" for vertical luminance scaling (BGR)\n" 2497 av_log(c, AV_LOG_VERBOSE, "using 1-tap %s \"scaler\" for vertical luminance scaling (BGR)\n"
2498 "SwScaler: 2-tap scaler for vertical chrominance scaling (BGR)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C"); 2498 " 2-tap scaler for vertical chrominance scaling (BGR)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
2499 else if (c->vLumFilterSize==2 && c->vChrFilterSize==2) 2499 else if (c->vLumFilterSize==2 && c->vChrFilterSize==2)
2500 av_log(c, AV_LOG_VERBOSE, "SwScaler: using 2-tap linear %s scaler for vertical scaling (BGR)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C"); 2500 av_log(c, AV_LOG_VERBOSE, "using 2-tap linear %s scaler for vertical scaling (BGR)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
2501 else 2501 else
2502 av_log(c, AV_LOG_VERBOSE, "SwScaler: using n-tap %s scaler for vertical scaling (BGR)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C"); 2502 av_log(c, AV_LOG_VERBOSE, "using n-tap %s scaler for vertical scaling (BGR)\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
2503 } 2503 }
2504 2504
2505 if (dstFormat==PIX_FMT_BGR24) 2505 if (dstFormat==PIX_FMT_BGR24)
2506 av_log(c, AV_LOG_VERBOSE, "SwScaler: using %s YV12->BGR24 Converter\n", 2506 av_log(c, AV_LOG_VERBOSE, "using %s YV12->BGR24 Converter\n",
2507 (flags & SWS_CPU_CAPS_MMX2) ? "MMX2" : ((flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C")); 2507 (flags & SWS_CPU_CAPS_MMX2) ? "MMX2" : ((flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C"));
2508 else if (dstFormat==PIX_FMT_RGB32) 2508 else if (dstFormat==PIX_FMT_RGB32)
2509 av_log(c, AV_LOG_VERBOSE, "SwScaler: using %s YV12->BGR32 Converter\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C"); 2509 av_log(c, AV_LOG_VERBOSE, "using %s YV12->BGR32 Converter\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
2510 else if (dstFormat==PIX_FMT_BGR565) 2510 else if (dstFormat==PIX_FMT_BGR565)
2511 av_log(c, AV_LOG_VERBOSE, "SwScaler: using %s YV12->BGR16 Converter\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C"); 2511 av_log(c, AV_LOG_VERBOSE, "using %s YV12->BGR16 Converter\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
2512 else if (dstFormat==PIX_FMT_BGR555) 2512 else if (dstFormat==PIX_FMT_BGR555)
2513 av_log(c, AV_LOG_VERBOSE, "SwScaler: using %s YV12->BGR15 Converter\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C"); 2513 av_log(c, AV_LOG_VERBOSE, "using %s YV12->BGR15 Converter\n", (flags & SWS_CPU_CAPS_MMX) ? "MMX" : "C");
2514 2514
2515 av_log(c, AV_LOG_VERBOSE, "SwScaler: %dx%d -> %dx%d\n", srcW, srcH, dstW, dstH); 2515 av_log(c, AV_LOG_VERBOSE, "%dx%d -> %dx%d\n", srcW, srcH, dstW, dstH);
2516 } 2516 }
2517 if (flags & SWS_PRINT_INFO) 2517 if (flags & SWS_PRINT_INFO)
2518 { 2518 {
2519 av_log(c, AV_LOG_DEBUG, "SwScaler:Lum srcW=%d srcH=%d dstW=%d dstH=%d xInc=%d yInc=%d\n", 2519 av_log(c, AV_LOG_DEBUG, "Lum srcW=%d srcH=%d dstW=%d dstH=%d xInc=%d yInc=%d\n",
2520 c->srcW, c->srcH, c->dstW, c->dstH, c->lumXInc, c->lumYInc); 2520 c->srcW, c->srcH, c->dstW, c->dstH, c->lumXInc, c->lumYInc);
2521 av_log(c, AV_LOG_DEBUG, "SwScaler:Chr srcW=%d srcH=%d dstW=%d dstH=%d xInc=%d yInc=%d\n", 2521 av_log(c, AV_LOG_DEBUG, "Chr srcW=%d srcH=%d dstW=%d dstH=%d xInc=%d yInc=%d\n",
2522 c->chrSrcW, c->chrSrcH, c->chrDstW, c->chrDstH, c->chrXInc, c->chrYInc); 2522 c->chrSrcW, c->chrSrcH, c->chrDstW, c->chrDstH, c->chrXInc, c->chrYInc);
2523 } 2523 }
2524 2524
2525 c->swScale= getSwsFunc(flags); 2525 c->swScale= getSwsFunc(flags);
2526 return c; 2526 return c;