mirror of https://git.ffmpeg.org/ffmpeg.git
8e0a4d2d4d
xserver defines the endianness of the grabbed images. Use this information to set the correct pixel format. This also fixes format selection in configuration depth=32/bpp=32 with xserver on a little endian machine. Before the patch, the big endian layout 0RGB was always selected which is incorrect because BGR0 should be used. RGB24 was also incorrectly assumed (but this format was removed in xserver 1.20). The big-endian settings can be tested using docker+qemu from a little-endian machine: $ docker run --rm --privileged multiarch/qemu-user-static --reset -p yes $ docker run --rm -it -v /tmp:/tmp powerpc64/debian /bin/bash In docker container $ apt-get update $ apt-get install xvfb $ apt-get install x11-apps To test AV_PIX_FMT_0RGB32 $ Xvfb :2 -screen 0 720x480x24 & $ export DISPLAY=:2 $ xclock -geometry 720x480 -bg green #test different colors On your host machine grab the frames using the following command. View output to check that colors are rendered correctly $ ./ffmpeg -y -f x11grab -i :2.0 -codec:v mpeg2video out.mp4 Other pixel formats can be tested by modifying how Xvfb is started in the docker container: AV_PIX_FMT_RGB565 $ Xvfb :2 -screen 0 720x480x16 AV_PIX_FMT_RGB555 $ Xvfb :2 -screen 0 720x480x15 AV_PIX_FMT_BGR24 / AV_PIX_FMT_RGB24 This is difficult to test because bpp=24 support was removed in xserver 1.20 https://lists.x.org/archives/xorg-devel/2018-February/056175.html?hmsr=joyk.com&utm_source=joyk.com&utm_medium=referral However, I was able to run previous version of Xvfb (with some modifications to force 24bpp) to check that images are rendered correctly. Reviewed-by: Carl Eugen Hoyos <ceffmpeg@gmail.com> Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com> |
||
|---|---|---|
| .. | ||
| tests | ||
| .gitignore | ||
| Makefile | ||
| alldevices.c | ||
| alsa.c | ||
| alsa.h | ||
| alsa_dec.c | ||
| alsa_enc.c | ||
| android_camera.c | ||
| audiotoolbox.m | ||
| avdevice.c | ||
| avdevice.h | ||
| avdeviceres.rc | ||
| avfoundation.m | ||
| bktr.c | ||
| caca.c | ||
| decklink_common.cpp | ||
| decklink_common.h | ||
| decklink_common_c.h | ||
| decklink_dec.cpp | ||
| decklink_dec.h | ||
| decklink_dec_c.c | ||
| decklink_enc.cpp | ||
| decklink_enc.h | ||
| decklink_enc_c.c | ||
| dshow.c | ||
| dshow_capture.h | ||
| dshow_common.c | ||
| dshow_crossbar.c | ||
| dshow_enummediatypes.c | ||
| dshow_enumpins.c | ||
| dshow_filter.c | ||
| dshow_pin.c | ||
| fbdev_common.c | ||
| fbdev_common.h | ||
| fbdev_dec.c | ||
| fbdev_enc.c | ||
| file_open.c | ||
| gdigrab.c | ||
| iec61883.c | ||
| internal.h | ||
| jack.c | ||
| kmsgrab.c | ||
| lavfi.c | ||
| libavdevice.v | ||
| libcdio.c | ||
| libdc1394.c | ||
| openal-dec.c | ||
| opengl_enc.c | ||
| opengl_enc_shaders.h | ||
| oss.c | ||
| oss.h | ||
| oss_dec.c | ||
| oss_enc.c | ||
| pulse_audio_common.c | ||
| pulse_audio_common.h | ||
| pulse_audio_dec.c | ||
| pulse_audio_enc.c | ||
| reverse.c | ||
| sdl2.c | ||
| sndio.c | ||
| sndio.h | ||
| sndio_dec.c | ||
| sndio_enc.c | ||
| timefilter.c | ||
| timefilter.h | ||
| utils.c | ||
| v4l2-common.c | ||
| v4l2-common.h | ||
| v4l2.c | ||
| v4l2enc.c | ||
| version.h | ||
| vfwcap.c | ||
| xcbgrab.c | ||
| xv.c | ||