opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-05-17 23:17:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

lavd/fbdev_enc: more stream validation restrictive

Browse Source 
So far fbdev_enc device picked up first video stream and ignored others.
It is required to provide exactly one video stream now.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
This commit is contained in:
Lukasz Marek
2013-10-27 21:41:27 +01:00
parent 7f5e75eea9
commit b04af34600
1 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libavdevice/fbdev_enc.c
View File

@ -37,7 +37,6 @@ typedef struct {
struct fb_var_screeninfo varinfo; ///< framebuffer variable info struct fb_var_screeninfo varinfo; ///< framebuffer variable info
struct fb_fix_screeninfo fixinfo; ///< framebuffer fixed info struct fb_fix_screeninfo fixinfo; ///< framebuffer fixed info
int fd; ///< framebuffer device file descriptor int fd; ///< framebuffer device file descriptor
int index; ///< index of a video stream
uint8_t *data; ///< framebuffer data uint8_t *data; ///< framebuffer data
} FBDevContext; } FBDevContext;
@ -49,21 +48,11 @@ static av_cold int fbdev_write_header(AVFormatContext *h)
int ret, flags = O_RDWR; int ret, flags = O_RDWR;
int i; int i;
for (i = 0; i < h->nb_streams; i++) { if (h->nb_streams != 1 || h->streams[0]->codec->codec_type != AVMEDIA_TYPE_VIDEO) {
if (h->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) { av_log(fbdev, AV_LOG_ERROR, "Only a single video stream is supported.\n");
if (!st) {
fbdev->index = i;
st = h->streams[i];
} else {
av_log(h, AV_LOG_WARNING, "More than one video stream found. First one is used.\n");
break;
}
}
}
if (!st) {
av_log(h, AV_LOG_ERROR, "No video stream found.\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
st = h->streams[0];
if ((fbdev->fd = avpriv_open(h->filename, flags)) == -1) { if ((fbdev->fd = avpriv_open(h->filename, flags)) == -1) {
ret = AVERROR(errno); ret = AVERROR(errno);
@ -112,7 +101,7 @@ static int fbdev_write_packet(AVFormatContext *h, AVPacket *pkt)
enum AVPixelFormat fb_pix_fmt; enum AVPixelFormat fb_pix_fmt;
int disp_height; int disp_height;
int bytes_to_copy; int bytes_to_copy;
AVCodecContext *codec_ctx = h->streams[fbdev->index]->codec; AVCodecContext *codec_ctx = h->streams[0]->codec;
enum AVPixelFormat video_pix_fmt = codec_ctx->pix_fmt; enum AVPixelFormat video_pix_fmt = codec_ctx->pix_fmt;
int video_width = codec_ctx->width; int video_width = codec_ctx->width;
int video_height = codec_ctx->height; int video_height = codec_ctx->height;
@ -120,9 +109,6 @@ static int fbdev_write_packet(AVFormatContext *h, AVPacket *pkt)
int src_line_size = video_width * bytes_per_pixel; int src_line_size = video_width * bytes_per_pixel;
int i; int i;
if (fbdev->index != pkt->stream_index)
return 0;
if (ioctl(fbdev->fd, FBIOGET_VSCREENINFO, &fbdev->varinfo) < 0) if (ioctl(fbdev->fd, FBIOGET_VSCREENINFO, &fbdev->varinfo) < 0)
av_log(h, AV_LOG_WARNING, av_log(h, AV_LOG_WARNING,
"Error refreshing variable info: %s\n", av_err2str(AVERROR(errno))); "Error refreshing variable info: %s\n", av_err2str(AVERROR(errno)));