git.chromium.org Git - chromiumos/third

allow for out-of-tree builds

This adds a few missing build vars to the compile and makes it
so the code can be compiled out-of-tree.

BUG=None
TEST=`emerge-x86-alex ply-image` still works

Change-Id: Ifbec0b8706523c6ec61751f20d8fc874f76c97bb
Reviewed-on: https://gerrit.chromium.org/gerrit/48858
Reviewed-by: Daniel Erat <derat@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

pull in stddef.h for NULL

This file uses NULL, but doesn't include headers for it. It works
currently as the headers it does pull in happen to pull in the right
headers eventually. Make it explicit to fix building with newer
kernel headers.

BUG=None
TEST=`emerge-x86-alex ply-image` still works

Change-Id: I7c1f7096370085956cd9e5f7a2cf9b7de72e5247
Reviewed-on: https://gerrit.chromium.org/gerrit/48857
Reviewed-by: Daniel Erat <derat@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

Use visible size when filling frame buffer

The buffer pixel area is based on nominal framebuffer size rather than
visible area. On systems like Link, the internal panel size is greater
than the external display size, but the nominal framebuffer size is the
latter. This means the amount of memory mapping covers a smaller area
than what is actually needed to fill the internal panel.

This patch updates the fill frame buffer code to use the visible area,
which correctly reflects the size of the internal panel.

BUG=chrome-os-partner:16363
TEST=Boot link and daisy with external monitor attached. make sure the
splash screen is fully white.

Change-Id: I6cacef64dfc4542fab7c87ae6613d78929f497a9
Signed-off-by: Simon Que <sque@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/38655
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

Get true visible area when querying frame buffer device

The visible area is obtained by calling ply_monitor_setup(). This is
the area that represents the actual screen size.

BUG=chrome-os-partner:16339
TEST=Plug in external HDMI monitor on Daisy, boot up, splash screen
should be centered.

Change-Id: Ia71c6f49050bdbe6c3e5c51c6b79bf8b33bb9298
Signed-off-by: Simon Que <sque@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/38500
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>

ply-image: Attempt to improve animation consistency.

When displaying an animation, ply-image previously slept
before loading and displaying each image.  The code was
written such that intervals between frames would be
reasonably consistent when faced with consistent load times
for each image, but less so for inconsistent load times.

This change makes ply-image load the next image before
sleeping the required amount and displaying the image.

In my testing, this leads to very consistent frame intervals
during boot on Lumpy -- out of 18 frames, all but one or two
are shown 25 ms after the previous frame and the others are
all 26 ms.  Doing the same testing with the old code, I see
intervals ranging between 22 and 29 ms.

BUG=chromium-os:33971
TEST=update /etc/init/boot-splash.conf to pass --debug to
     ply-image and to redirect stderr to a file in /tmp;
     after booting, grep it for "showing" and check
     timestamps

Change-Id: Ibb82f8d38d8a19dce555028f9288b70789362edb
Reviewed-on: https://gerrit.chromium.org/gerrit/38433
Commit-Ready: Daniel Erat <derat@chromium.org>
Reviewed-by: Daniel Erat <derat@chromium.org>
Tested-by: Daniel Erat <derat@chromium.org>

ply-image: Separate image loading and displaying.

This renames ply_frame_buffer_show_file() to
ply_frame_buffer_show_image() and makes process_images()
make a separate call to load each image that it wants to
display. No functional changes intended apart from a debug
logging message; I'm just doing this to enable more
fine-grained benchmarking and make it possible to
preemptively load the next image.

BUG=chromium-os:33971
TEST=boot animation still works on lumpy

Change-Id: I53fbe9b2a01ce54377061400829f7c77aea11f46
Reviewed-on: https://gerrit.chromium.org/gerrit/38395
Reviewed-by: Simon Que <sque@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Commit-Ready: Daniel Erat <derat@chromium.org>
Tested-by: Daniel Erat <derat@chromium.org>

Only display the splash screen on the main monitor.

Before this change, we always displayed the splash screen on all
connected monitors. When their resolutions mismatch, this looks ugly.

As per bug chromium-os:34066, we now want the splash screen to only
display on one monitor. To do that, we call into the KMS API to probe
the monitor state, pick a main monitor (LVDS, eDP, or the first
connected one we find), and disable all non-main monitors.

This behaviour is the default, and can be disabled with the new
--no-set-monitors flag.

BUG=chromium-os:34066
TEST=by hand, the splash screen only happens on the main monitor.

Change-Id: I63803311f41a64f3ab26c54a4d72bfe0dd2b374d
Reviewed-on: https://gerrit.chromium.org/gerrit/36276
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>

Remove printf warning.

BUG=none
TEST=compiles, runs.

Change-Id: I6c96c30b5f48893413803032e2ba0c707f783053
Reviewed-on: https://gerrit.chromium.org/gerrit/36296
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: Stéphane Marchesin <marcheu@chromium.org>

Remove unused variables.

TEST=compiles, runs
BUG=none

Change-Id: I828edb745b182df49a7a8093047caca7ba5203ca
Reviewed-on: https://gerrit.chromium.org/gerrit/36275
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Daniel Erat <derat@chromium.org>
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>

ply-image: Add --print-resolution flag.

This adds a new flag that instructs ply-image to print the
space-separated framebuffer width and height to stdout.

I'm also updating the usage method to list all flags.

BUG=chrome-os-partner:10047
TEST=manual: --print-resolution works; previous behavior still works too

Change-Id: I52a3c0570384026247b95c4ab2b642fe26f2edd4
Reviewed-on: https://gerrit.chromium.org/gerrit/27075
Reviewed-by: Daniel Erat <derat@chromium.org>
Tested-by: Daniel Erat <derat@chromium.org>
Commit-Ready: Daniel Erat <derat@chromium.org>

Add a --debug option to ply-image.

The new option is meant to make it easy to confirm placement of
images and to confirm the frame rate of animations. It's primarily
meant to be used for debugging any scripts that display PNG assets,
although it could be useful in debugging ply-image as well.

BUG=None
TEST=run manually from shell prompt

Change-Id: I596aaeb6ab7082f1408a98e1f6fa3b48b2b8b58c
Reviewed-on: https://gerrit.chromium.org/gerrit/19008
Commit-Ready: Richard Barnette <jrbarnette@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>

Add --offset <x,y> for playing animation on specified location

When displaying messages, we need to play animation on top of prepared large
background image.  Since these images are centered in screen, --location does
not work (frame buffer size is unknown to caller) and --offset will be easier
for startup scripts to use.

BUG=chromium-os:21214
TEST=display_boot_message enter_dev1 en  # image centering still works
     ply-image --offset -300,0 /usr/share/chromeos-assets/images/*frame*
     # seeing animation played in -300 pixels from center

Change-Id: I2906d1406ee113ee3cfabfb700017ab7314f480f
Reviewed-on: http://gerrit.chromium.org/gerrit/9926
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Daniel Erat <derat@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>

Add support for dynamically specified frame rate.

This adds a new --frame-interval option to specify the frame rate
in milliseconds per frame.

BUG=chromium-os:21214
TEST=for T in 5 10 50 100 1000; do time ./ply-image --frame-interval $T /usr/share/chromeos-assets/images/boot_splash*; done

Change-Id: I95b3a9012f55fedcab713f315e686e3a8daf259a
Reviewed-on: http://gerrit.chromium.org/gerrit/9804
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Commit-Ready: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>

Add clear color support to ply-image.

Change-Id: Icf3d7db319313a1a5eb5aa4b18beaba781dfd110
Reviewed-on: http://gerrit.chromium.org/gerrit/8435
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: Stéphane Marchesin <marcheu@chromium.org>

Fix centering when an image exceeds display boundaries.

ply_frame_buffer_fill_centered() incorrectly used unsigned
arithmetic to calculate centering offsets. If the image was
larger than the frame buffer, the calculated x and/or y offset
would be wrong, causing the image not to be displayed.

BUG=chromium-os:16765
TEST=manually display a 1366x800 image on a 1280x800 display

Change-Id: Ibcdd5cd27e6aee4d7ec0a0d6054867cabbc48a82
Reviewed-on: http://gerrit.chromium.org/gerrit/2917
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>

Respect PKG_CONFIG variable if set in the environment.

This is required for the new cross-compilation support using pkg-config
wrappers instead of changing the pkg-config files themselves.

BUG=chromium-os:16222
TEST=emerge-arm-generic with and without pkg-config wrappers

Change-Id: I6bb5bc15bb7402c06cc3b9cada660bcc8163f61d
Reviewed-on: http://gerrit.chromium.org/gerrit/2190
Reviewed-by: Anush Elangovan <anush@chromium.org>
Tested-by: David James <davidjames@chromium.org>

Add an option to allow specifying the location for images.

This deletes the command line arguments that previously were used to
specify the location of animation frames, as well as fixes bugs that
prevented any location but (0, 0) from being useful.

BUG=None
TEST=Boot and observe the splash screen

Change-Id: I9ca7e0ef0d1b03a4675cd5bde0f0c7f4f70afa91
Reviewed-on: http://gerrit.chromium.org/gerrit/1728
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>
Tested-by: Abhishek Shroff <shroff@google.com>
Tested-by: Richard Barnette <jrbarnette@chromium.org>

Clean up ply-frame-buffer.h

  + Remove declarations of non-existent functions.
  + Re-order to put related function declarations together.
  + Adjust style conformance.

BUG=None
TEST=Manual test on VT2

Change-Id: I820c2ee83792ae4a7a81b97f29f24669192e581a
Reviewed-on: http://gerrit.chromium.org/gerrit/2007
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Daniel Erat <derat@chromium.org>

Style conformance fixes to ply-frame-buffer.c

BUG=None
TEST=Manual test on VT2

Change-Id: Ie0a3d2650f89524ac78cd190f9688f11cf4545a4
Reviewed-on: http://gerrit.chromium.org/gerrit/1925
Reviewed-by: Daniel Erat <derat@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>

Make the contents of ply-image.c private.

Added 'static' to everything in ply-image.c except for main().
Also deleted ply-image.h, as its sole purpose was to export the
private definitions.

BUG=None
TEST=Manual test on VT2

Change-Id: Icb4094acda497ec214ea96211f38303e5daa8fbd
Reviewed-on: http://gerrit.chromium.org/gerrit/1909
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Daniel Erat <derat@chromium.org>

Style fixes for ply-image.c

The changes are whitespace only, and are targeted at matching the
style in ply-gamma.c and with Google's C++ style conventions.

BUG=None
TEST=Manual test on VT2

Change-Id: I93d2bd204fd09606d17f0c1f144837507a01a1c9
Reviewed-on: http://gerrit.chromium.org/gerrit/1900
Reviewed-by: Daniel Erat <derat@chromium.org>
Tested-by: Richard Barnette <jrbarnette@chromium.org>

Remove dead code and unneeded #include's from ply-image

BUG=None
TEST=Manual test on VT2

Change-Id: Ib518b6001f5fbadb8d9f6f3cbeb637a7becb89c4
Reviewed-on: http://gerrit.chromium.org/gerrit/1890
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Daniel Erat <derat@chromium.org>
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>

Don't require a Chromium copyright header on ply-image files.

ply-image is derived from third party code subject to the GPL.
We can't (or at least shouldn't always) have Chromium copyright
headers on files here.

BUG=None
TEST=Upload a new change to any file

Change-Id: I5be5a735720a92de590000493a23c3d1b8590184
Reviewed-on: http://gerrit.chromium.org/gerrit/1731
Tested-by: Richard Barnette <jrbarnette@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>

Fix argument parsing regression (allow "ply-image <image>" again)

BUG=chromium-os:15059
TEST=run the program with one argument

Change-Id: Ibb171e23e920ecb9323fce87bc7fb4abc9dc9526
Reviewed-on: http://gerrit.chromium.org/gerrit/532
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>
Tested-by: Luigi Semenzato <semenzato@chromium.org>

Add gamma support to ply-image.

BUG=chromium-os:10138
TEST=Run chrome os with a color profile, check that it gets loaded (I use a profile with one of the components zeroed for testing so changes are obvious).

Review URL: http://codereview.chromium.org/6877024

Change-Id: I328c32c30e7e73080895b0344bdcc354a6ad7053

Make animation loop more understandable.

Change-Id: I71215e8f36abe82e591ec35880962628827a4b6f

BUG=10292
TEST=ran the program

Review URL: http://codereview.chromium.org/6019001

Add frame-by-frame animation.

Change-Id: Ia4c409a75e923c7f4e549a2ce6d9d8e95835e84b

BUG=chromium-os:10292
TEST=ran on CR-48

Review URL: http://codereview.chromium.org/5819001

Added math library to ply-image -l list so that it is explicitly passed to the linker.
Without this, the package won't link with the gold linker. This is not a gold bug.

Change-Id: I9b28df107f7d3c1124a4d94e4d3a9e49c1552fa7

BUG=
TEST=

Review URL: http://codereview.chromium.org/3425011

ply-image: Add --clear flag.

If this is specified, we just clear the entire framebuffer
to black instead of copying an image onto it. I'm going to
use this to clear the framebuffer once it's been copied into
X's root window; otherwise, the boot splash screen is
briefly visible after X exits due to logout or shutdown.

This change also deletes the old dpkg-based build scripts.

BUG=chromium-os:4279
TEST=ran both with image files and with --clear

Review URL: http://codereview.chromium.org/3262011

Change-Id: I3213769a26a7e8fc5a3b879e202630809cb262f9

Setup code review inheritance

Change-Id: I445808a66fea00c2f48558dbee581749acb2b978

Support ply-image splash screen display for ST1q

Change-Id: Ib452052603331a8f76c285cc248e25ef2d0cc1fe

Review URL: http://codereview.chromium.org/2083008
Patch from Krishna Konda <kkonda@codeaurora.org>.

Fix ply-image cross compile on ARM. Remove explicit strip command since emerged does the right thing

TEST=emerge-voguet20 ply-image and emerge-x86-generic ply-image

Review URL: http://codereview.chromium.org/2062002

ply-image: Switch to new cross-friendly packaging style

Use dh(1).
Build-depend on libpng12-dev.
Make the top-level Makefile useful.
Pass toolchain parameters correctly for cross-compilation.
Remove build.sh; debian/rules takes care of calling make now.

Review URL: http://codereview.chromium.org/518060

Let ply-image pull in CFLAGS when cross compiling.
Eventually we'll want to get rid of the -O2, but
I'm leaving it in place for now.

Review URL: http://chromereview.prom.corp.google.com/1173149

git-svn-id: svn://chrome-svn/chromeos/trunk@98 06c00378-0e64-4dae-be16-12b19f9950a1

Changes to be able to cross-compile chromeos-wm.

Review URL: http://chromereview.prom.corp.google.com/1178019

git-svn-id: svn://chrome-svn/chromeos/trunk@94 06c00378-0e64-4dae-be16-12b19f9950a1

Fix bug in ply-image for the (unlikely) case when
buffer->area.width != buffer->row_stride.
This particular case remains untested. However, I
verified there is no regression.

Review URL: http://chromereview.prom.corp.google.com/1175041

git-svn-id: svn://chrome-svn/chromeos/trunk@40 06c00378-0e64-4dae-be16-12b19f9950a1

Center the boot splash image.

This makes ply-image center the image, clipping it as necessary,
and leaving untouched the parts of the frame buffer not covered
by the centered image.

Review URL: http://chromereview.prom.corp.google.com/1176007

git-svn-id: svn://chrome-svn/chromeos/trunk@37 06c00378-0e64-4dae-be16-12b19f9950a1