From 4060056ce60325ec9737265d919db760833d7707 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 18 Oct 2011 14:41:48 +0100 Subject: [PATCH 1/4] assrender, nuvdemux: unref buffers with gst_buffer_unref() --- ext/assrender/gstassrender.c | 2 +- gst/nuvdemux/gstnuvdemux.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/assrender/gstassrender.c b/ext/assrender/gstassrender.c index 2727365db9..1287ba1a77 100644 --- a/ext/assrender/gstassrender.c +++ b/ext/assrender/gstassrender.c @@ -1140,7 +1140,7 @@ gst_ass_render_chain_text (GstPad * pad, GstBuffer * buffer) g_mutex_lock (render->subtitle_mutex); if (G_UNLIKELY (render->subtitle_flushing)) { GST_DEBUG_OBJECT (render, "Text pad flushing"); - gst_object_unref (buffer); + gst_buffer_unref (buffer); g_mutex_unlock (render->subtitle_mutex); return GST_FLOW_WRONG_STATE; } diff --git a/gst/nuvdemux/gstnuvdemux.c b/gst/nuvdemux/gstnuvdemux.c index 1471954473..3401c8157b 100644 --- a/gst/nuvdemux/gstnuvdemux.c +++ b/gst/nuvdemux/gstnuvdemux.c @@ -637,7 +637,7 @@ gst_nuv_demux_stream_extend_header (GstNuvDemux * nuv) nuv->state = GST_NUV_DEMUX_INVALID_DATA; GST_ELEMENT_ERROR (nuv, STREAM, DEMUX, (NULL), ("Unsupported extended header (0x%02x)", buf->data[0])); - g_object_unref (buf); + gst_buffer_unref (buf); return GST_FLOW_ERROR; } return res; From 8eda5fc5dc4b733ffe3458600244d1f94cb6686b Mon Sep 17 00:00:00 2001 From: "Reynaldo H. Verdejo Pinochet" Date: Thu, 20 Oct 2011 09:39:19 -0300 Subject: [PATCH 2/4] Disable ext/faad for the android ndk build It currently makes the build fail. Idea is to enable it back again once its building problems get sorted out. --- Android.mk | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Android.mk b/Android.mk index fb349cf057..d858ab8eab 100644 --- a/Android.mk +++ b/Android.mk @@ -70,8 +70,11 @@ GST_PLUGINS_BAD_BUILT_SOURCES := \ gst/stereo/Android.mk \ gst/rtpvp8/Android.mk \ gst/mpegdemux/Android.mk \ - gst/ivfparse/Android.mk \ - ext/faad/Android.mk + gst/ivfparse/Android.mk + +ifneq ($(NDK_BUILD), true) +GST_PLUGINS_BAD_BUILT_SOURCES += ext/faad/Android.mk +endif GST_PLUGINS_BAD_BUILT_SOURCES := $(patsubst %, $(abspath $(GST_PLUGINS_BAD_TOP))/%, $(GST_PLUGINS_BAD_BUILT_SOURCES)) @@ -110,7 +113,9 @@ CONFIGURE_TARGETS += gst-plugins-bad-configure -include $(GST_PLUGINS_BAD_TOP)/gst/aiff/Android.mk -include $(GST_PLUGINS_BAD_TOP)/gst/asfmux/Android.mk -include $(GST_PLUGINS_BAD_TOP)/gst/videoparsers/Android.mk +ifneq ($(NDK_BUILD), true) -include $(GST_PLUGINS_BAD_TOP)/ext/faad/Android.mk +endif -include $(GST_PLUGINS_BAD_TOP)/gst/sdp/Android.mk -include $(GST_PLUGINS_BAD_TOP)/gst/hls/Android.mk -include $(GST_PLUGINS_BAD_TOP)/gst/jp2kdecimator/Android.mk From 30a3c5147b21b1929f944e12c5ddb3beccd5d237 Mon Sep 17 00:00:00 2001 From: Sreerenj Balachandran Date: Fri, 21 Oct 2011 11:40:54 +0300 Subject: [PATCH 3/4] vc1parser: Correct the parsing of sequece layer. --- gst-libs/gst/codecparsers/gstvc1parser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c index 654c1a7bb0..16b8bba51f 100644 --- a/gst-libs/gst/codecparsers/gstvc1parser.c +++ b/gst-libs/gst/codecparsers/gstvc1parser.c @@ -1804,13 +1804,13 @@ gst_vc1_parse_sequence_layer (const guint8 * data, gsize size, READ_UINT32 (&br, seqlayer->numframes, 24); - if (parse_sequence_header_struct_c (&br, &seqlayer->struct_c) == - GST_VC1_PARSER_ERROR) - goto failed; - READ_UINT32 (&br, tmp, 32); if (tmp != 0x04) goto failed; + + if (parse_sequence_header_struct_c (&br, &seqlayer->struct_c) == + GST_VC1_PARSER_ERROR) + goto failed; if (parse_sequence_header_struct_a (&br, &seqlayer->struct_a) == GST_VC1_PARSER_ERROR) From 48275dc0719edcca12eb6602bedc313bda224d59 Mon Sep 17 00:00:00 2001 From: Sreerenj Balachandran Date: Wed, 19 Oct 2011 10:24:52 +0300 Subject: [PATCH 4/4] vc1parser: Correct the parsing of FRMRTQ_POSTPROC and BITRTQ_POSTPROC --- gst-libs/gst/codecparsers/gstvc1parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst-libs/gst/codecparsers/gstvc1parser.c b/gst-libs/gst/codecparsers/gstvc1parser.c index 16b8bba51f..3dde8d6d64 100644 --- a/gst-libs/gst/codecparsers/gstvc1parser.c +++ b/gst-libs/gst/codecparsers/gstvc1parser.c @@ -781,13 +781,13 @@ static inline void calculate_framerate_bitrate (guint8 frmrtq_postproc, guint8 bitrtq_postproc, guint * framerate, guint * bitrate) { - if (frmrtq_postproc == 0 && bitrtq_postproc == 30) { + if (frmrtq_postproc == 0 && bitrtq_postproc == 31) { *framerate = 0; *bitrate = 0; } else if (frmrtq_postproc == 0 && bitrtq_postproc == 30) { *framerate = 2; *bitrate = 1952; - } else if (frmrtq_postproc == 0 && bitrtq_postproc == 31) { + } else if (frmrtq_postproc == 1 && bitrtq_postproc == 31) { *framerate = 6; *bitrate = 2016; } else {