Skip to content

Commit f77de2a

Browse files
committed
Improve background image. Remove unnecessary cleartype test.
1 parent e4a2b48 commit f77de2a

File tree

8 files changed

+20
-20
lines changed

8 files changed

+20
-20
lines changed
Binary file not shown.
-3.54 KB
Binary file not shown.

doc/assets/testimage/VideoCodecTestImage.xml

+6-5
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@
104104
<Rectangle bounds="624 440 8 8"
105105
fill="linear-gradient(from 0 0 to 0 4, repeat, #ff0000 25%, #00ff00 25%, #00ff00 50%, #0000ff 50%, #0000ff 75%, #000000 75%)"
106106
id="rectangle5" stroke="none"/>
107-
<TextArea bounds="520 251 120 53" fill="none" font="8 Pixel Operator \38 " id="textarea6" lineSpacing="2"
107+
<TextArea bounds="520 251 120 109" fill="none" font="8 Pixel Operator \38 " id="textarea6" lineSpacing="2"
108108
stroke="none"
109-
text="The Quick Brown Fox Jumps Over the Lazy Dog. THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG."
109+
text="The Quick Brown Fox Jumps Over the Lazy Dog. THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG. The Quick Brown Fox Jumps Over the Lazy Dog. THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG."
110110
textFill="#000000"/>
111111
<TextArea bounds="472 251 32 8" fill="none" font="8 Pixel Operator \38 " id="textarea1" lineSpacing="1"
112112
stroke="none" text="red" textFill="#ff0000"/>
@@ -137,11 +137,12 @@
137137
<Rectangle bounds="472 120 168 10" fill="#000000" id="rectangle14" stroke="none"/>
138138
<TextArea bounds="472 120 72 8" fill="none" font="8 Pixel Operator \38 " id="textarea13" lineSpacing="1"
139139
stroke="none" text="Photo" textFill="#ffffff"/>
140-
<TextArea bounds="520 303 120 57" fill="none" font="13 Arial" id="textarea14" lineSpacing="2" padding="2 0"
141-
stroke="none" text="the quick brown fox jumps over the lazy dog THE QUICK" textFill="#000000"/>
142-
<Image bounds="519 306 120 56" id="image2" src="SubpixelAntialiasing.png"/>
143140
<Rectangle bounds="472 360 168 10" fill="#000000" id="rectangle15" stroke="none"/>
144141
<TextArea bounds="472 360 168 8" fill="none" font="8 Pixel Operator \38 " id="textarea12" lineSpacing="1"
145142
stroke="none" text="Colors" textFill="#ffffff"/>
143+
<Rectangle bounds="472 0 168 120" id="rectangle19" stroke="none"/>
144+
<Rectangle bounds="472 0 168 10" fill="#000000" id="rectangle20" stroke="none"/>
145+
<TextArea bounds="472 0 112 8" fill="none" font="8 Pixel Operator \38 " id="textarea14" lineSpacing="1"
146+
stroke="none" text="Video Frame" textFill="#ffffff"/>
146147
</Layer>
147148
</Drawing>

doc/assets/testimage/third-party-licenses.md

-11
This file was deleted.

org.monte.demo.aviwriter/src/main/java/org.monte.demo.aviwriter/org/monte/demo/aviwriter/Main.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,13 @@ private static BufferedImage createImage(Format format) {
7575
return img;
7676
}
7777

78-
private static void drawAnimationFrame(BufferedImage img, Graphics2D g, double second) {
78+
private static void drawAnimationFrame(BufferedImage img, Graphics2D g, double second, int frameIndex, int frameCount) {
7979
drawClock(g, 232, 240, 150, second);
80+
81+
g.setPaint(Color.WHITE);
82+
g.fillRect(472, 10, 168, 110);
83+
g.setPaint(Color.BLACK);
84+
g.drawString("Frame " + (frameIndex + 1) + " of " + frameCount, 473, 24);
8085
}
8186

8287
private static void drawClock(Graphics2D g, int cx, int cy, int radius, double seconds) {
@@ -211,7 +216,7 @@ private static void testWriting(File file, Format format) throws IOException {
211216
// Draw the animation
212217
for (int i = 0, n = frameRate.multiply(60).intValue(); i < n; i++) {
213218
double t = frameRate.divide(i).doubleValue() + 8 * 3600 + 25 * 60;
214-
drawAnimationFrame(img, g, t);
219+
drawAnimationFrame(img, g, t, i, n);
215220

216221
// write image to the writer
217222
out.write(0, img, 1);

org.monte.demo.quicktimewriter/src/main/java/org.monte.demo.quicktimewriter/org/monte/demo/quicktimewriter/Main.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private static void testWriting(File file, Format format) throws IOException {
116116
// Draw the animation
117117
for (int i = 0, n = frameRate.multiply(60).intValue(); i < n; i++) {
118118
double t = frameRate.divide(i).doubleValue() + 8 * 3600 + 25 * 60;
119-
drawAnimationFrame(img, g, t);
119+
drawAnimationFrame(img, g, t, i, n);
120120

121121
// write image to the writer
122122
out.write(0, img, 1);
@@ -133,8 +133,13 @@ private static void testWriting(File file, Format format) throws IOException {
133133
}
134134
}
135135

136-
private static void drawAnimationFrame(BufferedImage img, Graphics2D g, double second) {
136+
private static void drawAnimationFrame(BufferedImage img, Graphics2D g, double second, int frameIndex, int frameCount) {
137137
drawClock(g, 232, 240, 150, second);
138+
139+
g.setPaint(Color.WHITE);
140+
g.fillRect(472, 10, 168, 110);
141+
g.setPaint(Color.BLACK);
142+
g.drawString("Frame " + (frameIndex + 1) + " of " + frameCount, 473, 24);
138143
}
139144

140145
private static void drawClock(Graphics2D g, int cx, int cy, int radius, double seconds) {

0 commit comments

Comments
 (0)