25 lines
1 KiB
Diff
25 lines
1 KiB
Diff
diff --git a/media/ffvpx/libavcodec/mediacodecdec.c b/media/ffvpx/libavcodec/mediacodecdec.c
|
|
--- a/media/ffvpx/libavcodec/mediacodecdec.c
|
|
+++ b/media/ffvpx/libavcodec/mediacodecdec.c
|
|
@@ -727,3 +727,9 @@ DECLARE_MEDIACODEC_ADEC(amrwb, "AMR-WB", AV_CODEC_ID_AMR_WB, NULL)
|
|
#if CONFIG_MP3_MEDIACODEC_DECODER
|
|
DECLARE_MEDIACODEC_ADEC(mp3, "MP3", AV_CODEC_ID_MP3, NULL)
|
|
#endif
|
|
+
|
|
+int moz_avcodec_mediacodec_is_eos(AVCodecContext* avctx) {
|
|
+ // Note that MediaCodecH264DecContext is used by all codec types.
|
|
+ MediaCodecH264DecContext *s = avctx->priv_data;
|
|
+ return s->ctx->eos;
|
|
+}
|
|
diff --git a/media/ffvpx/libavcodec/mediacodecdec_common.c b/media/ffvpx/libavcodec/mediacodecdec_common.c
|
|
--- a/media/ffvpx/libavcodec/mediacodecdec_common.c
|
|
+++ b/media/ffvpx/libavcodec/mediacodecdec_common.c
|
|
@@ -85,7 +85,7 @@
|
|
|
|
#define INPUT_DEQUEUE_TIMEOUT_US 8000
|
|
#define OUTPUT_DEQUEUE_TIMEOUT_US 8000
|
|
-#define OUTPUT_DEQUEUE_BLOCK_TIMEOUT_US 1000000
|
|
+#define OUTPUT_DEQUEUE_BLOCK_TIMEOUT_US 8000
|
|
|
|
enum {
|
|
ENCODING_PCM_16BIT = 0x00000002,
|