mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 17:50:36 +00:00
codecparsers: h264: use submodule sources.
Use newer sources from the codecparsers/ submodule for - GstH264SliceHdr.n_emulation_prevention_bytes: EPBs; - GstH264VUIParams.{par_n,par_d}: pixel-aspect-ratio.
This commit is contained in:
parent
cee782a177
commit
022e99e127
2 changed files with 19 additions and 14 deletions
28
configure.ac
28
configure.ac
|
@ -214,29 +214,29 @@ dnl ... bitstream parsers
|
||||||
PKG_CHECK_MODULES([GST_CODEC_PARSERS],
|
PKG_CHECK_MODULES([GST_CODEC_PARSERS],
|
||||||
[gstreamer-codecparsers-$GST_MAJORMINOR >= gst_plugins_bad_version])
|
[gstreamer-codecparsers-$GST_MAJORMINOR >= gst_plugins_bad_version])
|
||||||
|
|
||||||
dnl ... 0.10.23 addition, could be implemented otherwise
|
dnl ... H.264 parser, with the required extensions
|
||||||
AC_CACHE_CHECK([for GstH264SliceHdr::n_emulation_prevention_bytes],
|
AC_CACHE_CHECK([for H.264 parser],
|
||||||
ac_cv_have_gst_h264_slice_hdr_epb_count, [
|
ac_cv_have_gst_h264_parser, [
|
||||||
saved_CFLAGS="$CFLAGS"
|
saved_CPPFLAGS="$CPPFLAGS"
|
||||||
CFLAGS="$CFLAGS $GST_CFLAGS $GST_CODEC_PARSERS_CFLAGS"
|
CPPFLAGS="$CPPFLAGS $GST_CFLAGS $GST_CODEC_PARSERS_CFLAGS"
|
||||||
saved_LIBS="$LIBS"
|
saved_LIBS="$LIBS"
|
||||||
LIBS="$LIBS $GST_LIBS $GST_CODEC_PARSERS_LIBS"
|
LIBS="$LIBS $GST_LIBS $GST_CODEC_PARSERS_LIBS"
|
||||||
AC_COMPILE_IFELSE(
|
AC_COMPILE_IFELSE(
|
||||||
[AC_LANG_PROGRAM(
|
[AC_LANG_PROGRAM(
|
||||||
[[#include <gst/codecparsers/gsth264parser.h>]],
|
[[#include <gst/codecparsers/gsth264parser.h>]],
|
||||||
[[GstH264SliceHdr slice_hdr;
|
[[GstH264SliceHdr slice_hdr;
|
||||||
slice_hdr.n_emulation_prevention_bytes = 0;]])],
|
GstH264VUIParams vui_params;
|
||||||
[ac_cv_have_gst_h264_slice_hdr_epb_count="yes"],
|
slice_hdr.n_emulation_prevention_bytes = 0;
|
||||||
[ac_cv_have_gst_h264_slice_hdr_epb_count="no"]
|
vui_params.par_n = 0;
|
||||||
|
vui_params.par_d = 0;]])],
|
||||||
|
[ac_cv_have_gst_h264_parser="yes"],
|
||||||
|
[ac_cv_have_gst_h264_parser="no"]
|
||||||
)
|
)
|
||||||
CFLAGS="$saved_CFLAGS"
|
CPPFLAGS="$saved_CPPFLAGS"
|
||||||
LIBS="$saved_LIBS"
|
LIBS="$saved_LIBS"
|
||||||
])
|
])
|
||||||
|
AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_H264],
|
||||||
if test "$ac_cv_have_gst_h264_slice_hdr_epb_count" = "yes"; then
|
[test "$ac_cv_have_gst_h264_parser" != "yes"])
|
||||||
AC_DEFINE_UNQUOTED(HAVE_GST_H264_SLICE_HDR_EPB_COUNT, 1,
|
|
||||||
[Defined to 1 if GstH264SliceHdr::n_emulation_prevention_bytes exists.])
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl ... JPEG parser, not upstream yet
|
dnl ... JPEG parser, not upstream yet
|
||||||
AC_CACHE_CHECK([for JPEG parser],
|
AC_CACHE_CHECK([for JPEG parser],
|
||||||
|
|
|
@ -25,6 +25,11 @@ gen_source_c += gstjpegparser.c
|
||||||
gen_source_h += gstjpegparser.h
|
gen_source_h += gstjpegparser.h
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
if USE_LOCAL_CODEC_PARSERS_H264
|
||||||
|
gen_source_c += gsth264parser.c parserutils.c
|
||||||
|
gen_source_h += gsth264parser.h parserutils.h
|
||||||
|
endif
|
||||||
|
|
||||||
GENFILES = \
|
GENFILES = \
|
||||||
$(gen_source_c) \
|
$(gen_source_c) \
|
||||||
$(gen_source_h) \
|
$(gen_source_h) \
|
||||||
|
|
Loading…
Reference in a new issue