Merge pull request #2131

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=140720011
This commit is contained in:
olly 2016-12-01 05:28:35 -08:00 committed by Oliver Woodman
parent f3dbb74613
commit 53dcb82862

View file

@ -1071,7 +1071,10 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
* buffer with {@link MediaCodec#BUFFER_FLAG_END_OF_STREAM} set. False otherwise.
*/
private static boolean codecNeedsEosFlushWorkaround(String name) {
return Util.SDK_INT <= 23 && "OMX.google.vorbis.decoder".equals(name);
return (Util.SDK_INT <= 23 && "OMX.google.vorbis.decoder".equals(name))
|| (Util.SDK_INT <= 19 && "hb2000".equals(Util.DEVICE)
&& ("OMX.amlogic.avc.decoder.awesome".equals(name)
|| "OMX.amlogic.avc.decoder.awesome.secure".equals(name)));
}
/**