[xiph-commits] r6944 - trunk/theora/doc/spec

silvia at dactyl.lonelymoon.com silvia
Fri Jul 2 03:09:04 PDT 2004


Author: silvia
Date: Fri Jul  2 03:09:04 2004
New Revision: 6944

Added:
trunk/theora/doc/spec/pic_even.fig
trunk/theora/doc/spec/pic_even_odd.fig
trunk/theora/doc/spec/pic_odd.fig
trunk/theora/doc/spec/pic_odd_even.fig
Modified:
trunk/theora/doc/spec/Makefile
trunk/theora/doc/spec/spec.tex
Log:
Added pictures for pixel correspondance between the color planes with
even/odd picture offset and size.



Modified: trunk/theora/doc/spec/Makefile
===================================================================
--- trunk/theora/doc/spec/Makefile	2004-07-01 20:24:17 UTC (rev 6943)
+++ trunk/theora/doc/spec/Makefile	2004-07-02 10:09:01 UTC (rev 6944)
@@ -10,14 +10,16 @@

FIG_SRCS = pic-frame.fig hilbert-mb.fig hilbert-block.fig xifish.fig \
superblock.fig macroblock.fig raster-block.fig reference-frames.fig \
-           pixel444.fig pixel422.fig pixel420.fig idct.fig fdct.fig
+           pixel444.fig pixel422.fig pixel420.fig idct.fig fdct.fig \
+           pic_even.fig pic_even_odd.fig pic_odd.fig pic_odd_even.fig

FIG_TEXS = $(FIG_SRCS:.fig=.tex)
FIG_AUXS = $(FIG_SRCS:.fig=.aux)

FIG_OBJS = pic-frame.tex hilbert-mb.tex hilbert-block.tex xifish.pdf \
superblock.tex macroblock.tex raster-block.tex reference-frames.tex \
-           pixel444.tex pixel422.tex pixel420.tex idct.pdf fdct.pdf
+           pixel444.tex pixel422.tex pixel420.tex idct.pdf fdct.pdf \
+           pic_even.tex pic_even_odd.tex pic_odd.tex pic_odd_even.tex

Theora_I_spec.pdf : spec.pdf
$(MV) $< $@

Added: trunk/theora/doc/spec/pic_even.fig
===================================================================
--- trunk/theora/doc/spec/pic_even.fig	2004-07-01 20:24:17 UTC (rev 6943)
+++ trunk/theora/doc/spec/pic_even.fig	2004-07-02 10:09:01 UTC (rev 6944)
@@ -0,0 +1,102 @@
+#FIG 3.2
+Landscape
+Center
+Metric
+A4
+100.00
+Single
+-2
+1200 2
+6 724 2025 945 2475
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 2244 945 2244 945 2025 732 2025 732 2244
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 2475 945 2475 945 2256 732 2256 732 2475
+-6
+6 1665 2070 1888 2475
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1673 2267 1888 2267 1888 2070 1673 2070 1673 2267
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1673 2475 1888 2475 1888 2278 1673 2278 1673 2475
+-6
+6 724 900 945 1350
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 1119 945 1119 945 900 732 900 732 1119
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 1350 945 1350 945 1131 732 1131 732 1350
+-6
+6 6300 2070 6795 2520
+6 6300 2070 6570 2295
+6 6300 2070 6570 2295
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 6335 2295 6553 2295 6553 2076 6335 2076 6335 2295
+-6
+-6
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 6335 2520 6553 2520 6553 2301 6335 2301 6335 2520
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 6560 2295 6778 2295 6778 2076 6560 2076 6560 2295
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 6560 2520 6778 2520 6778 2301 6560 2301 6560 2520
+-6
+6 4455 2070 4950 2520
+6 4455 2070 4725 2295
+6 4455 2070 4725 2295
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 2295 4708 2295 4708 2076 4490 2076 4490 2295
+-6
+-6
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 2520 4708 2520 4708 2301 4490 2301 4490 2520
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4715 2295 4933 2295 4933 2076 4715 2076 4715 2295
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4715 2520 4933 2520 4933 2301 4715 2301 4715 2520
+-6
+6 4455 945 4950 1395
+6 4455 945 4725 1170
+6 4455 945 4725 1170
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 1170 4708 1170 4708 951 4490 951 4490 1170
+-6
+-6
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 1395 4708 1395 4708 1176 4490 1176 4490 1395
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4715 1170 4933 1170 4933 951 4715 951 4715 1170
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4715 1395 4933 1395 4933 1176 4715 1176 4715 1395
+-6
+2 2 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+	 2249 1800 3736 1800 3736 2947 2249 2947 2249 1800
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2385 1935 3600 1935 3600 2745 2385 2745 2385 1935
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2397 2745 2610 2745 2610 2526 2397 2526 2397 2745
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 3375 2745 3590 2745 3590 2548 3375 2548 3375 2745
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 724 900 1888 900 1888 2475 724 2475 724 900
+2 2 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+	 473 675 2003 675 2003 2925 473 2925 473 675
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2397 2154 2610 2154 2610 1935 2397 1935 2397 2154
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4500 945 6795 945 6795 2520 4500 2520 4500 945
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4500 945 6795 945 6795 2520 4500 2520 4500 945
+2 2 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+	 4005 720 7020 720 7020 2970 4005 2970 4005 720
+4 0 0 50 -1 0 24 0.0000 4 30 270 2835 2655 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 1080 2295 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 765 1665 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 2430 2385 ...\001
+4 0 0 50 -1 0 7 0.0000 4 90 210 450 3060 (0,0)\001
+4 0 0 50 -1 0 7 0.0000 4 90 210 2205 3060 (0,0)\001
+4 0 0 50 -1 0 7 0.0000 4 90 210 3943 3098 (0,0)\001
+4 0 0 50 -1 0 7 0.0000 4 75 285 4545 2655 Pixels\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 5220 2295 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 4680 1755 ...\001
+4 0 0 50 -1 0 9 0.0000 4 105 1335 2205 1665 Frame: chroma (4:2:0 case)\001
+4 0 0 50 -1 0 9 0.0000 4 105 1335 450 585 Frame: chroma (4:2:2 case)\001
+4 0 0 50 -1 0 9 0.0000 4 75 615 4005 630 Frame: luma\001

Added: trunk/theora/doc/spec/pic_even_odd.fig
===================================================================
--- trunk/theora/doc/spec/pic_even_odd.fig	2004-07-01 20:24:17 UTC (rev 6943)
+++ trunk/theora/doc/spec/pic_even_odd.fig	2004-07-02 10:09:01 UTC (rev 6944)
@@ -0,0 +1,88 @@
+#FIG 3.2
+Landscape
+Center
+Metric
+A4
+100.00
+Single
+-2
+1200 2
+6 724 2025 945 2475
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 2244 945 2244 945 2025 732 2025 732 2244
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 2475 945 2475 945 2256 732 2256 732 2475
+-6
+6 1665 2070 1888 2475
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1673 2267 1888 2267 1888 2070 1673 2070 1673 2267
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1673 2475 1888 2475 1888 2278 1673 2278 1673 2475
+-6
+6 4455 2070 4950 2520
+6 4455 2070 4725 2295
+6 4455 2070 4725 2295
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 2295 4708 2295 4708 2076 4490 2076 4490 2295
+-6
+-6
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 2520 4708 2520 4708 2301 4490 2301 4490 2520
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4715 2295 4933 2295 4933 2076 4715 2076 4715 2295
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4715 2520 4933 2520 4933 2301 4715 2301 4715 2520
+-6
+2 2 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+	 2249 1800 3736 1800 3736 2947 2249 2947 2249 1800
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2385 1935 3600 1935 3600 2745 2385 2745 2385 1935
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2397 2745 2610 2745 2610 2526 2397 2526 2397 2745
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 3375 2745 3590 2745 3590 2548 3375 2548 3375 2745
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 724 900 1888 900 1888 2475 724 2475 724 900
+2 2 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+	 473 675 2003 675 2003 2925 473 2925 473 675
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2397 2154 2610 2154 2610 1935 2397 1935 2397 2154
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4500 945 6795 945 6795 2520 4500 2520 4500 945
+2 2 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+	 4005 720 7020 720 7020 2970 4005 2970 4005 720
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4500 945 6795 945 6795 2520 4500 2520 4500 945
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 1170 4708 1170 4708 951 4490 951 4490 1170
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4715 1170 4933 1170 4933 951 4715 951 4715 1170
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 6560 2520 6778 2520 6778 2301 6560 2301 6560 2520
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 6560 2295 6778 2295 6778 2076 6560 2076 6560 2295
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 4715 945 4933 945 4933 726 4715 726 4715 945
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 4490 945 4708 945 4708 726 4490 726 4490 945
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 6785 2295 7003 2295 7003 2076 6785 2076 6785 2295
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 6785 2520 7003 2520 7003 2301 6785 2301 6785 2520
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 1125 945 1125 945 906 732 906 732 1125
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 732 894 945 894 945 675 732 675 732 894
+4 0 0 50 -1 0 24 0.0000 4 30 270 2835 2655 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 1080 2295 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 765 1665 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 2430 2385 ...\001
+4 0 0 50 -1 0 7 0.0000 4 90 210 450 3060 (0,0)\001
+4 0 0 50 -1 0 7 0.0000 4 90 210 2205 3060 (0,0)\001
+4 0 0 50 -1 0 7 0.0000 4 90 210 3943 3098 (0,0)\001
+4 0 0 50 -1 0 7 0.0000 4 75 285 4545 2655 Pixels\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 5220 2295 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 4680 1755 ...\001
+4 0 0 50 -1 0 9 0.0000 4 105 1335 2205 1665 Frame: chroma (4:2:0 case)\001
+4 0 0 50 -1 0 9 0.0000 4 105 1335 450 585 Frame: chroma (4:2:2 case)\001
+4 0 0 50 -1 0 9 0.0000 4 75 615 4005 630 Frame: luma\001

Added: trunk/theora/doc/spec/pic_odd.fig
===================================================================
--- trunk/theora/doc/spec/pic_odd.fig	2004-07-01 20:24:17 UTC (rev 6943)
+++ trunk/theora/doc/spec/pic_odd.fig	2004-07-02 10:09:01 UTC (rev 6944)
@@ -0,0 +1,90 @@
+#FIG 3.2
+Landscape
+Center
+Metric
+A4
+100.00
+Single
+-2
+1200 2
+6 724 2025 945 2475
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 2244 945 2244 945 2025 732 2025 732 2244
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 2475 945 2475 945 2256 732 2256 732 2475
+-6
+6 1665 2070 1888 2475
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1673 2267 1888 2267 1888 2070 1673 2070 1673 2267
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1673 2475 1888 2475 1888 2278 1673 2278 1673 2475
+-6
+6 724 900 945 1350
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 1119 945 1119 945 900 732 900 732 1119
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 1350 945 1350 945 1131 732 1131 732 1350
+-6
+6 6300 2070 6795 2520
+6 6300 2070 6570 2295
+6 6300 2070 6570 2295
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 6335 2295 6553 2295 6553 2076 6335 2076 6335 2295
+-6
+-6
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 6335 2520 6553 2520 6553 2301 6335 2301 6335 2520
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 6560 2295 6778 2295 6778 2076 6560 2076 6560 2295
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 6560 2520 6778 2520 6778 2301 6560 2301 6560 2520
+-6
+2 2 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+	 2249 1800 3736 1800 3736 2947 2249 2947 2249 1800
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2385 1935 3600 1935 3600 2745 2385 2745 2385 1935
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2397 2745 2610 2745 2610 2526 2397 2526 2397 2745
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 3375 2745 3590 2745 3590 2548 3375 2548 3375 2745
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 724 900 1888 900 1888 2475 724 2475 724 900
+2 2 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+	 473 675 2003 675 2003 2925 473 2925 473 675
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2397 2154 2610 2154 2610 1935 2397 1935 2397 2154
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4500 945 6795 945 6795 2520 4500 2520 4500 945
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4500 945 6795 945 6795 2520 4500 2520 4500 945
+2 2 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+	 4005 720 7020 720 7020 2970 4005 2970 4005 720
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 2295 4708 2295 4708 2076 4490 2076 4490 2295
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 2520 4708 2520 4708 2301 4490 2301 4490 2520
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 1170 4708 1170 4708 951 4490 951 4490 1170
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 1395 4708 1395 4708 1176 4490 1176 4490 1395
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 4265 1170 4483 1170 4483 951 4265 951 4265 1170
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 4265 1395 4483 1395 4483 1176 4265 1176 4265 1395
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 4265 2295 4483 2295 4483 2076 4265 2076 4265 2295
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 4265 2520 4483 2520 4483 2301 4265 2301 4265 2520
+4 0 0 50 -1 0 24 0.0000 4 30 270 2835 2655 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 1080 2295 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 765 1665 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 2430 2385 ...\001
+4 0 0 50 -1 0 7 0.0000 4 90 210 450 3060 (0,0)\001
+4 0 0 50 -1 0 7 0.0000 4 90 210 2205 3060 (0,0)\001
+4 0 0 50 -1 0 7 0.0000 4 90 210 3943 3098 (0,0)\001
+4 0 0 50 -1 0 7 0.0000 4 75 285 4545 2655 Pixels\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 5220 2295 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 4680 1755 ...\001
+4 0 0 50 -1 0 9 0.0000 4 105 1335 2205 1665 Frame: chroma (4:2:0 case)\001
+4 0 0 50 -1 0 9 0.0000 4 105 1335 450 585 Frame: chroma (4:2:2 case)\001
+4 0 0 50 -1 0 9 0.0000 4 75 615 4005 630 Frame: luma\001

Added: trunk/theora/doc/spec/pic_odd_even.fig
===================================================================
--- trunk/theora/doc/spec/pic_odd_even.fig	2004-07-01 20:24:17 UTC (rev 6943)
+++ trunk/theora/doc/spec/pic_odd_even.fig	2004-07-02 10:09:01 UTC (rev 6944)
@@ -0,0 +1,84 @@
+#FIG 3.2
+Landscape
+Center
+Metric
+A4
+100.00
+Single
+-2
+1200 2
+6 724 2025 945 2475
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 2244 945 2244 945 2025 732 2025 732 2244
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 2475 945 2475 945 2256 732 2256 732 2475
+-6
+6 1665 2070 1888 2475
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1673 2267 1888 2267 1888 2070 1673 2070 1673 2267
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 1673 2475 1888 2475 1888 2278 1673 2278 1673 2475
+-6
+6 724 900 945 1350
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 1119 945 1119 945 900 732 900 732 1119
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 732 1350 945 1350 945 1131 732 1131 732 1350
+-6
+2 2 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+	 2249 1800 3736 1800 3736 2947 2249 2947 2249 1800
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2385 1935 3600 1935 3600 2745 2385 2745 2385 1935
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2397 2745 2610 2745 2610 2526 2397 2526 2397 2745
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 3375 2745 3590 2745 3590 2548 3375 2548 3375 2745
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 724 900 1888 900 1888 2475 724 2475 724 900
+2 2 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+	 473 675 2003 675 2003 2925 473 2925 473 675
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 2397 2154 2610 2154 2610 1935 2397 1935 2397 2154
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4500 945 6795 945 6795 2520 4500 2520 4500 945
+2 2 1 2 0 7 50 -1 -1 6.000 0 0 -1 0 0 5
+	 4005 720 7020 720 7020 2970 4005 2970 4005 720
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 2295 4708 2295 4708 2076 4490 2076 4490 2295
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 2520 4708 2520 4708 2301 4490 2301 4490 2520
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 4265 2295 4483 2295 4483 2076 4265 2076 4265 2295
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 4265 2520 4483 2520 4483 2301 4265 2301 4265 2520
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4500 945 6795 945 6795 2520 4500 2520 4500 945
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 6560 2520 6778 2520 6778 2301 6560 2301 6560 2520
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 6560 2295 6778 2295 6778 2076 6560 2076 6560 2295
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 6785 2295 7003 2295 7003 2076 6785 2076 6785 2295
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 6785 2520 7003 2520 7003 2301 6785 2301 6785 2520
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+	 4490 1170 4708 1170 4708 951 4490 951 4490 1170
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 4265 945 4483 945 4483 726 4265 726 4265 945
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 4265 1170 4483 1170 4483 951 4265 951 4265 1170
+2 2 0 1 0 11 50 -1 43 0.000 0 0 -1 0 0 5
+	 4490 945 4708 945 4708 726 4490 726 4490 945
+4 0 0 50 -1 0 24 0.0000 4 30 270 2835 2655 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 1080 2295 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 765 1665 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 2430 2385 ...\001
+4 0 0 50 -1 0 7 0.0000 4 90 210 450 3060 (0,0)\001
+4 0 0 50 -1 0 7 0.0000 4 90 210 2205 3060 (0,0)\001
+4 0 0 50 -1 0 7 0.0000 4 90 210 3943 3098 (0,0)\001
+4 0 0 50 -1 0 7 0.0000 4 75 285 4545 2655 Pixels\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 5220 2295 ...\001
+4 0 0 50 -1 0 24 0.0000 4 30 270 4680 1755 ...\001
+4 0 0 50 -1 0 9 0.0000 4 105 1335 2205 1665 Frame: chroma (4:2:0 case)\001
+4 0 0 50 -1 0 9 0.0000 4 105 1335 450 585 Frame: chroma (4:2:2 case)\001
+4 0 0 50 -1 0 9 0.0000 4 75 615 4005 630 Frame: luma\001

Modified: trunk/theora/doc/spec/spec.tex
===================================================================
--- trunk/theora/doc/spec/spec.tex	2004-07-01 20:24:17 UTC (rev 6943)
+++ trunk/theora/doc/spec/spec.tex	2004-07-02 10:09:01 UTC (rev 6944)
@@ -1444,7 +1444,7 @@
\label{fig:pixel444}
\end{figure}

-%TODO: Figure.
+% Figure.
%YRB         YRB
%
%
@@ -1480,7 +1480,7 @@
\label{fig:pixel422}
\end{figure}

-%TODO: Figure.
+% Figure.
%Y     RB    Y           Y     RB    Y
%
%
@@ -1521,7 +1521,7 @@
\label{fig:pixel420}
\end{figure}

-%TODO: Figure.
+% Figure.
%Y           Y           Y           Y
%
%      RB                      RB
@@ -1560,24 +1560,25 @@
relative to the luma samples depends on whether or not the X offset of the
picture region is odd.
If the offset is even, each column of chroma samples corresponds to two columns
- of luma samples.
+ of luma samples (see Figure~\ref{fig:pic_even} for an example).
The only exception is if the width is odd, in which case the last column
- corresponds to only one column of luma samples.
+ corresponds to only one column of luma samples (see Figure~\ref{fig:pic_even_odd}).
If the offset is odd, then the first column of chroma samples corresponds to
only one column of luma samples, while the remaining columns each correspond
- to two.
+ to two (see Figure~\ref{fig:pic_odd}).
In this case, if the width is even, the last column again corresponds to only
- one column of luma samples.
+ one column of luma samples (see Figure~\ref{fig:pic_odd_even}).

A similar process is followed with the rows of a picture region of odd height
encoded in the 4:2:0 format.
If the Y offset is even, each row of chroma samples corresponds to two rows of
- luma samples, except with an odd height, where the last row which corresponds
- to one.
+ luma samples (see Figure~\ref{fig:pic_even}), except with an odd height, where
+ the last row corresponds to one row of chroma luna samples only (see
+ Figure~\ref{fig:pic_even_odd}).
If the offset is odd, then it is the first row of chroma samples which
corresponds to only one row of luma samples, while the remaining rows each
- correspond to two, except with an even height, where the last row also
- corresponds to one.
+ correspond to two (Figure~\ref{fig:pic_odd}), except with an even height,
+ where the last row also corresponds to one (Figure~\ref{fig:pic_odd_even}).

Encoders should be aware of these differences in the subsampling when using an
even or odd offset.
@@ -1585,8 +1586,39 @@
or columns of luma samples for every row or column of chroma samples, the
encoder must take care to ensure that the offsets used are both even.

-%TODO: Figures!
+\begin{figure}[htbp]
+\begin{center}
+\include{pic_even}
+\end{center}
+\caption{Pixel correspondance between color planes with even picture offset and even picture size}
+\label{fig:pic_even}
+\end{figure}

+\begin{figure}[htbp]
+\begin{center}
+\include{pic_even_odd}
+\end{center}
+\caption{Pixel correspondance with even picture offset and odd picture size}
+\label{fig:pic_even_odd}
+\end{figure}
+
+\begin{figure}[htbp]
+\begin{center}
+\include{pic_odd}
+\end{center}
+\caption{Pixel correspondance with odd picture offset and odd picture size}
+\label{fig:pic_odd}
+\end{figure}
+
+\begin{figure}[htbp]
+\begin{center}
+\include{pic_odd_even}
+\end{center}
+\caption{Pixel correspondance with odd picture offset and even picture size}
+\label{fig:pic_odd_even}
+\end{figure}
+
+
\chapter{Bitpacking Convention}
\label{sec:bitpacking}




More information about the commits mailing list