diff options
| author | Limin Wang <lance.lmwang@gmail.com> | 2020-09-17 21:46:50 +0800 |
|---|---|---|
| committer | Limin Wang <lance.lmwang@gmail.com> | 2020-09-21 09:30:54 +0800 |
| commit | 7786d795c294bd56aeaec5d913bf41dc5e7725c8 (patch) | |
| tree | 11e6f4b44ff7048f2ab630ecdea1028849c36f27 /libavdevice | |
| parent | 7a4b2c196cdb98058e2dd1e79a0a5084239ce2f2 (diff) | |
| download | ffmpeg-7786d795c294bd56aeaec5d913bf41dc5e7725c8.tar.gz | |
avdevice/lavfi: fix FIXME and check a/v type by codec_type
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/lavfi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 4f05a1542e..268dc0d2a2 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -386,6 +386,7 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) AVDictionary *frame_metadata; int ret, i; int size = 0; + AVStream *st; if (lavfi->subcc_packet.size) { av_packet_move_ref(pkt, &lavfi->subcc_packet); @@ -426,15 +427,16 @@ static int lavfi_read_packet(AVFormatContext *avctx, AVPacket *pkt) av_buffersink_get_frame_flags(lavfi->sinks[min_pts_sink_idx], frame, 0); stream_idx = lavfi->sink_stream_map[min_pts_sink_idx]; + st = avctx->streams[stream_idx]; - if (frame->width /* FIXME best way of testing a video */) { + if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) { size = av_image_get_buffer_size(frame->format, frame->width, frame->height, 1); if ((ret = av_new_packet(pkt, size)) < 0) return ret; av_image_copy_to_buffer(pkt->data, size, (const uint8_t **)frame->data, frame->linesize, frame->format, frame->width, frame->height, 1); - } else if (frame->channels /* FIXME test audio */) { + } else if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { size = frame->nb_samples * av_get_bytes_per_sample(frame->format) * frame->channels; if ((ret = av_new_packet(pkt, size)) < 0) |