mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-01 17:31:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: fix build without FFmpeg.

Browse source
This commit is contained in:
Gwenole Beauchesne 2012-01-16 14:19:00 +01:00
parent 35d33b13f6
commit 9f5c487593
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/Makefile.am
View file

@ -56,7 +56,7 @@ test_surfaces_SOURCES = test-surfaces.c
test_surfaces_CFLAGS = $(TEST_CFLAGS) $(TEST_X11_CFLAGS) test_surfaces_CFLAGS = $(TEST_CFLAGS) $(TEST_X11_CFLAGS)
test_surfaces_LDADD = $(TEST_LIBS) $(TEST_X11_LIBS) test_surfaces_LDADD = $(TEST_LIBS) $(TEST_X11_LIBS)
test_subpicture_SOURCES = test-subpicture.c test-h264.c test-subpicture-data.c test_subpicture_SOURCES = test-subpicture.c test-mpeg2.c test-subpicture-data.c
test_subpicture_CFLAGS = $(TEST_CFLAGS) $(TEST_X11_CFLAGS) test_subpicture_CFLAGS = $(TEST_CFLAGS) $(TEST_X11_CFLAGS)
test_subpicture_LDADD = $(TEST_LIBS) $(TEST_X11_LIBS) test_subpicture_LDADD = $(TEST_LIBS) $(TEST_X11_LIBS)

27
tests/test-subpicture.c
View file

@ -20,15 +20,22 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include "config.h"
#include <string.h> #include <string.h>
#include <gst/vaapi/gstvaapidisplay_x11.h> #include <gst/vaapi/gstvaapidisplay_x11.h>
#include <gst/vaapi/gstvaapiwindow_x11.h> #include <gst/vaapi/gstvaapiwindow_x11.h>
#include <gst/vaapi/gstvaapidecoder.h> #include <gst/vaapi/gstvaapidecoder.h>
#include <gst/vaapi/gstvaapidecoder_ffmpeg.h>
#include <gst/vaapi/gstvaapisurface.h> #include <gst/vaapi/gstvaapisurface.h>
#include "test-h264.h" #include "test-mpeg2.h"
#include "test-subpicture-data.h" #include "test-subpicture-data.h"
#if USE_FFMPEG
# include <gst/vaapi/gstvaapidecoder_ffmpeg.h>
#endif
#if USE_CODEC_PARSERS
# include <gst/vaapi/gstvaapidecoder_mpeg2.h>
#endif
typedef void (*GetVideoInfoFunc)(VideoDecodeInfo *info); typedef void (*GetVideoInfoFunc)(VideoDecodeInfo *info);
typedef struct _CodecDefs CodecDefs; typedef struct _CodecDefs CodecDefs;
@ -39,7 +46,7 @@ struct _CodecDefs {
static const CodecDefs g_codec_defs[] = { static const CodecDefs g_codec_defs[] = {
#define INIT_FUNCS(CODEC) { #CODEC, CODEC##_get_video_info } #define INIT_FUNCS(CODEC) { #CODEC, CODEC##_get_video_info }
INIT_FUNCS(h264), INIT_FUNCS(mpeg2),
#undef INIT_FUNCS #undef INIT_FUNCS
{ NULL, } { NULL, }
}; };
@ -89,7 +96,7 @@ main(int argc, char *argv[])
GOptionContext *options; GOptionContext *options;
GstVaapiDisplay *display; GstVaapiDisplay *display;
GstVaapiWindow *window; GstVaapiWindow *window;
GstVaapiDecoder *decoder; GstVaapiDecoder *decoder = NULL;
GstCaps *decoder_caps; GstCaps *decoder_caps;
GstStructure *structure; GstStructure *structure;
GstVaapiDecoderStatus status; GstVaapiDecoderStatus status;
@ -116,7 +123,7 @@ main(int argc, char *argv[])
g_option_context_free(options); g_option_context_free(options);
if (!g_codec_str) if (!g_codec_str)
g_codec_str = g_strdup("h264"); g_codec_str = g_strdup("mpeg2");
g_print("Test %s decode\n", g_codec_str); g_print("Test %s decode\n", g_codec_str);
codec = get_codec_defs(g_codec_str); codec = get_codec_defs(g_codec_str);
@ -145,9 +152,15 @@ main(int argc, char *argv[])
NULL NULL
); );
decoder = gst_vaapi_decoder_ffmpeg_new(display, decoder_caps); #if USE_CODEC_PARSERS
decoder = gst_vaapi_decoder_mpeg2_new(display, decoder_caps);
#endif
#if USE_FFMPEG
if (!decoder) if (!decoder)
g_error("could not create FFmpeg decoder"); decoder = gst_vaapi_decoder_ffmpeg_new(display, decoder_caps);
#endif
if (!decoder)
g_error("could not create video decoder");
gst_caps_unref(decoder_caps); gst_caps_unref(decoder_caps);
buffer = gst_buffer_new(); buffer = gst_buffer_new();