[vlc-commits] codec/mediacodec: set an error if dr is not possible

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Dec  8 09:52:07 2016 +0100| [b1948abfacec1e785c8db2547133f11e5b0f5102] | committer: Thomas Guillem

codec/mediacodec: set an error if dr is not possible

Don't fallback to mediacodec with SW rendering. Indeed, getting back the output
buffer to the CPU can take more time than using a SW decoder.

Signed-off-by: Thomas Guillem <thomas at gllm.fr>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b1948abfacec1e785c8db2547133f11e5b0f5102
---

 modules/codec/omxil/mediacodec.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c
index b48099a..6d85a7d 100644
--- a/modules/codec/omxil/mediacodec.c
+++ b/modules/codec/omxil/mediacodec.c
@@ -549,8 +549,10 @@ static int StartMediaCodec(decoder_t *p_dec)
             p_dec->fmt_out.i_codec = VLC_CODEC_ANDROID_OPAQUE;
             if (decoder_UpdateVideoFormat(p_dec) != 0
              || (p_dummy_hwpic = decoder_NewPicture(p_dec)) == NULL)
-                msg_Err(p_dec, "Opaque Vout request failed: "
-                               "fallback to non opaque");
+            {
+                msg_Err(p_dec, "Opaque Vout request failed");
+                return VLC_EGENERIC;
+            }
         }
         if (p_dummy_hwpic)
         {