Skip to content

Commit 01918e7

Browse files
committed
[gst-omx] gstomxvideodec: Don't populate videodec output port if it's disabled
This fixes an "Incorrect state operation" error during early initialization in Netflix5.
1 parent cd85f94 commit 01918e7

1 file changed

Lines changed: 36 additions & 0 deletions

File tree

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
From 9146a65babbdc34e0e7763cd31f1670477e99f47 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?Enrique=20Oca=C3=B1a=20Gonz=C3=A1lez?= <eocanha@igalia.com>
3+
Date: Wed, 19 Feb 2020 13:55:18 +0000
4+
Subject: [PATCH 1/2] Don't populate videodec output port if it's disabled
5+
6+
---
7+
omx/gstomxvideodec.c | 9 ++++++---
8+
1 file changed, 6 insertions(+), 3 deletions(-)
9+
10+
diff --git a/omx/gstomxvideodec.c b/omx/gstomxvideodec.c
11+
index c967151..77ff0ad 100644
12+
--- a/omx/gstomxvideodec.c
13+
+++ b/omx/gstomxvideodec.c
14+
@@ -2743,13 +2743,16 @@ gst_omx_video_dec_flush (GstVideoDecoder * decoder)
15+
if (self->eglimage) {
16+
gst_omx_port_set_flushing (self->egl_in_port, 5 * GST_SECOND, FALSE);
17+
gst_omx_port_set_flushing (self->egl_out_port, 5 * GST_SECOND, FALSE);
18+
- err = gst_omx_port_populate (self->egl_out_port);
19+
+ if (gst_omx_port_is_enabled (self->egl_out_port))
20+
+ err = gst_omx_port_populate (self->egl_out_port);
21+
gst_omx_port_mark_reconfigured (self->egl_out_port);
22+
} else {
23+
- err = gst_omx_port_populate (self->dec_out_port);
24+
+ if (gst_omx_port_is_enabled (self->dec_out_port))
25+
+ err = gst_omx_port_populate (self->dec_out_port);
26+
}
27+
#else
28+
- err = gst_omx_port_populate (self->dec_out_port);
29+
+ if (gst_omx_port_is_enabled (self->dec_out_port))
30+
+ err = gst_omx_port_populate (self->dec_out_port);
31+
#endif
32+
33+
if (err != OMX_ErrorNone) {
34+
--
35+
2.17.1
36+

0 commit comments

Comments
 (0)