[vlc-devel] [PATCH] mediacodec: fix crash when color-format is invalid

[Thomas Guillem]

Wait, I just tested on an android box and don't have the correct
behavior.
I'm on it.

On Thu, Oct 23, 2014, at 10:12, Thomas Guillem wrote:
> Yep, I tested it with my android 4.2.2 phone where color-format was 0.
> It pop up the hardware acceleration error dialog and then you can
> fallback to avcodec.
> (also tested it on working device)
> 
> On Thu, Oct 23, 2014, at 10:06, Martin Storsjö wrote:
> > On Thu, 23 Oct 2014, Thomas Guillem wrote:
> > 
> > > Fail if GetVlcChromaFormat return 0.
> > > (It'll throw a HardwareAccelerationError)
> > > ---
> > > modules/codec/omxil/android_mediacodec.c | 10 ++++++++--
> > > 1 file changed, 8 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/modules/codec/omxil/android_mediacodec.c b/modules/codec/omxil/android_mediacodec.c
> > > index 0f291b7..a5e7025 100644
> > > --- a/modules/codec/omxil/android_mediacodec.c
> > > +++ b/modules/codec/omxil/android_mediacodec.c
> > > @@ -842,8 +842,14 @@ static void GetOutput(decoder_t *p_dec, JNIEnv *env, picture_t **pp_pic, jlong t
> > >                     sar_den = p_dec->fmt_in.video.i_sar_den;
> > >                 }
> > >                 jni_SetAndroidSurfaceSizeEnv(env, width, height, width, height, sar_num, sar_den);
> > > -            } else
> > > -                GetVlcChromaFormat(p_sys->pixel_format, &p_dec->fmt_out.i_codec, &name);
> > > +            } else {
> > > +                if (!GetVlcChromaFormat(p_sys->pixel_format,
> > > +                                        &p_dec->fmt_out.i_codec, &name)) {
> > > +                    msg_Err(p_dec, "color-format not recognized");
> > > +                    p_sys->error_state = true;
> > > +                    return;
> > > +                }
> > > +            }
> > 
> > Looks ok assuming you've tested it.
> > 
> > // Martin
> > _______________________________________________
> > vlc-devel mailing list
> > To unsubscribe or modify your subscription options:
> > https://mailman.videolan.org/listinfo/vlc-devel
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel