This "works", as in, it will play video fine (I haven't done too much
testing yet). I was using the command,
`./ffmpeg_g -f lavfi -i testsrc=size=1280x720:rate=30 -pix_fmt yuv420p -f sdl2
"k"`
to test.
It will crash on quit, and the Window bar is frozen. At first I thought
it was because there was no ratelimiting, so I added a 10ms delay if
there isn't any events as Marton suggested. However, it didn't seem to
make any difference.
I was also wondering if someone could check my pixel format mappings,
I'm not too experienced with them. I wasn't sure what to do with the
extra mappings as well, I thought that it might be useful to keep them
in the source as a comment for completeness (so someone doesn't have
to dig out which pixel formats weren't mapped at a later date).
Thanks for the help.
---
libavdevice/Makefile | 1 +
libavdevice/alldevices.c | 1 +
libavdevice/sdl2.c | 437 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 439 insertions(+)
create mode 100644 libavdevice/sdl2.c
diff --git a/libavdevice/Makefile b/libavdevice/Makefile
index 585827b..1c4b4d3 100644
--- a/libavdevice/Makefile
+++ b/libavdevice/Makefile
@@ -41,6 +41,7 @@ OBJS-$(CONFIG_PULSE_OUTDEV) += pulse_audio_enc.o
\
pulse_audio_common.o
OBJS-$(CONFIG_QTKIT_INDEV) += qtkit.o
OBJS-$(CONFIG_SDL_OUTDEV) += sdl.o
+OBJS-$(CONFIG_SDL2_OUTDEV) += sdl2.o
OBJS-$(CONFIG_SNDIO_INDEV) += sndio_dec.o sndio.o
OBJS-$(CONFIG_SNDIO_OUTDEV) += sndio_enc.o sndio.o
OBJS-$(CONFIG_V4L2_INDEV) += v4l2.o v4l2-common.o timefilter.o
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c
index 26aecf2..c0a9d9a 100644
--- a/libavdevice/alldevices.c
+++ b/libavdevice/alldevices.c
@@ -64,6 +64,7 @@ void avdevice_register_all(void)
REGISTER_INOUTDEV(PULSE, pulse);
REGISTER_INDEV (QTKIT, qtkit);
REGISTER_OUTDEV (SDL, sdl);
+ REGISTER_OUTDEV (SDL2, sdl2);
REGISTER_INOUTDEV(SNDIO, sndio);
REGISTER_INOUTDEV(V4L2, v4l2);
// REGISTER_INDEV (V4L, v4l
diff --git a/libavdevice/sdl2.c b/libavdevice/sdl2.c
new file mode 100644
index 0000000..ccb26e6
--- /dev/null
+++ b/libavdevice/sdl2.c
@@ -0,0 +1,437 @@
+/*
+ * Copyright (c) 2011 Stefano Sabatini
+ * Copyright (c) 2016 Josh de Kock
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * libSDL output device
+ */
+
+#include <SDL.h>
+#include <SDL_thread.h>
+
+#include "libavutil/avstring.h"
+#include "libavutil/imgutils.h"
+#include "libavutil/opt.h"
+#include "libavutil/parseutils.h"
+#include "libavutil/pixdesc.h"
+#include "libavutil/time.h"
+#include "avdevice.h"
+
+typedef struct {
+ AVClass *class;
+ SDL_Window *window;
+ SDL_Renderer *renderer;
+ char *window_title;
+ int window_width, window_height; /**< size of the window */
+ int window_fullscreen;
+ int window_borderless;
+
+ SDL_Texture *texture;
+ int texture_fmt;
+ SDL_Rect texture_rect;
+
+ int sdl_was_already_inited;
+ SDL_Thread *event_thread;
+ SDL_mutex *mutex;
+ SDL_cond *init_cond;
+ int init_ret; /* return code used to signal initialization errors */
+ int inited;
+ int quit;
+} SDLContext;
+
+static const struct sdl_texture_pix_fmt_entry {
+ enum AVPixelFormat pix_fmt; int texture_fmt;
+} sdl_texture_pix_fmt_map[] = {
+ { AV_PIX_FMT_RGB8, SDL_PIXELFORMAT_RGB332 },
+ { AV_PIX_FMT_RGB444, SDL_PIXELFORMAT_RGB444 },
+ { AV_PIX_FMT_RGB555, SDL_PIXELFORMAT_RGB555 },
+ { AV_PIX_FMT_BGR555, SDL_PIXELFORMAT_BGR555 },
+ // { AV_PIX_FMT_NONE, SDL_PIXELFORMAT_ARGB4444 }, // these aren't
implemented in FFmpeg
+ // { AV_PIX_FMT_NONE, SDL_PIXELFORMAT_RGBA4444 }, // but keeping them here
in-case they
+ // { AV_PIX_FMT_NONE, SDL_PIXELFORMAT_ABGR4444 }, // are
+ // { AV_PIX_FMT_NONE, SDL_PIXELFORMAT_BGRA4444 },
+ // { AV_PIX_FMT_NONE, SDL_PIXELFORMAT_ARGB1555 },
+ // { AV_PIX_FMT_NONE, SDL_PIXELFORMAT_RGBA5551 },
+ // { AV_PIX_FMT_NONE, SDL_PIXELFORMAT_ABGR1555 },
+ // { AV_PIX_FMT_NONE, SDL_PIXELFORMAT_BGRA5551 },
+ { AV_PIX_FMT_RGB565, SDL_PIXELFORMAT_RGB565 },
+ { AV_PIX_FMT_BGR565, SDL_PIXELFORMAT_BGR565 },
+ { AV_PIX_FMT_RGB24, SDL_PIXELFORMAT_RGB24 },
+ { AV_PIX_FMT_BGR24, SDL_PIXELFORMAT_BGR24 },
+ { AV_PIX_FMT_RGB24, SDL_PIXELFORMAT_RGB888 }, // is this mapping right?
+ { AV_PIX_FMT_RGB0, SDL_PIXELFORMAT_RGBX8888 },
+ { AV_PIX_FMT_BGR24, SDL_PIXELFORMAT_BGR888 }, // is this mapping right?
+ { AV_PIX_FMT_BGR0, SDL_PIXELFORMAT_BGRX8888 },
+ { AV_PIX_FMT_ARGB, SDL_PIXELFORMAT_ARGB8888 },
+ { AV_PIX_FMT_RGBA, SDL_PIXELFORMAT_RGBA8888 },
+ { AV_PIX_FMT_ABGR, SDL_PIXELFORMAT_ABGR8888 },
+ { AV_PIX_FMT_BGRA, SDL_PIXELFORMAT_BGRA8888 },
+ // { AV_PIX_FMT_NONE, SDL_PIXELFORMAT_ARGB2101010 }, // not implemented
+ { AV_PIX_FMT_YUV420P, SDL_PIXELFORMAT_IYUV },
+ { AV_PIX_FMT_YUYV422, SDL_PIXELFORMAT_YUY2 },
+ { AV_PIX_FMT_UYVY422, SDL_PIXELFORMAT_UYVY },
+ { AV_PIX_FMT_NONE, NULL },
+};
+
+#define SDL_BASE_FLAGS (SDL_SWSURFACE|SDL_WINDOW_RESIZABLE)
+
+static void compute_texture_rect(AVFormatContext *s)
+{
+ AVRational sar, dar; /* sample and display aspect ratios */
+ SDLContext *sdl = s->priv_data;
+ AVStream *st = s->streams[0];
+ AVCodecContext *encctx = st->codec;
+ SDL_Rect *texture_rect = &sdl->texture_rect;
+
+ /* compute texture width and height from the codec context information */
+ sar = st->sample_aspect_ratio.num ? st->sample_aspect_ratio :
(AVRational){ 1, 1 };
+ dar = av_mul_q(sar, (AVRational){ encctx->width, encctx->height });
+
+ /* we suppose the screen has a 1/1 sample aspect ratio */
+ if (sdl->window_width && sdl->window_height) {
+ /* fit in the window */
+ if (av_cmp_q(dar, (AVRational){ sdl->window_width, sdl->window_height
}) > 0) {
+ /* fit in width */
+ texture_rect->w = sdl->window_width;
+ texture_rect->h = av_rescale(texture_rect->w, dar.den, dar.num);
+ } else {
+ /* fit in height */
+ texture_rect->h = sdl->window_height;
+ texture_rect->w = av_rescale(texture_rect->h, dar.num, dar.den);
+ }
+ } else {
+ if (sar.num > sar.den) {
+ texture_rect->w = encctx->width;
+ texture_rect->h = av_rescale(texture_rect->w, dar.den, dar.num);
+ } else {
+ texture_rect->h = encctx->height;
+ texture_rect->w = av_rescale(texture_rect->h, dar.num, dar.den);
+ }
+ sdl->window_width = texture_rect->w;
+ sdl->window_height = texture_rect->h;
+ }
+
+ texture_rect->x = (sdl->window_width - texture_rect->w) / 2;
+ texture_rect->y = (sdl->window_height - texture_rect->h) / 2;
+}
+
+static int sdl2_write_trailer(AVFormatContext *s)
+{
+ SDLContext *sdl = s->priv_data;
+
+ sdl->quit = 1;
+
+ if (sdl->texture)
+ SDL_DestroyTexture(sdl->texture);
+ sdl->texture = NULL;
+ if (sdl->event_thread)
+ SDL_WaitThread(sdl->event_thread, NULL);
+ sdl->event_thread = NULL;
+ if (sdl->mutex)
+ SDL_DestroyMutex(sdl->mutex);
+ sdl->mutex = NULL;
+ if (sdl->init_cond)
+ SDL_DestroyCond(sdl->init_cond);
+ sdl->init_cond = NULL;
+
+ if (sdl->renderer)
+ SDL_DestroyRenderer(sdl->renderer);
+ sdl->renderer = NULL;
+
+ if (sdl->window)
+ SDL_DestroyWindow(sdl->window);
+ sdl->window = NULL;
+
+ if (!sdl->inited)
+ SDL_Quit();
+
+ return 0;
+}
+
+static int event_thread(void *arg)
+{
+ AVFormatContext *s = arg;
+ SDLContext *sdl = s->priv_data;
+ AVStream *st = s->streams[0];
+ AVCodecContext *encctx = st->codec;
+
+ int flags = SDL_BASE_FLAGS | (sdl->window_fullscreen ?
SDL_WINDOW_FULLSCREEN : 0) |
+ (sdl->window_borderless ?
SDL_WINDOW_BORDERLESS : 0);
+
+ /* initialization */
+ if (!sdl->inited){
+ if (SDL_Init(SDL_INIT_VIDEO) != 0) {
+ av_log(s, AV_LOG_ERROR, "Unable to initialize SDL: %s\n",
SDL_GetError());
+ sdl->init_ret = AVERROR(EINVAL);
+ goto init_end;
+ }
+ }
+
+ compute_texture_rect(s);
+
+ if (SDL_CreateWindowAndRenderer(sdl->window_width, sdl->window_height,
+ flags, &sdl->window, &sdl->renderer) != 0){
+ av_log(sdl, AV_LOG_ERROR, "Couldn't create window and renderer: %s\n",
SDL_GetError());
+ sdl->init_ret = AVERROR(EINVAL);
+ goto init_end;
+ }
+
+ SDL_SetWindowTitle(sdl->window, sdl->window_title);
+
+ sdl->texture = SDL_CreateTexture(sdl->renderer, sdl->texture_fmt,
SDL_TEXTUREACCESS_STREAMING,
+ sdl->window_width, sdl->window_height);
+
+ if (!sdl->texture) {
+ av_log(sdl, AV_LOG_ERROR, "Unable to set create mode: %s\n",
SDL_GetError());
+ sdl->init_ret = AVERROR(EINVAL);
+ goto init_end;
+ }
+
+ av_log(s, AV_LOG_VERBOSE, "w:%d h:%d fmt:%s -> w:%d h:%d\n",
+ encctx->width, encctx->height, av_get_pix_fmt_name(encctx->pix_fmt),
+ sdl->window_width, sdl->window_height);
+
+init_end:
+
+ SDL_LockMutex(sdl->mutex);
+ sdl->inited = 1;
+ SDL_UnlockMutex(sdl->mutex);
+ SDL_CondSignal(sdl->init_cond);
+
+ if (sdl->init_ret < 0)
+ return sdl->init_ret;
+
+ /* event loop */
+ while (!sdl->quit) {
+ SDL_Event event;
+ int ret = SDL_PollEvent(&event);
+ if (ret < 0) {
+ av_log(s, AV_LOG_ERROR, "Error when getting SDL event: %s\n",
SDL_GetError());
+ continue;
+ }
+ if (ret == 0) {
+ SDL_Delay(10);
+ continue;
+ }
+ switch (event.type) {
+ case SDL_KEYDOWN:
+ switch (event.key.keysym.sym) {
+ case SDLK_ESCAPE:
+ case SDLK_q:
+ sdl->quit = 1;
+ break;
+ default:
+ break;
+ }
+ break;
+ case SDL_QUIT:
+ sdl->quit = 1;
+ break;
+ case SDL_WINDOWEVENT:
+ switch(event.window.event){
+ case SDL_WINDOWEVENT_RESIZED:
+ case SDL_WINDOWEVENT_SIZE_CHANGED:
+ sdl->window_width = event.window.data1;
+ sdl->window_height = event.window.data2;
+ SDL_LockMutex(sdl->mutex);
+ compute_texture_rect(s);
+ SDL_UnlockMutex(sdl->mutex);
+ break;
+ default:
+ break;
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ sdl2_write_trailer(s);
+ return sdl->init_ret;
+}
+
+static int sdl2_write_header(AVFormatContext *s)
+{
+ SDLContext *sdl = s->priv_data;
+ AVStream *st = s->streams[0];
+ AVCodecContext *encctx = st->codec;
+ int i, ret = 0;
+
+ if (!sdl->window_title)
+ sdl->window_title = av_strdup(s->filename);
+
+ if (SDL_WasInit(SDL_INIT_VIDEO)) {
+ av_log(s, AV_LOG_WARNING,
+ "SDL video subsystem was already inited, you could have
multiple SDL outputs. This may cause unknown behaviour.\n");
+ sdl->init_ret = AVERROR(EINVAL);
+ sdl->inited = 1;
+ }
+
+ if ( s->nb_streams > 1
+ || encctx->codec_type != AVMEDIA_TYPE_VIDEO
+ || encctx->codec_id != AV_CODEC_ID_RAWVIDEO) {
+ av_log(s, AV_LOG_ERROR, "Only supports one rawvideo stream\n");
+ sdl->init_ret = AVERROR(EINVAL);
+ goto fail;
+ }
+
+ for (i = 0; sdl_texture_pix_fmt_map[i].pix_fmt != AV_PIX_FMT_NONE; i++) {
+ if (sdl_texture_pix_fmt_map[i].pix_fmt == encctx->pix_fmt) {
+ sdl->texture_fmt = sdl_texture_pix_fmt_map[i].texture_fmt;
+ break;
+ }
+ }
+
+ if (!sdl->texture_fmt) {
+ av_log(s, AV_LOG_ERROR,
+ "Unsupported pixel format '%s', choose one of yuv420p, yuyv422,
uyvy422, BGRA\n",
+ av_get_pix_fmt_name(encctx->pix_fmt));
+ sdl->init_ret = AVERROR(EINVAL);
+ goto fail;
+ }
+
+ sdl->init_cond = SDL_CreateCond();
+ if (!sdl->init_cond) {
+ av_log(s, AV_LOG_ERROR, "Could not create SDL condition variable:
%s\n", SDL_GetError());
+ ret = AVERROR_EXTERNAL;
+ goto fail;
+ }
+ sdl->mutex = SDL_CreateMutex();
+ if (!sdl->mutex) {
+ av_log(s, AV_LOG_ERROR, "Could not create SDL mutex: %s\n",
SDL_GetError());
+ ret = AVERROR_EXTERNAL;
+ goto fail;
+ }
+ sdl->event_thread = SDL_CreateThread(event_thread, "event_thread", s);
+ if (!sdl->event_thread) {
+ av_log(s, AV_LOG_ERROR, "Could not create SDL event thread: %s\n",
SDL_GetError());
+ ret = AVERROR_EXTERNAL;
+ goto fail;
+ }
+
+ /* wait until the video system has been inited */
+ SDL_LockMutex(sdl->mutex);
+ while (!sdl->inited) {
+ SDL_CondWait(sdl->init_cond, sdl->mutex);
+ }
+
+ SDL_UnlockMutex(sdl->mutex);
+ if (sdl->init_ret < 0) {
+ ret = sdl->init_ret;
+ goto fail;
+ }
+ return 0;
+
+fail:
+ sdl2_write_trailer(s);
+ return ret;
+}
+
+static int sdl2_write_packet(AVFormatContext *s, AVPacket *pkt)
+{
+ int ret = 0;
+ SDLContext *sdl = s->priv_data;
+ AVCodecContext *encctx = s->streams[0]->codec;
+ uint8_t *data[4];
+ int linesize[4];
+
+ av_image_fill_arrays(data, linesize, pkt->data, encctx->pix_fmt,
encctx->width, encctx->height, 1);
+ SDL_LockMutex(sdl->mutex);
+ switch (sdl->texture_fmt) {
+ case SDL_PIXELFORMAT_IYUV:
+ case SDL_PIXELFORMAT_YUY2:
+ case SDL_PIXELFORMAT_UYVY:
+ ret = SDL_UpdateYUVTexture(sdl->texture, NULL,
+ data[0], linesize[0],
+ data[1], linesize[1],
+ data[2], linesize[2]);
+ break;
+ case SDL_PIXELFORMAT_RGB332:
+ case SDL_PIXELFORMAT_RGB444:
+ case SDL_PIXELFORMAT_RGB555:
+ case SDL_PIXELFORMAT_BGR555:
+ /* Not implemented in FFmpeg
+ case SDL_PIXELFORMAT_ARGB4444:
+ case SDL_PIXELFORMAT_RGBA4444:
+ case SDL_PIXELFORMAT_ABGR4444:
+ case SDL_PIXELFORMAT_BGRA4444:
+ case SDL_PIXELFORMAT_ARGB1555:
+ case SDL_PIXELFORMAT_RGBA5551:
+ case SDL_PIXELFORMAT_ABGR1555:
+ case SDL_PIXELFORMAT_BGRA5551:
+ */
+ case SDL_PIXELFORMAT_RGB565:
+ case SDL_PIXELFORMAT_BGR565:
+ case SDL_PIXELFORMAT_RGB24:
+ case SDL_PIXELFORMAT_BGR24:
+ case SDL_PIXELFORMAT_RGB888: // is this right?
+ case SDL_PIXELFORMAT_RGBX8888:
+ case SDL_PIXELFORMAT_BGR888: // is this right?
+ case SDL_PIXELFORMAT_BGRX8888:
+ case SDL_PIXELFORMAT_ARGB8888:
+ case SDL_PIXELFORMAT_RGBA8888:
+ case SDL_PIXELFORMAT_ABGR8888:
+ case SDL_PIXELFORMAT_BGRA8888:
+ // case SDL_PIXELFORMAT_ARGB2101010:
+ ret = SDL_UpdateTexture(sdl->texture, NULL, data[0], linesize[0]);
+ break;
+ default:
+ av_log(NULL, AV_LOG_FATAL, "Unsupported pixel format\n");
+ ret = -1;
+ break;
+ }
+ SDL_RenderClear(sdl->renderer);
+ SDL_RenderCopy(sdl->renderer, sdl->texture, NULL, &sdl->texture_rect);
+ SDL_RenderPresent(sdl->renderer);
+ SDL_UnlockMutex(sdl->mutex);
+ return ret;
+}
+
+#define OFFSET(x) offsetof(SDLContext,x)
+
+static const AVOption options[] = {
+ { "window_title", "set SDL window title", OFFSET(window_title),
AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
+ { "window_size", "set SDL window forced size", OFFSET(window_width),
AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
+ { "window_fullscreen", "set SDL window fullscreen",
OFFSET(window_fullscreen), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX,
AV_OPT_FLAG_ENCODING_PARAM },
+ { "window_borderless", "set SDL window border off",
OFFSET(window_fullscreen), AV_OPT_TYPE_INT, { .i64 = 0 }, INT_MIN, INT_MAX,
AV_OPT_FLAG_ENCODING_PARAM },
+ { NULL },
+};
+
+static const AVClass sdl2_class = {
+ .class_name = "sdl2 outdev",
+ .item_name = av_default_item_name,
+ .option = options,
+ .version = LIBAVUTIL_VERSION_INT,
+ .category = AV_CLASS_CATEGORY_DEVICE_VIDEO_OUTPUT,
+};
+
+AVOutputFormat ff_sdl2_muxer = {
+ .name = "sdl2",
+ .long_name = NULL_IF_CONFIG_SMALL("SDL2 output device"),
+ .priv_data_size = sizeof(SDLContext),
+ .audio_codec = AV_CODEC_ID_NONE,
+ .video_codec = AV_CODEC_ID_RAWVIDEO,
+ .write_header = sdl2_write_header,
+ .write_packet = sdl2_write_packet,
+ .write_trailer = sdl2_write_trailer,
+ .flags = AVFMT_NOFILE | AVFMT_VARIABLE_FPS | AVFMT_NOTIMESTAMPS,
+ .priv_class = &sdl2_class,
+};
\ No newline at end of file
--
2.6.4 (Apple Git-63)
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
