virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

lavd/xv: preliminary support of uncoded frame.

Browse Source
This commit is contained in:
Nicolas George 2014-01-01 12:05:48 +01:00
parent 62106fcc23
commit d201a0f0f8
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libavdevice/xv.c
View File

@ -36,6 +36,7 @@
#include "libavutil/opt.h" #include "libavutil/opt.h"
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavformat/internal.h"
#include "avdevice.h" #include "avdevice.h"
typedef struct { typedef struct {
@ -197,23 +198,19 @@ static int xv_write_header(AVFormatContext *s)
return ret; return ret;
} }
static int xv_write_packet(AVFormatContext *s, AVPacket *pkt) static int write_picture(AVFormatContext *s, AVPicture *pict)
{ {
XVContext *xv = s->priv_data; XVContext *xv = s->priv_data;
XvImage *img = xv->yuv_image; XvImage *img = xv->yuv_image;
XWindowAttributes window_attrs; XWindowAttributes window_attrs;
AVPicture pict;
AVCodecContext *ctx = s->streams[0]->codec;
uint8_t *data[3] = { uint8_t *data[3] = {
img->data + img->offsets[0], img->data + img->offsets[0],
img->data + img->offsets[1], img->data + img->offsets[1],
img->data + img->offsets[2] img->data + img->offsets[2]
}; };
avpicture_fill(&pict, pkt->data, ctx->pix_fmt, ctx->width, ctx->height); av_image_copy(data, img->pitches, (const uint8_t **)pict->data, pict->linesize,
av_image_copy(data, img->pitches, (const uint8_t **)pict.data, pict.linesize,
xv->image_format, img->width, img->height); xv->image_format, img->width, img->height);
XGetWindowAttributes(xv->display, xv->window, &window_attrs); XGetWindowAttributes(xv->display, xv->window, &window_attrs);
if (XvShmPutImage(xv->display, xv->xv_port, xv->window, xv->gc, if (XvShmPutImage(xv->display, xv->xv_port, xv->window, xv->gc,
xv->yuv_image, 0, 0, xv->image_width, xv->image_height, 0, 0, xv->yuv_image, 0, 0, xv->image_width, xv->image_height, 0, 0,
@ -224,6 +221,24 @@ static int xv_write_packet(AVFormatContext *s, AVPacket *pkt)
return 0; return 0;
} }
static int xv_write_packet(AVFormatContext *s, AVPacket *pkt)
{
AVPicture pict;
AVCodecContext *ctx = s->streams[0]->codec;
avpicture_fill(&pict, pkt->data, ctx->pix_fmt, ctx->width, ctx->height);
return write_picture(s, &pict);
}
static int xv_write_frame(AVFormatContext *s, int stream_index, AVFrame **frame,
unsigned flags)
{
/* xv_write_header() should have accepted only supported formats */
if ((flags & AV_WRITE_UNCODED_FRAME_QUERY))
return 0;
return write_picture(s, (AVPicture *)*frame);
}
#define OFFSET(x) offsetof(XVContext, x) #define OFFSET(x) offsetof(XVContext, x)
static const AVOption options[] = { static const AVOption options[] = {
{ "display_name", "set display name", OFFSET(display_name), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM }, { "display_name", "set display name", OFFSET(display_name), AV_OPT_TYPE_STRING, {.str = NULL }, 0, 0, AV_OPT_FLAG_ENCODING_PARAM },
@ -250,6 +265,7 @@ AVOutputFormat ff_xv_muxer = {
.video_codec = AV_CODEC_ID_RAWVIDEO, .video_codec = AV_CODEC_ID_RAWVIDEO,
.write_header = xv_write_header, .write_header = xv_write_header,
.write_packet = xv_write_packet, .write_packet = xv_write_packet,
.write_uncoded_frame = xv_write_frame,
.write_trailer = xv_write_trailer, .write_trailer = xv_write_trailer,
.flags = AVFMT_NOFILE | AVFMT_VARIABLE_FPS | AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOFILE | AVFMT_VARIABLE_FPS | AVFMT_NOTIMESTAMPS,
.priv_class = &xv_class, .priv_class = &xv_class,