RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/mediacodecdec: switch to the new generic filtering mechanism

This commit is contained in:
Matthieu Bouron 2017-06-10 00:41:07 +02:00
parent 4f9e958b04
commit 3839580b71
1 changed files with 13 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
libavcodec/mediacodecdec.c
View File

@ -41,11 +41,9 @@ typedef struct MediaCodecH264DecContext {
MediaCodecDecContext *ctx;
AVBSFContext *bsf;
AVFifoBuffer *fifo;
AVPacket filtered_pkt;
AVPacket buffered_pkt;
} MediaCodecH264DecContext;
@ -58,8 +56,7 @@ static av_cold int mediacodec_decode_close(AVCodecContext *avctx)
av_fifo_free(s->fifo);
av_bsf_free(&s->bsf);
av_packet_unref(&s->filtered_pkt);
av_packet_unref(&s->buffered_pkt);
return 0;
}
@ -312,9 +309,6 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx)
const char *codec_mime = NULL;
const char *bsf_name = NULL;
const AVBitStreamFilter *bsf = NULL;
FFAMediaFormat *format = NULL;
MediaCodecH264DecContext *s = avctx->priv_data;
@ -329,7 +323,6 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx)
#if CONFIG_H264_MEDIACODEC_DECODER
case AV_CODEC_ID_H264:
codec_mime = "video/avc";
bsf_name = "h264_mp4toannexb";
ret = h264_set_extradata(avctx, format);
if (ret < 0)
@ -339,7 +332,6 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx)
#if CONFIG_HEVC_MEDIACODEC_DECODER
case AV_CODEC_ID_HEVC:
codec_mime = "video/hevc";
bsf_name = "hevc_mp4toannexb";
ret = hevc_set_extradata(avctx, format);
if (ret < 0)
@ -410,25 +402,6 @@ static av_cold int mediacodec_decode_init(AVCodecContext *avctx)
goto done;
}
if (bsf_name) {
bsf = av_bsf_get_by_name(bsf_name);
if(!bsf) {
ret = AVERROR_BSF_NOT_FOUND;
goto done;
}
if ((ret = av_bsf_alloc(bsf, &s->bsf))) {
goto done;
}
if (((ret = avcodec_parameters_from_context(s->bsf->par_in, avctx)) < 0) ||
((ret = av_bsf_init(s->bsf)) < 0)) {
goto done;
}
}
av_init_packet(&s->filtered_pkt);
done:
if (format) {
ff_AMediaFormat_delete(format);
@ -502,11 +475,9 @@ static int mediacodec_decode_frame(AVCodecContext *avctx, void *data,
/* process buffered data */
while (!*got_frame) {
/* prepare the input data -- convert to Annex B if needed */
if (s->filtered_pkt.size <= 0) {
AVPacket input_pkt = { 0 };
av_packet_unref(&s->filtered_pkt);
/* prepare the input data */
if (s->buffered_pkt.size <= 0) {
av_packet_unref(&s->buffered_pkt);
/* no more data */
if (av_fifo_size(s->fifo) < sizeof(AVPacket)) {
@ -514,38 +485,17 @@ static int mediacodec_decode_frame(AVCodecContext *avctx, void *data,
ff_mediacodec_dec_decode(avctx, s->ctx, frame, got_frame, avpkt);
}
av_fifo_generic_read(s->fifo, &input_pkt, sizeof(input_pkt), NULL);
if (s->bsf) {
ret = av_bsf_send_packet(s->bsf, &input_pkt);
if (ret < 0) {
return ret;
}
ret = av_bsf_receive_packet(s->bsf, &s->filtered_pkt);
if (ret == AVERROR(EAGAIN)) {
goto done;
}
} else {
av_packet_move_ref(&s->filtered_pkt, &input_pkt);
}
/* {h264,hevc}_mp4toannexb are used here and do not require flushing */
av_assert0(ret != AVERROR_EOF);
if (ret < 0) {
return ret;
}
av_fifo_generic_read(s->fifo, &s->buffered_pkt, sizeof(s->buffered_pkt), NULL);
}
ret = mediacodec_process_data(avctx, frame, got_frame, &s->filtered_pkt);
ret = mediacodec_process_data(avctx, frame, got_frame, &s->buffered_pkt);
if (ret < 0)
return ret;
s->filtered_pkt.size -= ret;
s->filtered_pkt.data += ret;
s->buffered_pkt.size -= ret;
s->buffered_pkt.data += ret;
}
done:
return avpkt->size;
}
@ -560,7 +510,7 @@ static void mediacodec_decode_flush(AVCodecContext *avctx)
}
av_fifo_reset(s->fifo);
av_packet_unref(&s->filtered_pkt);
av_packet_unref(&s->buffered_pkt);
ff_mediacodec_dec_flush(avctx, s->ctx);
}
@ -578,6 +528,7 @@ AVCodec ff_h264_mediacodec_decoder = {
.close = mediacodec_decode_close,
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING,
.caps_internal = FF_CODEC_CAP_SETS_PKT_DTS,
.bsfs = "h264_mp4toannexb",
};
#endif
@ -594,6 +545,7 @@ AVCodec ff_hevc_mediacodec_decoder = {
.close = mediacodec_decode_close,
.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_AVOID_PROBING,
.caps_internal = FF_CODEC_CAP_SETS_PKT_DTS,
.bsfs = "hevc_mp4toannexb",
};
#endif