History

swscale: x86: Add some forgotten 12-bit planar YUV cases

Michael Niedermayer committed 14 years ago

Commit f5975061 parent 328ea6a2 files · +6 −2Browse files

Unified · Split

2 files
  1. libswscale/x86/scale.asm +2 −0
  2. libswscale/x86/swscale.c +4 −2
libswscale/x86/scale.asm+2−0
@@ -407,11 +407,13 @@ SCALE_FUNC %1, %2, X, X8, 7, %3 · 406 unmodified lines
407SCALE_FUNCS 8, 15, %1407SCALE_FUNCS 8, 15, %1
408SCALE_FUNCS 9, 15, %2408SCALE_FUNCS 9, 15, %2
409SCALE_FUNCS 10, 15, %2409SCALE_FUNCS 10, 15, %2
410SCALE_FUNCS 12, 15, %2
410SCALE_FUNCS 16, 15, %3411SCALE_FUNCS 16, 15, %3
411%endif ; !sse4412%endif ; !sse4
412SCALE_FUNCS 8, 19, %1413SCALE_FUNCS 8, 19, %1
413SCALE_FUNCS 9, 19, %2414SCALE_FUNCS 9, 19, %2
414SCALE_FUNCS 10, 19, %2415SCALE_FUNCS 10, 19, %2
416SCALE_FUNCS 12, 19, %2
415SCALE_FUNCS 16, 19, %3417SCALE_FUNCS 16, 19, %3
416%endmacro418%endmacro
417 419
libswscale/x86/swscale.c+4−2
@@ -215,10 +215,12 @@ void ff_hscale ## from_bpc ## to ## to_bpc ## _ ## filter_n ## _ ## opt( \ · 214 unmodified lines
215 SCALE_FUNC(filter_n, 8, 15, opt); \215 SCALE_FUNC(filter_n, 8, 15, opt); \
216 SCALE_FUNC(filter_n, 9, 15, opt); \216 SCALE_FUNC(filter_n, 9, 15, opt); \
217 SCALE_FUNC(filter_n, 10, 15, opt); \217 SCALE_FUNC(filter_n, 10, 15, opt); \
218 SCALE_FUNC(filter_n, 12, 15, opt); \
218 SCALE_FUNC(filter_n, 16, 15, opt); \219 SCALE_FUNC(filter_n, 16, 15, opt); \
219 SCALE_FUNC(filter_n, 8, 19, opt); \220 SCALE_FUNC(filter_n, 8, 19, opt); \
220 SCALE_FUNC(filter_n, 9, 19, opt); \221 SCALE_FUNC(filter_n, 9, 19, opt); \
221 SCALE_FUNC(filter_n, 10, 19, opt); \222 SCALE_FUNC(filter_n, 10, 19, opt); \
223 SCALE_FUNC(filter_n, 12, 19, opt); \
222 SCALE_FUNC(filter_n, 16, 19, opt)224 SCALE_FUNC(filter_n, 16, 19, opt)
223 225
224#define SCALE_FUNCS_MMX(opt) \226#define SCALE_FUNCS_MMX(opt) \
@@ -325,8 +327,8 @@ av_cold void ff_sws_init_swscale_x86(SwsContext *c) · 100 unmodified lines
325 hscalefn = c->dstBpc <= 15 ? ff_hscale10to15_ ## filtersize ## _ ## opt2 : \327 hscalefn = c->dstBpc <= 15 ? ff_hscale10to15_ ## filtersize ## _ ## opt2 : \
326 ff_hscale10to19_ ## filtersize ## _ ## opt1; \328 ff_hscale10to19_ ## filtersize ## _ ## opt1; \
327 } else if (c->srcBpc == 12) { \329 } else if (c->srcBpc == 12) { \
328 hscalefn = c->dstBpc <= 15 ? ff_hscale16to15_ ## filtersize ## _ ## opt2 : \330 hscalefn = c->dstBpc <= 15 ? ff_hscale12to15_ ## filtersize ## _ ## opt2 : \
329 ff_hscale16to19_ ## filtersize ## _ ## opt1; \331 ff_hscale12to19_ ## filtersize ## _ ## opt1; \
330 } else if (c->srcBpc == 16) { \332 } else if (c->srcBpc == 16) { \
331 hscalefn = c->dstBpc <= 15 ? ff_hscale16to15_ ## filtersize ## _ ## opt2 : \333 hscalefn = c->dstBpc <= 15 ? ff_hscale16to15_ ## filtersize ## _ ## opt2 : \
332 ff_hscale16to19_ ## filtersize ## _ ## opt1; \334 ff_hscale16to19_ ## filtersize ## _ ## opt1; \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t