vlc/vlc-3.0 | branch: master | Alexandre Janniaux <[email protected]> | Tue Feb 20 17:36:15 2018 +0100| [5fb456d0e82d00acdb08a0e36e4574402c75514c] | committer: Thomas Guillem
modules/codec/omxil/mediacodec.c: add MPEG2 support Add MPEG2 support with Mediacodec on Android. Signed-off-by: Thomas Guillem <[email protected]> (cherry picked from commit 5b36000c03b55f33d855ef66f8651a8b70ca9436) Signed-off-by: Thomas Guillem <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=5fb456d0e82d00acdb08a0e36e4574402c75514c --- modules/codec/omxil/mediacodec.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/codec/omxil/mediacodec.c b/modules/codec/omxil/mediacodec.c index f5180923ff..420f6497f4 100644 --- a/modules/codec/omxil/mediacodec.c +++ b/modules/codec/omxil/mediacodec.c @@ -581,16 +581,14 @@ static int OpenDecoder(vlc_object_t *p_this, pf_MediaCodecApi_init pf_init) break; case VLC_CODEC_H263: mime = "video/3gpp"; break; case VLC_CODEC_MP4V: mime = "video/mp4v-es"; break; + case VLC_CODEC_MPGV: + case VLC_CODEC_MP2V: + mime = "video/mpeg2"; + break; case VLC_CODEC_WMV3: mime = "video/x-ms-wmv"; break; case VLC_CODEC_VC1: mime = "video/wvc1"; break; case VLC_CODEC_VP8: mime = "video/x-vnd.on2.vp8"; break; case VLC_CODEC_VP9: mime = "video/x-vnd.on2.vp9"; break; - /* FIXME: mpeg2 is disabled: sar num/den can't be updated from - * MediaCodec. Use avcodec instead that will update it. The proper - * solution is to update sar from a mpeg2 packetizer. - * - * case VLC_CODEC_MPGV: mime = "video/mpeg2"; break; - */ } } else _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
